mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-24 19:30:07 +01:00
2007-07-26 Dan Williams <dcbw@redhat.com>
Patch from Andreas Hanke <andreas.hanke@gmx-topmail.de> * configure.in - Remove useless junk (#412530) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2646 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
040864f7cb
commit
077f7d9976
2 changed files with 7 additions and 32 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2007-07-26 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
Patch from Andreas Hanke <andreas.hanke@gmx-topmail.de>
|
||||
|
||||
* configure.in
|
||||
- Remove useless junk (#412530)
|
||||
|
||||
2007-07-10 Christopher Aillon <caillon@redhat.com>
|
||||
|
||||
Patch from Robert Buchholz <rbu@gentoo.org>:
|
||||
|
|
|
|||
32
configure.in
32
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",[
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue