]> git.ipfire.org Git - thirdparty/unbound.git/commitdiff
Nicer.
authorWouter Wijngaards <wouter@nlnetlabs.nl>
Tue, 24 Mar 2009 13:55:12 +0000 (13:55 +0000)
committerWouter Wijngaards <wouter@nlnetlabs.nl>
Tue, 24 Mar 2009 13:55:12 +0000 (13:55 +0000)
git-svn-id: file:///svn/unbound/trunk@1551 be551aaa-1e26-0410-a405-d3ace91eadb9

Makefile.in
acx_nlnetlabs.m4
configure
configure.ac
doc/Changelog

index b547a48460e9bd50741bbc236f21d6bd2cd4a384..96a55cbaa68a01caa463af1b29212cfdfe322632 100644 (file)
@@ -50,7 +50,7 @@ endif
 CPPFLAGS:=$(strip $(CPPFLAGS))
 CFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@
-LIBS=@LIBS@
+LIBS=$(strip @LIBS@)
 LIBOBJS=@LIBOBJS@
 RUNTIME_PATH=@RUNTIME_PATH@
 DEPFLAG=@DEPFLAG@
@@ -154,8 +154,8 @@ $(BUILD)%.o:      $(srcdir)/%.rc $(srcdir)/config.h
 endif
 
 COMPILE=$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS)
-LINK=$(LIBTOOL) --tag=CC --mode=link $(CC) $(staticexe) $(RUNTIME_PATH) $(CFLAGS) $(LDFLAGS)
-LINK_LIB=$(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CFLAGS) $(LDFLAGS) $(staticexe) -version-number @LIBUNBOUND_CURRENT@:@LIBUNBOUND_REVISION@:@LIBUNBOUND_AGE@ -no-undefined
+LINK=$(LIBTOOL) --tag=CC --mode=link $(strip $(CC) $(staticexe) $(RUNTIME_PATH) $(CFLAGS) $(LDFLAGS))
+LINK_LIB=$(LIBTOOL) --tag=CC --mode=link $(strip $(CC) $(RUNTIME_PATH) $(CFLAGS) $(LDFLAGS) $(staticexe) -version-number @LIBUNBOUND_CURRENT@:@LIBUNBOUND_REVISION@:@LIBUNBOUND_AGE@ -no-undefined)
 
 .PHONY:        clean realclean doc lint all install uninstall tests test download_ldns strip lib
 
index fd7300d5f2e9a10be8dcc77deef01120b039a45c..0b6150781e30ee01c959c9bd171c9957c1ffb6c5 100644 (file)
@@ -568,9 +568,12 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl=pathname],
         else
             AC_MSG_RESULT(found in $ssldir)
             HAVE_SSL=yes
-            LDFLAGS="$LDFLAGS -L$ssldir/lib"
-           if test "x$enable_rpath" = xyes; then
-               RUNTIME_PATH="$RUNTIME_PATH -R$ssldir/lib"
+           dnl assume /usr is already in the lib and dynlib paths.
+           if test "$ssldir" != "/usr"; then
+                LDFLAGS="$LDFLAGS -L$ssldir/lib"
+               if test "x$enable_rpath" = xyes; then
+                   RUNTIME_PATH="$RUNTIME_PATH -R$ssldir/lib"
+               fi
            fi
        
            AC_MSG_CHECKING([for HMAC_CTX_init in -lcrypto])
index 6aacb526fc6407867a32fccd261d2783dbe30faf..b7c0d5995f2b881c329d106f102f7ddb4075f111 100755 (executable)
--- a/configure
+++ b/configure
@@ -21953,9 +21953,11 @@ echo "$as_me: error: Cannot find the SSL libraries in $withval" >&2;}
             { echo "$as_me:$LINENO: result: found in $ssldir" >&5
 echo "${ECHO_T}found in $ssldir" >&6; }
             HAVE_SSL=yes
