From 6d13ec19cd1ac3049e9d072df2c0b93485a0d1a9 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Fri, 28 Aug 2015 13:33:02 +0200
Subject: [PATCH] --with-getdns_query configure option +

make pub target (for signing and hashing dist tarball) +
make megaclean target (for erasing all source and git reset --hard)
---
 ChangeLog            |  1 +
 Makefile.in          | 30 ++++++++++++++++++++++++++----
 configure.ac         | 17 +++++++++++++++++
 src/test/Makefile.in |  3 +++
 4 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 01d960a1..f1af93f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
   * Fix string bindata's need not contain trailing zero byte
   * --enable-stub-only configure option for stub only operation.
     Stub mode will be the default.  Removes the dependency on libunbound
+  * --with-getdns_query compiles and installs the getdns_query tool too
 
 * 2015-07-18: Version 0.3.1
   * Fix repeating rdata fields
diff --git a/Makefile.in b/Makefile.in
index 02bd581f..0b0f8f9f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,12 +43,12 @@ docdir = @docdir@
 srcdir = @srcdir@
 INSTALL = @INSTALL@
 
+all : default @GETDNS_QUERY@
+
 default:
 	cd src && $(MAKE) $@
 
-all : default
-
-install: all
+install: all @INSTALL_GETDNS_QUERY@
 	$(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
 	$(INSTALL) -m 644 $(srcdir)/AUTHORS $(DESTDIR)$(docdir)
 	$(INSTALL) -m 644 $(srcdir)/ChangeLog $(DESTDIR)$(docdir)
@@ -80,7 +80,7 @@ install: all
 	@echo "***  at package installation time from the post-install script."
 	@echo "***"
 
-uninstall:
+uninstall: @UNINSTALL_GETDNS_QUERY@
 	rm -rf $(DESTDIR)$(docdir)
 	cd doc && $(MAKE) $@
 	cd src && $(MAKE) $@
@@ -97,6 +97,12 @@ test:
 getdns_query:
 	cd src && $(MAKE) $@
 
+install-getdns_query:
+	cd src/test && $(MAKE) install
+
+uninstall-getdns_query:
+	cd src/test && $(MAKE) uninstall
+
 clean:
 	cd src && $(MAKE) $@
 	cd doc && $(MAKE) $@
@@ -121,9 +127,25 @@ distclean:
 	rm -f m4/ltoptions.m4
 	rm -f m4/ltsugar.m4
 	rm -f m4/ltversion.m4
+	rm -f $(distdir).tar.gz $(distdir).tar.gz.sha1
+	rm -f $(distdir).tar.gz.md5 $(distdir).tar.gz.asc
+
+megaclean:
+	cd $(srcdir) && rm -fr * .dir-locals.el .gitignore .indent.pro .travis.yml && git reset --hard
 
 dist: $(distdir).tar.gz
 
+pub: $(distdir).tar.gz.sha1 $(distdir).tar.gz.md5 $(distdir).tar.gz.asc
+
+$(distdir).tar.gz.sha1: $(distdir).tar.gz
+	openssl sha1 $(distdir).tar.gz >$@
+
+$(distdir).tar.gz.md5: $(distdir).tar.gz
+	openssl md5 $(distdir).tar.gz >$@
+
+$(distdir).tar.gz.asc: $(distdir).tar.gz
+	gpg --armor --detach-sig $(distdir).tar.gz
+
 bindist: $(bintar)
 
 $(bintar): $(distdir)
diff --git a/configure.ac b/configure.ac
index 7b4d2376..68dbf899 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,6 +218,23 @@ case "$enable_stub_only" in
 		;;
 esac
 
+AC_ARG_WITH(getdns_query, AS_HELP_STRING([--with-getdns_query],
+	[Also compile and install the getdns_query tool]),
+	[], [withval="no"])
+if test x_$withval = x_no; then
+	GETDNS_QUERY=""
+	INSTALL_GETDNS_QUERY=""
+	UNINSTALL_GETDNS_QUERY=""
+else
+	GETDNS_QUERY="getdns_query"
+	INSTALL_GETDNS_QUERY="install-getdns_query"
+	UNINSTALL_GETDNS_QUERY="uninstall-getdns_query"
+fi
+AC_SUBST(GETDNS_QUERY)
+AC_SUBST(INSTALL_GETDNS_QUERY)
+AC_SUBST(UNINSTALL_GETDNS_QUERY)
+
+
 # search to set include and library paths right
 # find libidn
 my_with_libidn=1
diff --git a/src/test/Makefile.in b/src/test/Makefile.in
index 6db97e2b..e4b09cf8 100644
--- a/src/test/Makefile.in
+++ b/src/test/Makefile.in
@@ -131,6 +131,9 @@ install: getdns_query
 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
 	$(LIBTOOL) --mode=install cp getdns_query $(DESTDIR)$(bindir)
 
+uninstall:
+	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(bindir)/getdns_query
+
 nolibcheck:
 	@echo "***"
 	@echo "*** Cannot run unit tests, because they could not be compiled,"