include and make tweaks

diff --git a/Makefile.in b/Makefile.in
index fe62f24e86dd35f5772b41e96ae1e27f7b91c6de..cc6ff8968583f56adfe96f1982a66365406e6184 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -88,6 +88,14 @@ tools:               $(PROG_TARGETS) drill
 drill:                 ./drill/config.log
                ( cd drill ; $(MAKE) -f Makefile all)
 
+./examples/config.log:
+               ( mkdir examples ; cd examples ; ../$(srcdir)/examples/configure LDFLAGS="-L../.libs" CPPFLAGS="-I.. -I../..")
+
+examples:              ./examples/config.log
+               ( cd examples ; $(MAKE) -f Makefile all)
+
+
+
 lib:           $(LIBDNS_OBJECTS) b64_pton$U.o b64_ntop$U.o
                $(LINK_LIB) -o libldns.la $(LIBDNS_LOBJECTS) b64_pton$U.lo b64_ntop$U.lo \
                -rpath $(prefix)/lib
@@ -202,7 +210,7 @@ clean:
 
 distclean: clean docclean libclean
        rm -f ltmain.sh
-       (cd drill ; $(MAKE) -f Makefile clean)
+       (cd drill ; $(MAKE) -f Makefile distclean)
 
 realclean: clean docclean libclean
        rm -f config.status

diff --git a/configure.ac b/configure.ac
index e0c748f4b7350352fc7cd31c2b7445ee99fad100..d25260658ae6c5b2bdfa43bae391fd6c4d00e426 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -117,7 +117,7 @@ AC_HEADER_STDC
 #AC_HEADER_SYS_WAIT
 #AC_CHECK_HEADERS([getopt.h fcntl.h stdlib.h string.h strings.h unistd.h])
 # do the very minimum - we can always extend this
-AC_CHECK_HEADERS([getopt.h stdbool.h openssl/ssl.h netinet/in.h])
+AC_CHECK_HEADERS([getopt.h stdbool.h openssl/ssl.h netinet/in.h time.h])
 AC_CHECK_HEADERS(sys/param.h sys/mount.h,,,
 [
   [

diff --git a/drill/Makefile.in b/drill/Makefile.in
index 8137707e38a55841f853c94233d34064c7f0c6c2..822376f88019a06987687310528f687a579c14ef 100644 (file)
--- a/drill/Makefile.in
+++ b/drill/Makefile.in
@@ -62,9 +62,15 @@ clean:
 docclean:
        rm -rf doxydoc
 
+distclean: clean docclean
+       rm -f config.h
+       rm -f drill.h
+
 realclean: clean docclean
        rm -f tags
        rm -f config.log
+       rm -f config.sub
+       rm -f ltmain.sh
        rm -f config.status
        rm -rf autom4te.cache
        rm -f config.h

diff --git a/drill/configure.ac b/drill/configure.ac
index f2d9d28578cb15f7d90009d4212a6ea40e7907fa..6aa4c0e1ff7db25878594e4e8dd8fae7631e2613 100644 (file)
--- a/drill/configure.ac
+++ b/drill/configure.ac
@@ -15,7 +15,7 @@ AC_PROG_MAKE_SET
 #AC_HEADER_STDC
 #AC_HEADER_SYS_WAIT
 # do the very minimum - we can always extend this
-AC_CHECK_HEADERS([getopt.h stdlib.h stdio.h assert.h netinet/in.hctype.h])
+AC_CHECK_HEADERS([getopt.h stdlib.h stdio.h assert.h netinet/in.hctype.h time.h])
 AC_CHECK_HEADERS(sys/param.h sys/mount.h,,,
 [
   [
@@ -43,6 +43,27 @@ AC_CHECK_HEADER(ldns/dns.h,,  [
 
 #AC_DEFINE_UNQUOTED(SYSCONFDIR, "$sysconfdir")
 
+AH_BOTTOM([
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <assert.h>
+
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#ifdef HAVE_TIME_H
+#include <time.h>
+#endif
+])
+
 AC_CONFIG_FILES([Makefile
                 drill.h
                  ])

diff --git a/drill/drill.h.in b/drill/drill.h.in
index a1898352061b631934f9b20d4521030b5ef8995c..d25fca00bb6805d4ced559b7079dc20614f63fae 100644 (file)
--- a/drill/drill.h.in
+++ b/drill/drill.h.in
@@ -10,16 +10,6 @@
 #define _DRILL_H_
 #include "config.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <stdbool.h>
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif /* HAVE_STDINT_H */
-
 #include "drill_util.h"
 
 #define DRILL_VERSION "@PACKAGE_VERSION@"

diff --git a/examples/configure.ac b/examples/configure.ac
index 955acc8bcccbcc6b9076d48a5dfa99d312e1bb1f..03bcaf95e9ec753024b1b64f43223d19d4e5d4cf 100644 (file)
--- a/examples/configure.ac
+++ b/examples/configure.ac
@@ -39,6 +39,36 @@ AC_CHECK_HEADER(ldns/dns.h,,  [
        ]
 )
 
+AH_BOTTOM([
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <assert.h>
+
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+])
+
+
 #AC_CHECK_FUNCS([mkdir rmdir strchr strrchr strstr])
 
 #AC_DEFINE_UNQUOTED(SYSCONFDIR, "$sysconfdir")

diff --git a/examples/ldns-mx.c b/examples/ldns-mx.c
index 82c90ccacb9368f147b557e8a6a105c7d2944f62..e74b7be0c8c732edba4dc4ff5c62ae50fabf488a 100644 (file)
--- a/examples/ldns-mx.c
+++ b/examples/ldns-mx.c
@@ -5,13 +5,7 @@
  * Licensed under the GPL version 2
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <stdbool.h>
-
-#include <stdint.h>
+#include "config.h"
 
 #include <ldns/dns.h>