Changeset 2127 for box/trunk/configure.ac

Timestamp:

04/04/2008 23:11:45 (4 years ago)

Author:

chris

Message:

Undo mangling by tailor

File:

• box/trunk/configure.ac (modified) (3 diffs)

box/trunk/configure.ac

@@ -6 +6 @@
 AC_CONFIG_SRCDIR([lib/common/Box.h])
 AC_CONFIG_HEADERS([lib/common/BoxConfig.h])
-
-# override default sysconfdir, for backwards compatibility
-test "$sysconfdir" = NONE && sysconfdir=/etc
-test "$localstatedir" = NONE && localstatedir=/var/run
 
 touch install-sh
@@ -63 +59 @@
 esac
 
-AC_CHECK_HEADER([zlib.h],, [AC_MSG_ERROR([[cannot find zlib.h]])])
 AC_CHECK_LIB([z], [zlibVersion],, [AC_MSG_ERROR([[cannot find zlib]])])
 VL_LIB_READLINE([have_libreadline=yes], [have_libreadline=no])
@@ -274 +269 @@
   LIBS="-Wl,-Bstatic $LIBS -Wl,-Bdynamic"
 fi
+
+# override default sysconfdir, for backwards compatibility
+test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
+test "$localstatedir" = '${prefix}/var' && localstatedir=/var
 
 ## Kludge to allow makeparcels.pl to use bindir. This is not a good long term