diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2014-04-26 20:55:17 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2014-04-26 20:55:17 +0200 |
| commit | 0dccbc804e92f56afd9e7d598dce4bcd8716bbcc (patch) | |
| tree | 1054a65c0cde38dc89e5c692a3a7458160823afa /src/dnsmasq-manager | |
| parent | 7df62b86e35a67049a4bc7810c29994d8a7ef175 (diff) | |
| parent | 59c3714a494c3b3765657c0551ad82842d98a7d2 (diff) | |
Merge tag 'upstream/0.9.8.10'
Upstream version 0.9.8.10
Diffstat (limited to 'src/dnsmasq-manager')
| -rw-r--r-- | src/dnsmasq-manager/Makefile.am | 14 | ||||
| -rw-r--r-- | src/dnsmasq-manager/Makefile.in | 14 | ||||
| -rw-r--r-- | src/dnsmasq-manager/nm-dnsmasq-manager.c | 4 |
3 files changed, 15 insertions, 17 deletions
diff --git a/src/dnsmasq-manager/Makefile.am b/src/dnsmasq-manager/Makefile.am index 8b7dd683..42706cc2 100644 --- a/src/dnsmasq-manager/Makefile.am +++ b/src/dnsmasq-manager/Makefile.am @@ -1,20 +1,18 @@ -INCLUDES = \ +noinst_LTLIBRARIES = libdnsmasq-manager.la + +libdnsmasq_manager_la_CPPFLAGS = \ -I${top_srcdir}/libnm-util \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/posix-signals \ -I${top_srcdir}/src \ - -I${top_srcdir}/include - -noinst_LTLIBRARIES = libdnsmasq-manager.la + -I${top_srcdir}/include \ + $(GLIB_CFLAGS) \ + -DLOCALSTATEDIR=\"$(localstatedir)\" libdnsmasq_manager_la_SOURCES = \ nm-dnsmasq-manager.h \ nm-dnsmasq-manager.c -libdnsmasq_manager_la_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - -DLOCALSTATEDIR=\"$(localstatedir)\" - libdnsmasq_manager_la_LIBADD = \ $(top_builddir)/src/logging/libnm-logging.la \ $(top_builddir)/src/posix-signals/libnm-posix-signals.la \ diff --git a/src/dnsmasq-manager/Makefile.in b/src/dnsmasq-manager/Makefile.in index 1877f88d..9b20331f 100644 --- a/src/dnsmasq-manager/Makefile.in +++ b/src/dnsmasq-manager/Makefile.in @@ -206,6 +206,7 @@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ DHCPCD_PATH = @DHCPCD_PATH@ DLLTOOL = @DLLTOOL@ +DNSMASQ_PATH = @DNSMASQ_PATH@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -228,6 +229,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -412,22 +414,20 @@ with_dhclient = @with_dhclient@ with_dhcpcd = @with_dhcpcd@ with_netconfig = @with_netconfig@ with_resolvconf = @with_resolvconf@ -INCLUDES = \ +noinst_LTLIBRARIES = libdnsmasq-manager.la +libdnsmasq_manager_la_CPPFLAGS = \ -I${top_srcdir}/libnm-util \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/posix-signals \ -I${top_srcdir}/src \ - -I${top_srcdir}/include + -I${top_srcdir}/include \ + $(GLIB_CFLAGS) \ + -DLOCALSTATEDIR=\"$(localstatedir)\" -noinst_LTLIBRARIES = libdnsmasq-manager.la libdnsmasq_manager_la_SOURCES = \ nm-dnsmasq-manager.h \ nm-dnsmasq-manager.c -libdnsmasq_manager_la_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - -DLOCALSTATEDIR=\"$(localstatedir)\" - libdnsmasq_manager_la_LIBADD = \ $(top_builddir)/src/logging/libnm-logging.la \ $(top_builddir)/src/posix-signals/libnm-posix-signals.la \ diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c index f708f6f6..083fb533 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.c +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c @@ -171,16 +171,16 @@ static inline const char * nm_find_dnsmasq (void) { static const char *dnsmasq_binary_paths[] = { + DNSMASQ_PATH, "/usr/local/sbin/dnsmasq", "/usr/sbin/dnsmasq", "/sbin/dnsmasq", NULL }; - const char **dnsmasq_binary = dnsmasq_binary_paths; while (*dnsmasq_binary != NULL) { - if (g_file_test (*dnsmasq_binary, G_FILE_TEST_EXISTS)) + if (**dnsmasq_binary && g_file_test (*dnsmasq_binary, G_FILE_TEST_EXISTS)) break; dnsmasq_binary++; } |