diff --git a/ChangeLog b/ChangeLog index b05b980e32..8b9de05873 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-07-26 Dan Williams + + Patch from Andreas Hanke + + * configure.in + - Remove useless junk (#412530) + 2007-07-10 Christopher Aillon Patch from Robert Buchholz : diff --git a/configure.in b/configure.in index dae8ec5168..3d5d799921 100644 --- a/configure.in +++ b/configure.in @@ -234,7 +234,6 @@ else DBUS_SYS_DIR="${sysconfdir}/dbus-1/system.d" fi AC_SUBST(DBUS_SYS_DIR) -AC_DEFINE_UNQUOTED(DBUS_SYSTEMD_DIR, "$DBUS_SYS_DIR", [Where system.d dir for DBUS is]) # dhcdbd binary path AC_ARG_WITH(dhcdbd, AC_HELP_STRING([--with-dhcdbd=/path/to/dhcdbd], [path to dhcdbd])) @@ -275,37 +274,6 @@ 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 - -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 - -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]) - -## put prefix and exec_prefix back -prefix=$old_prefix -exec_prefix=$old_exec_prefix - AC_ARG_ENABLE(more-warnings, AC_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]), set_more_warnings="$enableval",[