added libz and libbz2 library sources for replacment when

native version aren't available

ChangeLog

@@ -64,4 +64,5 @@
 	* checking in bootstrapped files so CVS image can be built
 	  without automake/autoconf tools
 	* bumped revision to 2.8.5
+	* added libz and libbz2 replacement libraries
 

configure.in

@@ -98,7 +98,6 @@ then
         echo ""
 fi
 
-#AC_PROG_YACC
 AC_CHECK_PROGS([YACC],[bison],[none])
 if test "$YACC" = "none"
 then
@@ -116,34 +115,11 @@ fi
 # Checks for libraries.
 AC_CHECK_LIB([z], [gzwrite], [AC_DEFINE(HAVE_LIBZ,[],
 	[Define to 1 if you have the `z' library (-lz).])])
+AM_CONDITIONAL( [BUILD_LIBZ], [test "$ac_cv_lib_z_gzwrite" = no])
 AC_CHECK_LIB([bz2], [BZ2_bzwrite], [AC_DEFINE(HAVE_LIBBZ2,[],
 	[Define to 1 if you have the `bz2' library (-lbz2).])])
+AM_CONDITIONAL( [BUILD_LIBBZ2], [test "$ac_cv_lib_bz2_BZ2_bzwrite" = no])
 
-if test X"$ac_cv_enable_lxt" = Xyes; then
-    if test X"$ac_cv_lib_z_gzwrite" = Xno; then
-        echo ""
-        echo "*** Error: libz not found. lxt waveform dumping"
-        echo "    cannot be built. Rerun configure with --disable-lxt."
-        echo ""
-        exit 1;
-    fi
-    if test X"$ac_cv_lib_z_BZ2_bzwrite" = Xno; then
-        echo ""
-        echo "*** Error: libbz2 not found. lxt waveform dumping"
-        echo "    cannot be built. Rerun configure with --disable-lxt."
-        echo ""
-        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
@@ -184,5 +160,5 @@ then
     AC_DEFINE([HAVE_LXT2],1,[Set to one if lxt2 library should be used])
 fi
 
-AC_CONFIG_FILES([Makefile] [replace/Makefile] [src/Makefile] [lxt/Makefile] [doc/Makefile])
+AC_CONFIG_FILES([Makefile] [replace/Makefile] [replace/libz/Makefile] [replace/libbz2/Makefile] [src/Makefile] [lxt/Makefile] [doc/Makefile])
 AC_OUTPUT

lxt/Makefile.am

@@ -6,12 +6,18 @@ if USE_LXT2
    LXT2SOURCE=lxt2.c lxt2_write.c lxt2_write.h
    LXTLIB = liblxt.la
 endif
+if BUILD_LIBZ
+    LIBZ_INCLUDE = -I $(top_srcdir)/replace/libz
+endif
+if BUILD_LIBBZ2
+    LIBBZ2_INCLUDE = -I $(top_srcdir)/replace/libbz2
+endif
 noinst_LTLIBRARIES = $(LXTLIB)
 
 liblxt_la_SOURCES = $(LXTSOURCE) $(LXT2SOURCE)
 liblxt_la_LDFLAGS = -version-info 0:0:0
 
-AM_CFLAGS = -I $(top_srcdir)/src
+AM_CFLAGS = -I $(top_srcdir)/src $(LIBZ_INCLUDE) $(LIBBZ2_INCLUDE)
 
 
 EXTRA_DIST = LXT_Explained.html test.v lxt.tab

replace/Makefile.am

@@ -1,7 +1,18 @@
+if BUILD_LIBZ
+    LIBZ_DIR = libz
+    LIBZ_LIB = $(top_builddir)/replace/libz/libz.la
+endif
+if BUILD_LIBBZ2
+    LIBBZ2_DIR = libbz2
+    LIBBZ2_LIB = $(top_builddir)/replace/libbz2/libbz2.la
+endif
+
+SUBDIRS = $(LIBZ_DIR) $(LIBBZ2_DIR) .
+
 INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 
 noinst_LTLIBRARIES    = libreplace.la
 libreplace_la_SOURCES =
-libreplace_la_LIBADD  = $(LTLIBOBJS)
+libreplace_la_LIBADD  = $(LTLIBOBJS) $(LIBZ_LIB) $(LIBBZ2_LIB)
 
 MAINTAINERCLEANFILES = Makefile.in 

replace/libz/Makefile.am

@@ -0,0 +1,12 @@
+INCLUDES = -I$(top_builddir) 
+
+noinst_LTLIBRARIES    = libz.la
+libz_la_SOURCES = adler32.c compress.c crc32.c deflate.c \
+		  gzio.c infback.c inffast.c inflate.c \
+		  inftrees.c trees.c uncompr.c zutil.c \
+		  crc32.h inffast.h inflate.h trees.h zlib.h \
+		  deflate.h inffixed.h inftrees.h zconf.h zutil.h
+
+EXTRA_DIST = README
+
+