diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index f68c8b9f..f8390ec9 100644 --- a/configure.ac +++ b/configure.ac @@ -6,10 +6,6 @@ AC_INIT([Box Backup], 0.11, [boxbackup@fluffy.co.uk]) 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 AC_CANONICAL_SYSTEM test -s install-sh || rm install-sh @@ -62,7 +58,6 @@ winnt) ;; ;; 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,6 +269,10 @@ if test "x$enable_static_bin" = "xyes"; then 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 ## solution because it prevents use of "make exec_prefix=/some/dir" saved_prefix=$prefix |