colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2005-08-29 Dan Williams <dcbw@redhat.com>

Browse Source 
Patch from j@bootlab.org
	- Make --without-named work
	- Make --with-dhcdbd work correctly


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@905 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-08-29 17:43:31 +00:00
parent 51089202e0
commit 5a77b7707c
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2005-08-29 Dan Williams <dcbw@redhat.com>
Patch from j@bootlab.org
- Make --without-named work
- Make --with-dhcdbd work correctly
2005-08-27 Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com> 2005-08-27 Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>
* configure.in: Added "ca" to ALL_LINGUAS. * configure.in: Added "ca" to ALL_LINGUAS.

9
configure.in
View File

@@ -190,20 +190,23 @@ AC_DEFINE_UNQUOTED(DBUS_SYSTEMD_DIR, "$DBUS_SYS_DIR", [Where system.d dir for DB
AC_ARG_WITH(named, AC_HELP_STRING([--with-named=PATH], [path to the named binary])) AC_ARG_WITH(named, AC_HELP_STRING([--with-named=PATH], [path to the named binary]))
AC_ARG_WITH(named_dir, AC_HELP_STRING([--with-named-dir=PATH], [path to the named data directory])) AC_ARG_WITH(named_dir, AC_HELP_STRING([--with-named-dir=PATH], [path to the named data directory]))
AC_ARG_WITH(named_user, AC_HELP_STRING([--with-named-user=USERNAME], [named username])) AC_ARG_WITH(named_user, AC_HELP_STRING([--with-named-user=USERNAME], [named username]))
if test "x${with_named}" = x; then if test "x${with_named}" = "x" -o "x${with_named}" = xno; then
AC_DEFINE(NM_NO_NAMED,,[Define if you want to disable named support]) AC_DEFINE(NM_NO_NAMED,,[Define if you want to disable named support])
fi fi
AC_DEFINE_UNQUOTED(NM_NAMED_BINARY_PATH, "$with_named", [Define to path of named binary]) AC_DEFINE_UNQUOTED(NM_NAMED_BINARY_PATH, "$with_named", [Define to path of named binary])
AC_DEFINE_UNQUOTED(NM_NAMED_DATA_DIR, "$with_named_dir", [Define to path of named data directory]) AC_DEFINE_UNQUOTED(NM_NAMED_DATA_DIR, "$with_named_dir", [Define to path of named data directory])
AC_DEFINE_UNQUOTED(NM_NAMED_USER, "$with_named_user", [Define to named username]) AC_DEFINE_UNQUOTED(NM_NAMED_USER, "$with_named_user", [Define to named username])
AC_ARG_WITH(DHCDBD_BINARY_PATH, AC_HELP_STRING([--with-dhcdbd=/path/to/dhcdbd], [path to dhcdbd])) AC_ARG_WITH(dhcdbd, AC_HELP_STRING([--with-dhcdbd=/path/to/dhcdbd], [path to dhcdbd]))
if test "x${DHCDBD_BINARY_PATH}" = x; then if test "x${with_dhcdbd}" = x; then
AC_PATH_PROG(DHCDBD_BINARY_PATH, dhcdbd, [], $PATH:/sbin:/usr/sbin) AC_PATH_PROG(DHCDBD_BINARY_PATH, dhcdbd, [], $PATH:/sbin:/usr/sbin)
if ! test -x "$DHCDBD_BINARY_PATH"; then if ! test -x "$DHCDBD_BINARY_PATH"; then
AC_MSG_ERROR(dhcdbd was not installed. See http://people.redhat.com/jvdias/dhcdbd) AC_MSG_ERROR(dhcdbd was not installed. See http://people.redhat.com/jvdias/dhcdbd)
fi fi
else
DHCDBD_BINARY_PATH="$with_dhcdbd"
fi fi
AC_DEFINE_UNQUOTED(DHCDBD_BINARY_PATH, "$DHCDBD_BINARY_PATH", [Define to path of dhcdbd binary])
AC_SUBST(DHCDBD_BINARY_PATH) AC_SUBST(DHCDBD_BINARY_PATH)
#### find the actual value for $prefix that we'll end up with #### find the actual value for $prefix that we'll end up with

1
src/dhcp-manager/Makefile.am
View File

@@ -8,7 +8,6 @@ libdhcp_manager_la_SOURCES = nm-dhcp-manager.c \
libdhcp_manager_la_CPPFLAGS = $(DBUS_CFLAGS) \ libdhcp_manager_la_CPPFLAGS = $(DBUS_CFLAGS) \
$(GTHREAD_CFLAGS) \ $(GTHREAD_CFLAGS) \
$(HAL_CFLAGS) \ $(HAL_CFLAGS) \
-DDHCDBD_BINARY_PATH=\"$(DHCDBD_BINARY_PATH)\" \
-g \ -g \
-Wall \ -Wall \
-DDBUS_API_SUBJECT_TO_CHANGE \ -DDBUS_API_SUBJECT_TO_CHANGE \