From 0e97d3571c5fd3ffbcc174d1f0099ac9513d22b8 Mon Sep 17 00:00:00 2001
From: markhummel <markhummel>
Date: Sun, 2 Oct 2005 03:37:48 +0000
Subject: [PATCH] fixed build issues on ppc osx platforms when bz2 and z libs
 aren't present

---
 configure       |  9 +++++++++
 configure.in    |  9 +++++++++
 doc/Makefile.am |  6 +++---
 doc/Makefile.in |  8 ++++----
 lxt/Makefile.am |  4 +++-
 lxt/Makefile.in |  8 ++++++--
 src/Makefile.am |  7 ++++++-
 src/Makefile.in | 16 +++++++++++-----
 8 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/configure b/configure
index d047168..4894f6f 100755
--- a/configure
+++ b/configure
@@ -20219,6 +20219,15 @@ if test X"$ac_cv_enable_lxt" = Xyes; then
         exit 1;
     fi
 fi
+if test X"$ac_cv_enable_lxt2" = Xyes; then
+    if test X"$ac_cv_lib_z_gzwrite" = Xno; then
+        echo ""
+        echo "*** Error: libz not found. lxt2 waveform dumping"
+        echo "    cannot be built. Rerun configure with --disable-lxt2."
+        echo ""
+        exit 1;
+    fi
+fi
 
 
   echo "$as_me:$LINENO: checking for a readline compatible library" >&5
diff --git a/configure.in b/configure.in
index e1cb83e..666f39c 100644
--- a/configure.in
+++ b/configure.in
@@ -135,6 +135,15 @@ if test X"$ac_cv_enable_lxt" = Xyes; then
         exit 1;
     fi
 fi
+if test X"$ac_cv_enable_lxt2" = Xyes; then
+    if test X"$ac_cv_lib_z_gzwrite" = Xno; then
+        echo ""
+        echo "*** Error: libz not found. lxt2 waveform dumping"
+        echo "    cannot be built. Rerun configure with --disable-lxt2."
+        echo ""
+        exit 1;
+    fi
+fi
 
 VL_LIB_READLINE
 if test ! "$HAVE_LIBREADLINE" = 1; then
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ec3c0be..222e948 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,9 +2,9 @@ EXTRA_DIST = veriwell.1
 man_MANS   = veriwell.1
 
 if USE_HELP2MAN
-veriwell.1: $(top_builddir)/src/veriwell
-	help2man -N $< > $@
+veriwell.1: $(top_srcdir)/src/veriwell.cc
+	help2man -N $(top_builddir)/src/veriwell > $@
 endif
 
-DISTCLEANFILES = veriwell.1
+#DISTCLEANFILES = veriwell.1
 MAINTAINERCLEANFILES = Makefile.in 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index e896178..e051340 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -159,7 +159,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 EXTRA_DIST = veriwell.1
 man_MANS = veriwell.1
-DISTCLEANFILES = veriwell.1
+
+#DISTCLEANFILES = veriwell.1
 MAINTAINERCLEANFILES = Makefile.in 
 all: all-am
 
@@ -309,7 +310,6 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -375,8 +375,8 @@ uninstall-man: uninstall-man1
 	uninstall-man1
 
 
-@USE_HELP2MAN_TRUE@veriwell.1: $(top_builddir)/src/veriwell
-@USE_HELP2MAN_TRUE@	help2man -N $< > $@
+@USE_HELP2MAN_TRUE@veriwell.1: $(top_srcdir)/src/veriwell.cc
+@USE_HELP2MAN_TRUE@	help2man -N $(top_builddir)/src/veriwell > $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/lxt/Makefile.am b/lxt/Makefile.am
index 9a9df2f..2ee51d4 100644
--- a/lxt/Makefile.am
+++ b/lxt/Makefile.am
@@ -1,10 +1,12 @@
 if USE_LXT
    LXTSOURCE=lxt.c lxt_write.c lxt_write.h
+   LXTLIB = liblxt.la
 endif
 if USE_LXT2
    LXT2SOURCE=lxt2.c lxt2_write.c lxt2_write.h
+   LXTLIB = liblxt.la
 endif
-noinst_LTLIBRARIES = liblxt.la
+noinst_LTLIBRARIES = $(LXTLIB)
 
 liblxt_la_SOURCES = $(LXTSOURCE) $(LXT2SOURCE)
 liblxt_la_LDFLAGS = -version-info 0:0:0
diff --git a/lxt/Makefile.in b/lxt/Makefile.in
index f743a61..f8a797b 100644
--- a/lxt/Makefile.in
+++ b/lxt/Makefile.in
@@ -56,6 +56,8 @@ am__liblxt_la_SOURCES_DIST = lxt.c lxt_write.c lxt_write.h lxt2.c \
 @USE_LXT2_TRUE@am__objects_2 = lxt2.lo lxt2_write.lo
 am_liblxt_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 liblxt_la_OBJECTS = $(am_liblxt_la_OBJECTS)
+@USE_LXT2_TRUE@am_liblxt_la_rpath =
+@USE_LXT_TRUE@am_liblxt_la_rpath =
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -178,8 +180,10 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 @USE_LXT_TRUE@LXTSOURCE = lxt.c lxt_write.c lxt_write.h
+@USE_LXT2_TRUE@LXTLIB = liblxt.la
+@USE_LXT_TRUE@LXTLIB = liblxt.la
 @USE_LXT2_TRUE@LXT2SOURCE = lxt2.c lxt2_write.c lxt2_write.h
-noinst_LTLIBRARIES = liblxt.la
+noinst_LTLIBRARIES = $(LXTLIB)
 liblxt_la_SOURCES = $(LXTSOURCE) $(LXT2SOURCE)
 liblxt_la_LDFLAGS = -version-info 0:0:0
 AM_CFLAGS = -I $(top_srcdir)/src
@@ -228,7 +232,7 @@ clean-noinstLTLIBRARIES:
 	  rm -f "$${dir}/so_locations"; \
 	done
 liblxt.la: $(liblxt_la_OBJECTS) $(liblxt_la_DEPENDENCIES) 
-	$(LINK)  $(liblxt_la_LDFLAGS) $(liblxt_la_OBJECTS) $(liblxt_la_LIBADD) $(LIBS)
+	$(LINK) $(am_liblxt_la_rpath) $(liblxt_la_LDFLAGS) $(liblxt_la_OBJECTS) $(liblxt_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
diff --git a/src/Makefile.am b/src/Makefile.am
index f53ef0a..9099571 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,11 @@
 if USE_LXT
    ZLIB=-lz
    BZ2LIB=-lbz2
+   LIBLXT = $(top_builddir)/lxt/liblxt.la
+endif
+if USE_LXT2
+   ZLIB=-lz
+   LIBLXT = $(top_builddir)/lxt/liblxt.la
 endif
 nobase_include_HEADERS = veriuser.h acc_user.h veriuser.c
 
@@ -33,7 +38,7 @@ libveriwell_la_SOURCES = parse.yy sdfparse.yy sdfcpars.yy multdiv.cc \
 		   systask.h timescal.h trace.h tree.h udp.h usertask.h \
 		   verisys.h veriuser.h veriwell.h v.h vtypes.h tree.def
 libveriwell_la_LDFLAGS = -version-info 0:0:0
-libveriwell_la_LIBADD =  $(top_builddir)/lxt/liblxt.la $(top_builddir)/replace/libreplace.la
+libveriwell_la_LIBADD =  $(LIBLXT) $(top_builddir)/replace/libreplace.la
 
 AM_YFLAGS = -y -d
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 9857f16..233df9a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -63,7 +63,10 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(includedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libveriwell_la_DEPENDENCIES = $(top_builddir)/lxt/liblxt.la \
+@USE_LXT2_FALSE@@USE_LXT_TRUE@am__DEPENDENCIES_1 =  \
+@USE_LXT2_FALSE@@USE_LXT_TRUE@	$(top_builddir)/lxt/liblxt.la
+@USE_LXT2_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/lxt/liblxt.la
+libveriwell_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/replace/libreplace.la
 am_libveriwell_la_OBJECTS = parse.lo sdfparse.lo sdfcpars.lo \
 	multdiv.lo print.lo usertask.lo flags.lo store.lo nsched.lo \
@@ -77,9 +80,9 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_veriwell_OBJECTS = defaultveriuser.$(OBJEXT)
 veriwell_OBJECTS = $(am_veriwell_OBJECTS)
-am__DEPENDENCIES_1 =
-veriwell_DEPENDENCIES = libveriwell.la $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+am__DEPENDENCIES_2 =
+veriwell_DEPENDENCIES = libveriwell.la $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_2)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -215,8 +218,11 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+@USE_LXT2_TRUE@ZLIB = -lz
 @USE_LXT_TRUE@ZLIB = -lz
 @USE_LXT_TRUE@BZ2LIB = -lbz2
+@USE_LXT2_TRUE@LIBLXT = $(top_builddir)/lxt/liblxt.la
+@USE_LXT_TRUE@LIBLXT = $(top_builddir)/lxt/liblxt.la
 nobase_include_HEADERS = veriuser.h acc_user.h veriuser.c
 veriwell_SOURCES = defaultveriuser.cc
 veriwell_LDADD = $(vl_cv_lib_readline) libveriwell.la $(ZLIB) $(BZ2LIB)
@@ -242,7 +248,7 @@ libveriwell_la_SOURCES = parse.yy sdfparse.yy sdfcpars.yy multdiv.cc \
 		   verisys.h veriuser.h veriwell.h v.h vtypes.h tree.def
 
 libveriwell_la_LDFLAGS = -version-info 0:0:0
-libveriwell_la_LIBADD = $(top_builddir)/lxt/liblxt.la $(top_builddir)/replace/libreplace.la
+libveriwell_la_LIBADD = $(LIBLXT) $(top_builddir)/replace/libreplace.la
 AM_YFLAGS = -y -d
 BUILT_SOURCES = build.h
 CLEANFILES = build.h