-            LDFLAGS="$LDFLAGS -L$ssldir/lib"
-           if test "x$enable_rpath" = xyes; then
-               RUNTIME_PATH="$RUNTIME_PATH -R$ssldir/lib"
+                   if test "$ssldir" != "/usr"; then
+                LDFLAGS="$LDFLAGS -L$ssldir/lib"
+               if test "x$enable_rpath" = xyes; then
+                   RUNTIME_PATH="$RUNTIME_PATH -R$ssldir/lib"
+               fi
            fi
 
            { echo "$as_me:$LINENO: checking for HMAC_CTX_init in -lcrypto" >&5
@@ -23531,7 +23533,9 @@ echo $ECHO_N "checking for libevent... $ECHO_C" >&6; }
             thedir="$dir"
             if test -f "$dir/include/event.h"; then
                 found_libevent="yes"
-                CPPFLAGS="$CPPFLAGS -I$thedir/include"
+                               if test "$thedir" != "/usr"; then
+                    CPPFLAGS="$CPPFLAGS -I$thedir/include"
+               fi
                 break;
             fi
         done
@@ -23568,9 +23572,11 @@ large outgoing port ranges.  " >&2;}
         else
             { echo "$as_me:$LINENO: result: found in $thedir" >&5
 echo "${ECHO_T}found in $thedir" >&6; }
-            LDFLAGS="$LDFLAGS -L$thedir/lib"
-           if test "x$enable_rpath" = xyes; then
-               RUNTIME_PATH="$RUNTIME_PATH -R$thedir/lib"
+                   if test "$thedir" != "/usr"; then
+                LDFLAGS="$LDFLAGS -L$thedir/lib"
+               if test "x$enable_rpath" = xyes; then
+                   RUNTIME_PATH="$RUNTIME_PATH -R$thedir/lib"
+               fi
            fi
         fi
 
@@ -27396,7 +27402,7 @@ use_ldns_builtin="no"
 if test "${with_ldns+set}" = set; then
   withval=$with_ldns;  specialldnsdir="$withval"
        CPPFLAGS="-I$withval/include $CPPFLAGS"
-       LDFLAGS="-L$withval -L$withval/lib $LDFLAGS -lldns"
+       LDFLAGS="-L$withval -L$withval/lib $LDFLAGS"
        ldnsdir="$withval"
 
 
@@ -27414,7 +27420,8 @@ fi
 
 # check if ldns is good enough
 if test "$use_ldns_builtin" = "no"; then
-       { echo "$as_me:$LINENO: checking for ldns_buffer_copy in -lldns" >&5
+
+{ echo "$as_me:$LINENO: checking for ldns_buffer_copy in -lldns" >&5
 echo $ECHO_N "checking for ldns_buffer_copy in -lldns... $ECHO_C" >&6; }
 if test "${ac_cv_lib_ldns_ldns_buffer_copy+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 { echo "$as_me:$LINENO: result: $ac_cv_lib_ldns_ldns_buffer_copy" >&5
 echo "${ECHO_T}$ac_cv_lib_ldns_ldns_buffer_copy" >&6; }
 if test $ac_cv_lib_ldns_ldns_buffer_copy = yes; then
