[avahi] [PATCH 2/2] build-sys: prepare for automake 1.13 by removing use of $(mkdir_p)

[Diego Elio Pettenò]

Starting from version 1.13, automake will no longer provide
$(mkdir_p); automake 1.12 already started warning about it, which can
cause problems if -Werror is used for whatever reason.

Using MKDIR_P requires one further check in autoconf, but it's
supported by the version already in use.

Signed-off-by: Diego Elio Pettenò <flameeyes at flameeyes.eu>
---
 avahi-autoipd/Makefile.am |    2 +-
 avahi-daemon/Makefile.am  |    2 +-
 avahi-utils/Makefile.am   |    4 ++--
 configure.ac              |    1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/avahi-autoipd/Makefile.am b/avahi-autoipd/Makefile.am
index 263e991..56f7a35 100644
--- a/avahi-autoipd/Makefile.am
+++ b/avahi-autoipd/Makefile.am
@@ -76,7 +76,7 @@ dhcliententerdir = $(sysconfdir)/dhcp/dhclient-enter-hooks.d
 dhclientexitdir = $(sysconfdir)/dhcp/dhclient-exit-hooks.d
 
 install-exec-hook: dhclient-exit-hook dhclient-enter-hook
-	$(mkdir_p) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir)
+	$(MKDIR_P) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir)
 	$(INSTALL) dhclient-enter-hook $(DESTDIR)$(dhcliententerdir)/avahi-autoipd
 	$(INSTALL) dhclient-exit-hook $(DESTDIR)$(dhclientexitdir)/avahi-autoipd
 
diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index b5d2bf4..1f5ff3f 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -169,7 +169,7 @@ xmllint:
 	done
 
 install-data-local:
-	test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run"
+	$(MKDIR_P) "$(DESTDIR)$(localstatedir)/run"
 
 update-systemd:
 	curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c
diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 1abc79a..a270282 100644
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -54,8 +54,8 @@ avahi_set_host_name_CFLAGS = $(AM_CFLAGS)
 avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
 
 install-exec-local:
-	$(mkdir_p) $(DESTDIR)/$(bindir) && \
-		cd $(DESTDIR)/$(bindir) && \
+	$(MKDIR_P) $(DESTDIR)/$(bindir)
+	cd $(DESTDIR)/$(bindir) && \
 		rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \
 		$(LN_S) avahi-resolve avahi-resolve-host-name && \
 		$(LN_S) avahi-resolve avahi-resolve-address && \
diff --git a/configure.ac b/configure.ac
index 0e190ba..f29fe81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,7 @@ AM_PROG_CC_C_O
 AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CPP
 AC_PROG_INSTALL
+AC_PROG_MKDIR_P
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_GCC_TRADITIONAL
-- 
1.7.8.6