install ldns-config by default (unless the configure option --disable-ldns-config...

diff --git a/Changelog b/Changelog
index 74f41021b8759570e2307e77587dd4902d5c0d44..7b30c3e72f115e71fe503f71c3756ffaa9646e92 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,9 @@
 x.x.x
+       Additions:
+       * Addition of an ldns-config script which gives cflags and libs
+         values, for use in configure scripts for applications that use
+         use ldns. Can be disabled with ./configure --disable-ldns-config
+
        Bugfixes:
        * ldns_is_rrset did not go through the complete rrset, but
           only compared the first two records. Thanks to Olafur

diff --git a/Makefile.in b/Makefile.in
index 4518cfad9e2ff3f5eeb764dfde47a7b5c819cb08..672333a9b12939abc93d4f6b4102a9d07eb246bd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,6 +30,7 @@ RUNTIME_PATH  = @RUNTIME_PATH@
 DATE           = $(shell date +%Y%m%d)
 LIBTOOL                = $(libtool) --tag=CC
 ACLOCAL_AMFLAGS        = -Im4
+INSTALL_LDNS_CONFIG = @INSTALL_LDNS_CONFIG@
 
 LINT           = splint
 LINTFLAGS      = +quiet -weak -warnposix -unrecog -Din_addr_t=uint32_t -Du_int=unsigned -Du_char=uint8_t -preproc -D__u16=uint16_t -fixedformalarray
@@ -128,12 +129,18 @@ manpages: $(srcdir)/doc/function_manpages
                cat $(srcdir)/ldns/*.h | $(srcdir)/doc/doxyparse.pl -m $(srcdir)/doc/function_manpages 2>&1 | \
                grep -v ^doxygen | grep -v ^cat  > doc/ldns_manpages
 
-install:       install-h install-lib install-manpages
+install:       install-h install-lib install-config install-manpages
 
 uninstall:     uninstall-manpages uninstall-h uninstall-lib
 
 destclean:     uninstall
 
+install-config:
+       if [ $(INSTALL_LDNS_CONFIG) = "yes" ] ; then \
+               $(INSTALL) -d $(DESTDIR)$(bindir); \
+               $(INSTALL) -m 755 packaging/ldns-config $(DESTDIR)$(bindir)/; \
+       fi
+
 install-manpages:      manpages
                ${INSTALL} -d $(DESTDIR)$(mandir)/man3
                cp -Rp doc/man/man3/* $(DESTDIR)$(mandir)/man3/

diff --git a/configure.ac b/configure.ac
index 6271f5f7d4a5bc072258424630fcfd3b2cc08c34..53e57e7c3374a3e9b5c08df0c4ee0059d25f29b3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -91,6 +91,15 @@ case "$enable_sha2" in
         ;;
 esac
 
+# add option to disable installation of ldns-config script
+AC_ARG_ENABLE(ldns-config, [ --disable-ldns-config          disable installation of ldns-config (default=enabled)],
+       enable_ldns_config=$enableval, enable_ldns_config=yes)
+if test "x$enable_ldns_config" = xyes; then
+       INSTALL_LDNS_CONFIG="yes"
+else
+       INSTALL_LDNS_CONFIG="no"
+fi
+AC_SUBST(INSTALL_LDNS_CONFIG)
 
 # add option to disable the evil rpath
 dnl Check whether to use rpath or not