diff options
| author | Michael Biebl <biebl@debian.org> | 2015-11-24 00:06:46 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-11-24 00:06:46 +0100 |
| commit | 5916ab88146d04273e6a1895ba3eed7322f2625f (patch) | |
| tree | 54479065ceda124ef5ff84890de64c52717a5645 /src/dnsmasq-manager | |
| parent | 3f830f75cf071873c36e1365f80c31e2422e1f7c (diff) | |
| parent | a6ece1a2aa19a6268335c87d4fdef20123dd04a5 (diff) | |
Merge tag 'upstream/1.0.8'
Upstream version 1.0.8
Diffstat (limited to 'src/dnsmasq-manager')
| -rw-r--r-- | src/dnsmasq-manager/nm-dnsmasq-manager.c | 1 | ||||
| -rw-r--r-- | src/dnsmasq-manager/tests/Makefile.am | 1 | ||||
| -rw-r--r-- | src/dnsmasq-manager/tests/Makefile.in | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c index a85631bc..0cc698d9 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.c +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c @@ -203,6 +203,7 @@ dm_watch_cb (GPid pid, gint status, gpointer user_data) } priv->pid = 0; + priv->dm_watch_id = 0; g_signal_emit (manager, signals[STATE_CHANGED], 0, NM_DNSMASQ_STATUS_DEAD); } diff --git a/src/dnsmasq-manager/tests/Makefile.am b/src/dnsmasq-manager/tests/Makefile.am index b51de6aa..e9200007 100644 --- a/src/dnsmasq-manager/tests/Makefile.am +++ b/src/dnsmasq-manager/tests/Makefile.am @@ -1,5 +1,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ + -I${top_builddir}/include \ -I${top_srcdir}/libnm-core \ -I${top_builddir}/libnm-core \ -I$(top_srcdir)/src/dnsmasq-manager \ diff --git a/src/dnsmasq-manager/tests/Makefile.in b/src/dnsmasq-manager/tests/Makefile.in index 8e6bb12e..fb2cd1d1 100644 --- a/src/dnsmasq-manager/tests/Makefile.in +++ b/src/dnsmasq-manager/tests/Makefile.in @@ -510,6 +510,7 @@ LOG_DRIVER = @LOG_DRIVER@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -652,6 +653,7 @@ with_resolvconf = @with_resolvconf@ with_valgrind = @with_valgrind@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ + -I${top_builddir}/include \ -I${top_srcdir}/libnm-core \ -I${top_builddir}/libnm-core \ -I$(top_srcdir)/src/dnsmasq-manager \ |