From de2e0e55ade7bc9bea358829852f8aa94e11c9c0 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sun, 15 May 2005 13:34:41 +0000 Subject: [PATCH] 2005-05-15 Dan Williams * configure.in - Check for dhcdbd and error if its not found * src/dhcp-manager/Makefile.am src/dhcp-manager/nm-dhcp-manager.c - Use path to dhcdbd that configure found git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@630 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 9 +++++++++ configure.in | 6 ++++++ src/dhcp-manager/Makefile.am | 1 + src/dhcp-manager/nm-dhcp-manager.c | 8 +++----- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 833cdc750..3b5726f2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-05-15 Dan Williams + + * configure.in + - Check for dhcdbd and error if its not found + + * src/dhcp-manager/Makefile.am + src/dhcp-manager/nm-dhcp-manager.c + - Use path to dhcdbd that configure found + 2005-05-14 Dan Williams * gnome/applet/nm-device.c diff --git a/configure.in b/configure.in index 9972599d4..ee62358f5 100644 --- a/configure.in +++ b/configure.in @@ -193,6 +193,12 @@ AC_DEFINE_UNQUOTED(NM_NAMED_BINARY_PATH, "$with_named", [Define to path of named 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_PATH_PROG(DHCDBD_BINARY_PATH, dhcdbd) +if ! test -x "$DHCDBD_BINARY_PATH"; then + AC_MSG_ERROR(dhcdbd was not installed. See http://people.redhat.com/jvdias/dhcdbd) +fi +AC_SUBST(DHCDBD_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) diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am index 6e00438d5..ed62a734f 100644 --- a/src/dhcp-manager/Makefile.am +++ b/src/dhcp-manager/Makefile.am @@ -8,6 +8,7 @@ libdhcp_manager_la_SOURCES = nm-dhcp-manager.c \ libdhcp_manager_la_CPPFLAGS = $(DBUS_CFLAGS) \ $(GTHREAD_CFLAGS) \ $(HAL_CFLAGS) \ + -DDHCDBD_BINARY_PATH=\"$(DHCDBD_BINARY_PATH)\" \ -g \ -Wall \ -DDBUS_API_SUBJECT_TO_CHANGE \ diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index a196a4cac..8844b512e 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -31,8 +31,6 @@ #include -#define DHCP_DAEMON_PROGRAM "/sbin/dhcdbd" - struct NMDHCPManager { NMData * data; @@ -87,19 +85,19 @@ static gboolean nm_dhcp_manager_exec_daemon (NMDHCPManager *manager) g_return_val_if_fail (manager != NULL, FALSE); dhcp_argv = g_ptr_array_new (); - g_ptr_array_add (dhcp_argv, DHCP_DAEMON_PROGRAM); + g_ptr_array_add (dhcp_argv, DHCDBD_BINARY_PATH); g_ptr_array_add (dhcp_argv, "--system"); g_ptr_array_add (dhcp_argv, NULL); if (!g_spawn_async ("/", (char **) dhcp_argv->pdata, NULL, 0, NULL, NULL, &pid, &error)) { g_ptr_array_free (dhcp_argv, TRUE); - nm_warning ("Could not activate the DHCP daemon " DHCP_DAEMON_PROGRAM ". error: '%s'.", error->message); + nm_warning ("Could not activate the DHCP daemon " DHCDBD_BINARY_PATH ". error: '%s'.", error->message); g_error_free (error); return FALSE; } g_ptr_array_free (dhcp_argv, TRUE); - nm_info ("Activated the DHCP daemon " DHCP_DAEMON_PROGRAM " with PID %d.", pid); + nm_info ("Activated the DHCP daemon " DHCDBD_BINARY_PATH " with PID %d.", pid); return TRUE; }