[sword-cvs] sword configure.ac,1.21,1.22

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword
In directory www:/tmp/cvs-serv31204

Modified Files:
	configure.ac 
Log Message:

and make --without-zlib mean something as well


Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/sword/configure.ac,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- configure.ac	8 Jul 2003 07:24:29 -0000	1.21
+++ configure.ac	8 Jul 2003 13:19:41 -0000	1.22
@@ -24,11 +24,6 @@
 AC_PROG_LIBTOOL
 
 AC_C_BIGENDIAN
-# ---------------------------------------------------------------------
-# Check libraries
-# ---------------------------------------------------------------------
-AC_CHECK_LIB(z, compress)
-#AC_CHECK_LIB(stdc++, cerr)
 
 # ---------------------------------------------------------------------
 # With options
@@ -50,6 +45,13 @@
 AC_ARG_ENABLE(examples,[  --enable-examples       build examples [default=no]],,enable_examples=no)
 AM_MAINTAINER_MODE
 
+# ---------------------------------------------------------------------
+# Check libraries
+# ---------------------------------------------------------------------
+if test x$with_zlib  = xyes; then
+	AC_CHECK_LIB(z, compress)
+fi
+
 
 # ---------------------------------------------------------------------
 # Find ICU tools
@@ -103,17 +105,24 @@
 CURL_CFLAGS=
 CURL_LIBS=
 if test x$enable_installmgr = xyes; then
-  AC_PATH_PROG(CURL_CONFIG, curl-config, no)
-  if test "$CURL_CONFIG" = "no" ; then
-	echo "*** The curl-config script installed by curl could not be found"
+  if test x$with_zlib  = xno; then
+	echo "*** Install manager support requires zlib"
+	echo "*** However you have specified no zlib"
 	echo "*** compiling without install manager support"
 	enable_installmgr=no
   else
+    AC_PATH_PROG(CURL_CONFIG, curl-config, no)
+    if test "$CURL_CONFIG" = "no" ; then
+	echo "*** The curl-config script installed by curl could not be found"
+	echo "*** compiling without install manager support"
+	enable_installmgr=no
+    else
 	echo "curl found - remote install options available"
 	CURL_CFLAGS=`$CURL_CONFIG --cflags`
 	CURL_LIBS=`$CURL_CONFIG --libs`
 	CXXFLAGS="$CXXFLAGS -DCURLAVAILABLE"
 	CFLAGS="$CFLAGS -DCURLAVAILABLE"
+    fi
   fi
 fi