[pclasses-cvs] pclasses2 configure.pclasses2,1.23,1.24

[stephan b. <sg...@us...>]

Update of /cvsroot/pclasses/pclasses2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17191

Modified Files:
	configure.pclasses2 
Log Message:
Added ZLib.o if zlib is found by configure.

Index: configure.pclasses2
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/configure.pclasses2,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- configure.pclasses2	30 Dec 2004 20:14:10 -0000	1.23
+++ configure.pclasses2	3 Jan 2005 18:27:55 -0000	1.24
@@ -19,7 +19,7 @@
 ####### compilers:
 toc_test_require gnu_cpp_tools
 toc_test_require gcc_try_compile ${TOC_HOME}/tests/cpp/check_stl_newstyle.cpp
-test x1 = x${configure_enable_ccdv} && toc_test use_ccdv
+test x1 = "x${configure_enable_ccdv-0}" && toc_test use_ccdv
 ############################################################
 # accumulate -I and -L/-l entries here:
 # Reminder: these are the flags for linking
@@ -27,10 +27,18 @@
 ldadd="${LDADD}"
 ############################################################
 
+####################################################
+# prefer ltdl, else allow dl.
+toc_test libltdl || toc_test_require libdl
+####################################################
+
+########################################################
+# compression support...
+toc_test bzlib && toc_export PCLASSES_HAVE_BZ2LIB=1
+toc_test zlib && toc_export PCLASSES_HAVE_ZLIB=1
+compression_ldadd="${LDADD_ZLIB} ${LDADD_BZLIB}"
+#########################################################
 
-toc_test libltdl || toc_test_require libdl # prefer ltdl, else allow dl.
-toc_test bzlib
-toc_test zlib
 
 UCD=./src/Unicode/UnicodeData.txt
 test -e $UCD || {
@@ -189,7 +197,7 @@
 toc_export LIBPNET_CFLAGS=""
 
 toc_export LIBPIO_BASENAME=pclasses_io
-toc_export LIBPIO_LDADD="${LIBPCORE_CLIENT_LDADD}"
+toc_export LIBPIO_LDADD="${LIBPCORE_CLIENT_LDADD} ${compression_ldadd}"
 toc_export LIBPIO_CLIENT_LDADD="-l${LIBPIO_BASENAME}"
 toc_export LIBPIO_CFLAGS="${inc}"