-
-
-{ echo "$as_me:$LINENO: checking for ldns_rr_free in -lldns" >&5
-echo $ECHO_N "checking for ldns_rr_free in -lldns... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ldns_ldns_rr_free+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldns  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ldns_rr_free ();
-int
-main ()
-{
-return ldns_rr_free ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_ldns_ldns_rr_free=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_cv_lib_ldns_ldns_rr_free=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldns_ldns_rr_free" >&5
-echo "${ECHO_T}$ac_cv_lib_ldns_ldns_rr_free" >&6; }
-if test $ac_cv_lib_ldns_ldns_rr_free = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBLDNS 1
 _ACEOF
@@ -27548,7 +27491,8 @@ _ACEOF
 
 fi
 
-       { echo "$as_me:$LINENO: checking for ldns_b32_ntop_extended_hex" >&5
+       if test $ac_cv_lib_ldns_ldns_buffer_copy = yes; then
+                   { echo "$as_me:$LINENO: checking for ldns_b32_ntop_extended_hex" >&5
 echo $ECHO_N "checking for ldns_b32_ntop_extended_hex... $ECHO_C" >&6; }
 if test "${ac_cv_func_ldns_b32_ntop_extended_hex+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27638,13 +27582,9 @@ echo "$as_me: error: ldns version too old, need >=1.4.0" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-
-else
-
-               use_ldns_builtin="yes"
-
-fi
-
+       else
+           use_ldns_builtin="yes"
+       fi
 fi
 
 if test "$use_ldns_builtin" = "yes"; then
index 13713677fbed516ff318ce1cda5d43dda4a6f2bc..95c03e4120ed5273395d76bfe80867691084f331 100644 (file)
@@ -273,7 +273,10 @@ if test x_$withval = x_yes -o x_$withval != x_no; then
             thedir="$dir"
             if test -f "$dir/include/event.h"; then
                 found_libevent="yes"
-                CPPFLAGS="$CPPFLAGS -I$thedir/include"
+               dnl assume /usr is in default path.
+               if test "$thedir" != "/usr"; then
+                    CPPFLAGS="$CPPFLAGS -I$thedir/include"
+               fi
                 break;
             fi
         done
@@ -303,9 +306,12 @@ large outgoing port ranges.  ])
                fi
         else
             AC_MSG_RESULT(found in $thedir)
-            LDFLAGS="$LDFLAGS -L$thedir/lib"
-           if test "x$enable_rpath" = xyes; then
-               RUNTIME_PATH="$RUNTIME_PATH -R$thedir/lib"
+           dnl assume /usr is in default path.
+           if test "$thedir" != "/usr"; then
+                LDFLAGS="$LDFLAGS -L$thedir/lib"
+               if test "x$enable_rpath" = xyes; then
+                   RUNTIME_PATH="$RUNTIME_PATH -R$thedir/lib"
+               fi
            fi
         fi
        AC_SUBST(RUNTIME_PATH)
@@ -405,7 +411,7 @@ AC_ARG_WITH(ldns, AC_HELP_STRING([--with-ldns=PATH],
        [specify prefix of path of ldns library to use]), 
        [ specialldnsdir="$withval"
        CPPFLAGS="-I$withval/include $CPPFLAGS"
-       LDFLAGS="-L$withval -L$withval/lib $LDFLAGS -lldns"
+       LDFLAGS="-L$withval -L$withval/lib $LDFLAGS"
        ldnsdir="$withval"
        AC_SUBST(ldnsdir)
 ])
@@ -417,14 +423,14 @@ AC_ARG_WITH(ldns-builtin, AC_HELP_STRING([--with-ldns-builtin],
 
 # check if ldns is good enough
 if test "$use_ldns_builtin" = "no"; then
-       AC_CHECK_LIB(ldns, ldns_buffer_copy, [
-       dnl ldns was found, check compat functions
-       AC_CHECK_LIB(ldns, [ldns_rr_free])
-       AC_CHECK_FUNC([ldns_b32_ntop_extended_hex],, [
+       AC_CHECK_LIB(ldns, ldns_buffer_copy)
+       if test $ac_cv_lib_ldns_ldns_buffer_copy = yes; then
+           dnl ldns was found, check compat functions
+           AC_CHECK_FUNC([ldns_b32_ntop_extended_hex],, [
                AC_MSG_ERROR([ldns version too old, need >=1.4.0])])
-       ] , [
-               use_ldns_builtin="yes"
-       ])
+       else
+           use_ldns_builtin="yes"
+       fi
 fi
 
 if test "$use_ldns_builtin" = "yes"; then
index b9e78800f36ab6459b6332941d2347b4697de0d2..66f65680145f993779813994d210cac4a58cc2d9 100644 (file)
@@ -4,6 +4,7 @@
        - iana portlist updated.
        - fix util/configlexer.c and solaris -std=c99 flag.
        - fix postcommit aclocal errors.
+       - spaces stripped. Makefile cleaner, /usr omitted from -I, -L, -R.
 
 23 March 2009: Wouter
        - added launchd plist example file for MacOSX to contrib.