Changeset 2123

Timestamp:

03/10/2008 07:15:27 PM (6 months ago)

Author:

jan

Message:

make configure checks for --with-pcre, --with-zlib and --with-bzip2 failing if the headers aren't found

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• configure.in (modified) (4 diffs)

branches/lighttpd-1.4.x/NEWS

@@ -50 +50 @@
   * fix sending "408 - Timeout" instead of "410 - Gone" for timedout urls in mod_secdownload (#1440)
   * workaround #1587: require userdir.path to be set to enable mod_userdir (empty string allowed)
+  * make configure checks for --with-pcre, --with-zlib and --with-bzip2 failing if the headers aren't found
 
 - 1.4.18 - 2007-09-09

branches/lighttpd-1.4.x/configure.in

@@ -267 +267 @@
     ])
     LIBS="$OLDLIBS"
+  else
+     AC_MSG_ERROR([pcre-config not found, install the pcre-devel package and build with --without-pcre])
   fi
 fi
@@ -272 +274 @@
 AC_SUBST(PCRE_LIB)
 
-AC_CHECK_LIB(z, deflate, [
-  AC_CHECK_HEADERS([zlib.h],[
-    Z_LIB=-lz
-    AC_DEFINE([HAVE_LIBZ], [1], [libz])
-    AC_DEFINE([HAVE_ZLIB_H], [1])
+AC_MSG_CHECKING(for zlib support)
+AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib],[Enable zlib support for mod_compress]),
+    [WITH_ZLIB=$withval],[WITH_ZLIB=yes])
+AC_MSG_RESULT([$WITH_ZLIB])
+
+if test "$WITH_ZLIB" != "no"; then
+  AC_CHECK_LIB(z, deflate, [
+    AC_CHECK_HEADERS([zlib.h],[
+      Z_LIB=-lz
+      AC_DEFINE([HAVE_LIBZ], [1], [libz])
+      AC_DEFINE([HAVE_ZLIB_H], [1])
+    ])
   ])
-])
+  if test x$Z_LIB = x; then
+     AC_MSG_ERROR([zlib-headers and/or libs where not found, install them or build with --without-zlib])
+  fi
+fi
 AC_SUBST(Z_LIB)
 
@@ -294 +306 @@
     ])
   ])
+  if test x$BZ_LIB = x; then
+     AC_MSG_ERROR([bzip2-headers and/or libs where not found, install them or build with --without-bzip2])
+  fi
 fi
 AC_SUBST(BZ_LIB)
@@ -325 +340 @@
   AC_CHECK_FUNCS([FAMNoExists])
   LIBS=$OLD_LIBS
+  
+  if test x$FAM_LIBS = x; then
+     AC_MSG_ERROR([fam/gamin-headers and/or libs where not found, install them or build with --without-fam])
+  fi
 fi