diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/configure.in b/configure.in index 851b2e89da..2be87c8f09 100644 --- a/configure.in +++ b/configure.in @@ -278,36 +278,17 @@ fi AC_DEFINE_UNQUOTED(IP_BINARY_PATH, "$IP_BINARY_PATH", [Define to path of ip binary]) AC_SUBST(IP_BINARY_PATH) -#### find the actual value for $prefix that we'll end up with -## (I know this is broken and should be done in the Makefile, but -## that's a major pain and almost nobody actually seems to care) -REAL_PREFIX= -if test "x$prefix" = "xNONE"; then - REAL_PREFIX=$ac_default_prefix -else - REAL_PREFIX=$prefix -fi - -## temporarily change prefix and exec_prefix -old_prefix=$prefix -prefix=$REAL_PREFIX +AS_AC_EXPAND(PREFIX, $prefix) +AC_SUBST(PREFIX) -if test "x$exec_prefix" = xNONE ; then - REAL_EXEC_PREFIX=$REAL_PREFIX -else - REAL_EXEC_PREFIX=$exec_prefix -fi -old_exec_prefix=$exec_prefix -exec_prefix=$REAL_EXEC_PREFIX +AS_AC_EXPAND(BINDIR, $bindir) +AC_SUBST(BINDIR) -BINDIR_TMP="$bindir" -EXPANDED_BINDIR=`eval echo $BINDIR_TMP` -AC_SUBST(EXPANDED_BINDIR) -AC_DEFINE_UNQUOTED(EXPANDED_BINDIR, "$EXPANDED_BINDIR", [Where the executables are installed]) +AS_AC_EXPAND(LIBDIR, $libdir) +AC_SUBST(LIBDIR) -## put prefix and exec_prefix back -prefix=$old_prefix -exec_prefix=$old_exec_prefix +AS_AC_EXPAND(LIBEXECDIR, $libexecdir) +AC_SUBST(LIBEXECDIR) AC_ARG_ENABLE(more-warnings, AC_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]), |