Lint fix. Headers check after ssl detected.

git-svn-id: file:///svn/unbound/trunk@31 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/Makefile.in b/Makefile.in
index 557c7a555584abd224d592e7655c258f2471cc92..8fd1c30045e26a7da5436691dac2de1f1c610a89 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,6 +23,7 @@ libdir=@libdir@
 includedir=@includedir@
 doxygen=@doxygen@
 libtool=@libtool@
+ldnsdir=@ldnsdir@
 
 CC=@CC@
 CPPFLAGS=@CPPFLAGS@ @DEFS@ -I.
@@ -85,7 +86,7 @@ realclean: clean
 lint:
        $Qfor i in $(ALL_SRC); do \
                echo lint $$i; \
-               $(LINT) $(LINTFLAGS) -I. -I$(srcdir) $(srcdir)/$$i ; \
+               $(LINT) $(LINTFLAGS) -I. -I$(srcdir) -I$(ldnsdir)/include $(srcdir)/$$i ; \
                if [ $$? -ne 0 ] ; then exit 1 ; fi ; \
        done
 

diff --git a/configure.ac b/configure.ac
index 792e56c5f74442d1487a3e0b3c824e4ad1a8d71e..76f0dd298aecd4662e3cd498ab10211b08d44382 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -111,7 +111,7 @@ AC_PROG_LIBTOOL
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([getopt.h stdarg.h stdbool.h openssl/ssl.h netinet/in.h time.h sys/param.h sys/socket.h],,, [AC_INCLUDES_DEFAULT])
+AC_CHECK_HEADERS([getopt.h stdarg.h stdbool.h netinet/in.h time.h sys/param.h sys/socket.h],,, [AC_INCLUDES_DEFAULT])
 
 # check for types
 AC_CHECK_TYPE(int8_t, char)
@@ -189,6 +189,7 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl=pathname],
         AC_SUBST(HAVE_SSL)
        AC_SUBST(RUNTIME_PATH)
     fi
+AC_CHECK_HEADERS([openssl/ssl.h],,, [AC_INCLUDES_DEFAULT])
 
 # check for libevent
 AC_ARG_WITH(ssl, AC_HELP_STRING([--with-libevent=pathname],
@@ -219,6 +220,7 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-libevent=pathname],
         fi
        AC_SUBST(RUNTIME_PATH)
     fi
+AC_CHECK_HEADERS([event.h],,, [AC_INCLUDES_DEFAULT])
 
 # check to see if libraries are needed for these functions.
 AC_CHECK_LIB(socket, socket)
@@ -240,7 +242,8 @@ AC_ARG_WITH(ldns,
        , [ specialldnsdir="$withval"
        CPPFLAGS="$CPPFLAGS -I$withval/include"
        LDFLAGS="$LDFLAGS -L$withval -L$withval/lib -lldns"
-       LDNSDIR="$withval"
+       ldnsdir="$withval"
+       AC_SUBST(ldnsdir)
 ])
 
 AC_CHECK_LIB(ldns, ldns_rr_new,, [AC_MSG_ERROR([Can't find ldns library])])

diff --git a/doc/Changelog b/doc/Changelog
index 48aef42c2b997aeae8c1a1dec40554185ca8bad1..e842e148927f1e65949db7a7d35fd8ae49002d8f 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+25  January 2007: Wouter
+       - fixed lint so it may work on BSD.
+
 24  January 2007: Wouter
        - cleaned up configure.ac.