From: Wouter Wijngaards Date: Thu, 30 Jun 2011 12:59:27 +0000 (+0000) Subject: - removed ldns-src tarball inside the unbound tarball. X-Git-Tag: release-1.4.12rc1~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbe76430fe478e816ab5e94b0ab56465c3cf13b1;p=thirdparty%2Funbound.git - removed ldns-src tarball inside the unbound tarball. git-svn-id: file:///svn/unbound/trunk@2447 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/Makefile.in b/Makefile.in index 9fcdbc69a..45f2d698f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -192,8 +192,6 @@ ifeq "$(UB_ON_WINDOWS)" "yes" $(BUILD)%.o: $(srcdir)/%.rc $(srcdir)/config.h $(INFO) Resource $< - @if test ! -z "$(ldnsdir)" -a ! -e $(ldnsdir)/include/ldns/ldns.h; \ - then (cd $(ldnsdir); $(MAKE) copy-headers); fi @-if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir $@)); fi $Q$(WINDRES) $(CPPFLAGS) $< $@ endif @@ -202,12 +200,10 @@ COMPILE=$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) 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 longtest longcheck check +.PHONY: clean realclean doc lint all install uninstall tests test strip lib longtest longcheck check $(BUILD)%.lo: $(srcdir)/%.c $(INFO) Build $< - @if test ! -z "$(ldnsdir)" -a ! -e $(ldnsdir)/include/ldns/ldns.h; \ - then (cd $(ldnsdir); $(MAKE) copy-headers); fi @-if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir $@)); fi $Q$(COMPILE) -o $@ -c $< @@ -231,16 +227,6 @@ longtest: tests lib: libunbound.la -ifeq ($(patsubst ldns-src%,ldns-src,$(ldnsdir)),ldns-src) -ldnslib=$(ldnsdir)/lib/libldns.a -$(ldnslib): $(ldnsdir)/lib -$(ldnsdir)/lib: - @if test ! -z "$(ldnsdir)"; \ - then (cd $(ldnsdir) && $(MAKE)); fi -else -ldnslib= -endif - UBSYMS+=-export-symbols $(srcdir)/libunbound/ubsyms.def CLUBSYMS=-export-symbols $(BUILD)clubsyms.def EXTRALINK= @@ -250,7 +236,7 @@ CLUBSYMS= EXTRALINK=-L. -L.libs -lunbound endif -libunbound.la: $(LIBUNBOUND_OBJ) $(ldnslib) +libunbound.la: $(LIBUNBOUND_OBJ) $(INFO) Link $@ ifeq ($(CHECKLOCK_SRC),) $Q$(LINK_LIB) $(UBSYMS) -o $@ $(sort $(LIBUNBOUND_OBJ)) -rpath $(libdir) $(LIBS) @@ -269,23 +255,23 @@ else $Q$(LINK_LIB) $(CLUBSYMS) -o $@ $(sort $(LIBUNBOUND_OBJ)) -rpath $(libdir) $(LIBS) endif -unbound$(EXEEXT): $(DAEMON_OBJ) libunbound.la $(ldnslib) +unbound$(EXEEXT): $(DAEMON_OBJ) libunbound.la $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(DAEMON_OBJ)) $(EXTRALINK) -lssl $(LIBS) -unbound-checkconf$(EXEEXT): $(CHECKCONF_OBJ) libunbound.la $(ldnslib) +unbound-checkconf$(EXEEXT): $(CHECKCONF_OBJ) libunbound.la $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(CHECKCONF_OBJ)) $(EXTRALINK) -lssl $(LIBS) -unbound-control$(EXEEXT): $(CONTROL_OBJ) libunbound.la $(ldnslib) +unbound-control$(EXEEXT): $(CONTROL_OBJ) libunbound.la $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(CONTROL_OBJ)) $(EXTRALINK) -lssl $(LIBS) -unbound-host$(EXEEXT): $(HOST_OBJ) libunbound.la $(ldnslib) +unbound-host$(EXEEXT): $(HOST_OBJ) libunbound.la $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(HOST_OBJ)) -L. -L.libs -lunbound $(LIBS) -unbound-anchor$(EXEEXT): $(UBANCHOR_OBJ) libunbound.la $(ldnslib) +unbound-anchor$(EXEEXT): $(UBANCHOR_OBJ) libunbound.la $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(UBANCHOR_OBJ)) -L. -L.libs -lunbound -lexpat -lssl $(LIBS) @@ -297,19 +283,19 @@ unbound-service-remove$(EXEEXT): $(SVCUNINST_OBJ) $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(SVCUNINST_OBJ)) $(LIBS) -anchor-update$(EXEEXT): $(ANCHORUPD_OBJ) libunbound.la $(ldnslib) +anchor-update$(EXEEXT): $(ANCHORUPD_OBJ) libunbound.la $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(ANCHORUPD_OBJ)) -L. -L.libs -lunbound $(LIBS) -unittest$(EXEEXT): $(UNITTEST_OBJ) $(ldnslib) +unittest$(EXEEXT): $(UNITTEST_OBJ) $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(UNITTEST_OBJ)) $(LIBS) -testbound$(EXEEXT): $(TESTBOUND_OBJ) $(ldnslib) +testbound$(EXEEXT): $(TESTBOUND_OBJ) $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(TESTBOUND_OBJ)) -lssl $(LIBS) -lock-verify$(EXEEXT): $(LOCKVERIFY_OBJ) $(ldnslib) +lock-verify$(EXEEXT): $(LOCKVERIFY_OBJ) $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(LOCKVERIFY_OBJ)) $(LIBS) @@ -317,35 +303,35 @@ petal$(EXEEXT): $(PETAL_OBJ) $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(PETAL_OBJ)) -lssl $(LIBS) -pktview$(EXEEXT): $(PKTVIEW_OBJ) $(ldnslib) +pktview$(EXEEXT): $(PKTVIEW_OBJ) $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(PKTVIEW_OBJ)) $(LIBS) -signit$(EXEEXT): $(SIGNIT_OBJ) $(ldnslib) +signit$(EXEEXT): $(SIGNIT_OBJ) $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(SIGNIT_OBJ)) $(LIBS) -memstats$(EXEEXT): $(MEMSTATS_OBJ) $(ldnslib) +memstats$(EXEEXT): $(MEMSTATS_OBJ) $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(MEMSTATS_OBJ)) $(LIBS) -asynclook$(EXEEXT): $(ASYNCLOOK_OBJ) $(ldnslib) libunbound.la +asynclook$(EXEEXT): $(ASYNCLOOK_OBJ) libunbound.la $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(ASYNCLOOK_OBJ)) $(LIBS) -L. -L.libs -lunbound -streamtcp$(EXEEXT): $(STREAMTCP_OBJ) $(ldnslib) +streamtcp$(EXEEXT): $(STREAMTCP_OBJ) $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(STREAMTCP_OBJ)) $(LIBS) -perf$(EXEEXT): $(PERF_OBJ) $(ldnslib) +perf$(EXEEXT): $(PERF_OBJ) $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(PERF_OBJ)) $(LIBS) -delayer$(EXEEXT): $(DELAYER_OBJ) $(ldnslib) +delayer$(EXEEXT): $(DELAYER_OBJ) $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(DELAYER_OBJ)) $(LIBS) -harvest$(EXEEXT): $(HARVEST_OBJ) $(ldnslib) libunbound.la +harvest$(EXEEXT): $(HARVEST_OBJ) libunbound.la $(INFO) Link $@ $Q$(LINK) -o $@ $(sort $(HARVEST_OBJ)) $(LIBS) -L. -L.libs -lunbound @@ -490,12 +476,6 @@ endif @echo @echo "You still need to remove "`dirname $(DESTDIR)$(configfile)`" , $(DESTDIR)$(configfile) by hand" -download_ldns: - svn export https://www.nlnetlabs.nl/svn/ldns/trunk/makedist.sh ldns_makedist.sh - ./ldns_makedist.sh -s -d https://www.nlnetlabs.nl/svn/ldns/trunk - mv ldns-[0-9]*.tar.gz ldns-src.tar.gz - rm ldns-*.tar.gz.sha1 ldns_makedist.sh - iana_update: curl -o port-numbers.tmp http://www.iana.org/assignments/port-numbers awk '/Unassigned|Reserved/ {next;} { match($$0, "[0-9]+/udp"); if (RLENGTH > 0) print substr($$0, RSTART, RLENGTH - 4) ","}' port-numbers.tmp | sort -nu > portslist.tmp @@ -505,8 +485,6 @@ iana_update: # Automatic dependencies. $(BUILD)%.d: $(srcdir)/%.c $(INFO) Depend $< - @if test ! -z "$(ldnsdir)" -a ! -e $(ldnsdir)/include/ldns/ldns.h; \ - then (cd $(ldnsdir); $(MAKE) copy-headers); fi @-if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir $@)); fi $Q$(SHELL) -ec '$(CC) $(DEPFLAG) $(CPPFLAGS) $(CFLAGS) $< | sed '\''s!\(.*\)\.o[ :]*!$(dir $@)\1.lo $@ : !g'\'' > $@; [ -s $@ ] || rm -f $@' diff --git a/configure b/configure index 47a4d6962..9767ca58d 100755 --- a/configure +++ b/configure @@ -603,9 +603,7 @@ ac_includes_default="\ # include #endif" -enable_option_checking=no ac_subst_vars='LTLIBOBJS -subdirs ldnsdir EXPORT_ALL_SYMBOLS WINDRES @@ -766,7 +764,6 @@ enable_alloc_lite enable_alloc_nonregional enable_allsymbols with_ldns -with_ldns_builtin ' ac_precious_vars='build_alias host_alias @@ -780,7 +777,7 @@ CPP YACC YFLAGS PYTHON_VERSION' -ac_subdirs_all='ldns-src' + # Initialize some variables set by options. ac_init_help= @@ -1463,7 +1460,6 @@ Optional Packages: outgoing port ranges. --with-libexpat=path specify explicit path for libexpat. --with-ldns=PATH specify prefix of path of ldns library to use - --with-ldns-builtin forces use of package included with this one Some influential environment variables: CC C compiler command @@ -16675,7 +16671,6 @@ esac # check this after all other compilation checks, since the linking of the lib # may break checks after this. -use_ldns_builtin="no" # Check whether --with-ldns was given. if test "${with_ldns+set}" = set; then : @@ -16699,18 +16694,8 @@ if test "${with_ldns+set}" = set; then : fi - -# Check whether --with-ldns-builtin was given. -if test "${with_ldns_builtin+set}" = set; then : - withval=$with_ldns_builtin; - use_ldns_builtin="yes" - -fi - - # check if ldns is good enough -if test "$use_ldns_builtin" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldns_buffer_copy in -lldns" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldns_buffer_copy in -lldns" >&5 $as_echo_n "checking for ldns_buffer_copy in -lldns... " >&6; } if test "${ac_cv_lib_ldns_ldns_buffer_copy+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -16755,28 +16740,28 @@ _ACEOF fi - ac_fn_c_check_func "$LINENO" "ldns_key_buf2rsa_raw" "ac_cv_func_ldns_key_buf2rsa_raw" +ac_fn_c_check_func "$LINENO" "ldns_key_buf2rsa_raw" "ac_cv_func_ldns_key_buf2rsa_raw" if test "x$ac_cv_func_ldns_key_buf2rsa_raw" = x""yes; then : fi - ac_fn_c_check_func "$LINENO" "ldns_get_random" "ac_cv_func_ldns_get_random" +ac_fn_c_check_func "$LINENO" "ldns_get_random" "ac_cv_func_ldns_get_random" if test "x$ac_cv_func_ldns_get_random" = x""yes; then : fi - ac_fn_c_check_func "$LINENO" "ldns_b32_ntop_extended_hex" "ac_cv_func_ldns_b32_ntop_extended_hex" +ac_fn_c_check_func "$LINENO" "ldns_b32_ntop_extended_hex" "ac_cv_func_ldns_b32_ntop_extended_hex" if test "x$ac_cv_func_ldns_b32_ntop_extended_hex" = x""yes; then : fi - if test x$use_gost = xyes; then - ac_fn_c_check_func "$LINENO" "ldns_key_EVP_load_gost_id" "ac_cv_func_ldns_key_EVP_load_gost_id" +if test x$use_gost = xyes; then + ac_fn_c_check_func "$LINENO" "ldns_key_EVP_load_gost_id" "ac_cv_func_ldns_key_EVP_load_gost_id" if test "x$ac_cv_func_ldns_key_EVP_load_gost_id" = x""yes; then : fi - for ac_func in ldns_key_EVP_unload_gost + for ac_func in ldns_key_EVP_unload_gost do : ac_fn_c_check_func "$LINENO" "ldns_key_EVP_unload_gost" "ac_cv_func_ldns_key_EVP_unload_gost" if test "x$ac_cv_func_ldns_key_EVP_unload_gost" = x""yes; then : @@ -16787,10 +16772,10 @@ _ACEOF fi done - else - ac_cv_func_ldns_key_EVP_load_gost_id="yes" - fi - for ac_header in ldns/ldns.h +else + ac_cv_func_ldns_key_EVP_load_gost_id="yes" +fi +for ac_header in ldns/ldns.h do : ac_fn_c_check_header_compile "$LINENO" "ldns/ldns.h" "ac_cv_header_ldns_ldns_h" "$ac_includes_default #ifdef HAVE_SYS_SOCKET_H @@ -16823,40 +16808,17 @@ fi done - if test $ac_cv_lib_ldns_ldns_buffer_copy = yes \ - -a $ac_cv_func_ldns_key_buf2rsa_raw = yes \ - -a $ac_cv_func_ldns_get_random = yes \ - -a $ac_cv_header_ldns_ldns_h = yes \ - -a $ac_cv_func_ldns_b32_ntop_extended_hex = yes \ - -a $ac_cv_func_ldns_key_EVP_load_gost_id = yes; then - : - else - as_fn_error $? "No ldns library found (or not recent); install or update ldns library, use --with-ldns=path or --with-ldns-builtin" "$LINENO" 5 - fi -fi - -if test "$use_ldns_builtin" = "yes"; then -if test ! -f $srcdir/ldns-src.tar.gz; then - as_fn_error $? "No ldns library found and no ldns-src.tar.gz, use --with-ldns=path." "$LINENO" 5 +if test $ac_cv_lib_ldns_ldns_buffer_copy = yes \ + -a $ac_cv_func_ldns_key_buf2rsa_raw = yes \ + -a $ac_cv_func_ldns_get_random = yes \ + -a $ac_cv_header_ldns_ldns_h = yes \ + -a $ac_cv_func_ldns_b32_ntop_extended_hex = yes \ + -a $ac_cv_func_ldns_key_EVP_load_gost_id = yes; then + : +else + as_fn_error $? "No ldns library found (or not recent); install or update ldns library, let me detect the location or use --with-ldns=path to systemdir or the make-dir of ldns. Package libldns or download source http://www.nlnetlabs.nl/projects/ldns" "$LINENO" 5 fi -echo "****************************************************************" -echo "*** ***" -echo "*** Building ldns library from package included in this one. ***" -echo "*** ***" -echo "****************************************************************" -if test -d $srcdir/ldns-src; then rm -rf $srcdir/ldns-src; fi -mkdir $srcdir/ldns-src; cp $srcdir/ldns-src.tar.gz $srcdir/ldns-src/ldns-src.tar.gz; (cd $srcdir/ldns-src; gzip -cd ldns-src.tar.gz | tar xf -); rm -f $srcdir/ldns-src/ldns-src.tar.gz; mv $srcdir/ldns-src $srcdir/ldns-srcb; mv $srcdir/ldns-srcb/ldns* $srcdir/ldns-src; rmdir $srcdir/ldns-srcb -ldnsdir="ldns-src" -{ $as_echo "$as_me:${as_lineno-$LINENO}: Configure $ldnsdir scheduled after config.status" >&5 -$as_echo "$as_me: Configure $ldnsdir scheduled after config.status" >&6;} - - -subdirs="$subdirs ldns-src" -CPPFLAGS="-I$ldnsdir/include $CPPFLAGS" -LDFLAGS="$LDFLAGS $ldnsdir/*.lo" - -fi { $as_echo "$as_me:${as_lineno-$LINENO}: Stripping extension flags..." >&5 $as_echo "$as_me: Stripping extension flags..." >&6;} @@ -19129,151 +19091,6 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. $ac_cs_success || as_fn_exit 1 fi - -# -# CONFIG_SUBDIRS section. -# -if test "$no_recursion" != yes; then - - # Remove --cache-file, --srcdir, and --disable-option-checking arguments - # so they do not pile up. - ac_sub_configure_args= - ac_prev= - eval "set x $ac_configure_args" - shift - for ac_arg - do - if test -n "$ac_prev"; then - ac_prev= - continue - fi - case $ac_arg in - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ - | --c=*) - ;; - --config-cache | -C) - ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - ;; - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - ;; - --disable-option-checking) - ;; - *) - case $ac_arg in - *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append ac_sub_configure_args " '$ac_arg'" ;; - esac - done - - # Always prepend --prefix to ensure using the same prefix - # in subdir configurations. - ac_arg="--prefix=$prefix" - case $ac_arg in - *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args" - - # Pass --silent - if test "$silent" = yes; then - ac_sub_configure_args="--silent $ac_sub_configure_args" - fi - - # Always prepend --disable-option-checking to silence warnings, since - # different subdirs can have different --enable and --with options. - ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args" - - ac_popdir=`pwd` - for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue - - # Do not complain, so a configure script can configure whichever - # parts of a large source tree are present. - test -d "$srcdir/$ac_dir" || continue - - ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)" - $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5 - $as_echo "$ac_msg" >&6 - as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - cd "$ac_dir" - - # Check for guested configure; otherwise get Cygnus style configure. - if test -f "$ac_srcdir/configure.gnu"; then - ac_sub_configure=$ac_srcdir/configure.gnu - elif test -f "$ac_srcdir/configure"; then - ac_sub_configure=$ac_srcdir/configure - elif test -f "$ac_srcdir/configure.in"; then - # This should be Cygnus configure. - ac_sub_configure=$ac_aux_dir/configure - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5 -$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} - ac_sub_configure= - fi - - # The recursion is here. - if test -n "$ac_sub_configure"; then - # Make the cache file name correct relative to the subdirectory. - case $cache_file in - [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; - *) # Relative name. - ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 -$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} - # The eval makes quoting arguments work. - eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ - --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || - as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 - fi - - cd "$ac_popdir" - done -fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} diff --git a/configure.ac b/configure.ac index b01ba0ecc..5f3ac7a6c 100644 --- a/configure.ac +++ b/configure.ac @@ -711,7 +711,6 @@ AC_SUBST(EXPORT_ALL_SYMBOLS) # check this after all other compilation checks, since the linking of the lib # may break checks after this. -use_ldns_builtin="no" AC_ARG_WITH(ldns, AC_HELP_STRING([--with-ldns=PATH], [specify prefix of path of ldns library to use]), [ specialldnsdir="$withval" @@ -726,24 +725,18 @@ AC_ARG_WITH(ldns, AC_HELP_STRING([--with-ldns=PATH], fi ]) -AC_ARG_WITH(ldns-builtin, AC_HELP_STRING([--with-ldns-builtin], - [forces use of package included with this one]), [ - use_ldns_builtin="yes" -]) - # check if ldns is good enough -if test "$use_ldns_builtin" = "no"; then - AC_CHECK_LIB(ldns, ldns_buffer_copy) - AC_CHECK_FUNC(ldns_key_buf2rsa_raw) - AC_CHECK_FUNC(ldns_get_random) - AC_CHECK_FUNC(ldns_b32_ntop_extended_hex) - if test x$use_gost = xyes; then - AC_CHECK_FUNC(ldns_key_EVP_load_gost_id) - AC_CHECK_FUNCS([ldns_key_EVP_unload_gost]) - else - ac_cv_func_ldns_key_EVP_load_gost_id="yes" - fi - AC_CHECK_HEADERS([ldns/ldns.h],,, [AC_INCLUDES_DEFAULT +AC_CHECK_LIB(ldns, ldns_buffer_copy) +AC_CHECK_FUNC(ldns_key_buf2rsa_raw) +AC_CHECK_FUNC(ldns_get_random) +AC_CHECK_FUNC(ldns_b32_ntop_extended_hex) +if test x$use_gost = xyes; then + AC_CHECK_FUNC(ldns_key_EVP_load_gost_id) + AC_CHECK_FUNCS([ldns_key_EVP_unload_gost]) +else + ac_cv_func_ldns_key_EVP_load_gost_id="yes" +fi +AC_CHECK_HEADERS([ldns/ldns.h],,, [AC_INCLUDES_DEFAULT #ifdef HAVE_SYS_SOCKET_H #include #endif @@ -764,38 +757,17 @@ if test "$use_ldns_builtin" = "no"; then #include #endif ]) - if test $ac_cv_lib_ldns_ldns_buffer_copy = yes \ - -a $ac_cv_func_ldns_key_buf2rsa_raw = yes \ - -a $ac_cv_func_ldns_get_random = yes \ - -a $ac_cv_header_ldns_ldns_h = yes \ - -a $ac_cv_func_ldns_b32_ntop_extended_hex = yes \ - -a $ac_cv_func_ldns_key_EVP_load_gost_id = yes; then - dnl ldns was found - : - else - AC_MSG_ERROR([No ldns library found (or not recent); install or update ldns library, use --with-ldns=path or --with-ldns-builtin]) - fi -fi - -if test "$use_ldns_builtin" = "yes"; then -dnl use the builtin ldns-src.tar.gz file to build ldns. -if test ! -f $srcdir/ldns-src.tar.gz; then - AC_MSG_ERROR([No ldns library found and no ldns-src.tar.gz, use --with-ldns=path.]) +if test $ac_cv_lib_ldns_ldns_buffer_copy = yes \ + -a $ac_cv_func_ldns_key_buf2rsa_raw = yes \ + -a $ac_cv_func_ldns_get_random = yes \ + -a $ac_cv_header_ldns_ldns_h = yes \ + -a $ac_cv_func_ldns_b32_ntop_extended_hex = yes \ + -a $ac_cv_func_ldns_key_EVP_load_gost_id = yes; then + dnl ldns was found + : +else + AC_MSG_ERROR([No ldns library found (or not recent); install or update ldns library, let me detect the location or use --with-ldns=path to systemdir or the make-dir of ldns. Package libldns or download source http://www.nlnetlabs.nl/projects/ldns]) fi -echo "****************************************************************" -echo "*** ***" -echo "*** Building ldns library from package included in this one. ***" -echo "*** ***" -echo "****************************************************************" -if test -d $srcdir/ldns-src; then rm -rf $srcdir/ldns-src; fi -mkdir $srcdir/ldns-src; cp $srcdir/ldns-src.tar.gz $srcdir/ldns-src/ldns-src.tar.gz; (cd $srcdir/ldns-src; gzip -cd ldns-src.tar.gz | tar xf -); rm -f $srcdir/ldns-src/ldns-src.tar.gz; mv $srcdir/ldns-src $srcdir/ldns-srcb; mv $srcdir/ldns-srcb/ldns* $srcdir/ldns-src; rmdir $srcdir/ldns-srcb -ldnsdir="ldns-src" -AC_MSG_NOTICE([Configure $ldnsdir scheduled after config.status]) -AC_CONFIG_SUBDIRS([ldns-src]) -CPPFLAGS="-I$ldnsdir/include $CPPFLAGS" -LDFLAGS="$LDFLAGS $ldnsdir/*.lo" -AC_SUBST(ldnsdir) -fi dnl end of use_ldns_builtin == yes ACX_STRIP_EXT_FLAGS LDFLAGS="$LATE_LDFLAGS $LDFLAGS" diff --git a/doc/Changelog b/doc/Changelog index dee625211..46f7d90ea 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -7,6 +7,7 @@ - fix comment about rndc port, that referred to the old port number. - fix that the listening socket is not closed when too many remote control connections are made at the same time. + - removed ldns-src tarball inside the unbound tarball. 23 June 2011: Wouter - Changed -flto check to support clang compiler. diff --git a/doc/README b/doc/README index 97d158f25..118326f05 100644 --- a/doc/README +++ b/doc/README @@ -11,16 +11,14 @@ This software is under BSD license, see LICENSE for details. * Uses the following libraries; * ldns http://www.nlnetlabs.nl/ldns/ (BSD license) - (required) can use tarball from source directory. + (required) can use ldns build directory directly with --with-ldns=path. * libevent http://www.monkey.org/~provos/libevent/ (BSD license) (optional) can use builtin alternative instead. * Make and install: ./configure; make; make install * Use GNU make; default on linux, often called 'gmake' on BSD and Solaris. * --with-ldns=/path/to/ldns - If ldns is not detected on the system, a prepackaged tarball - of the ldns library is used to compile and statically link against. - If detected on the system, it will dynamically link against it. + It will dynamically link against it. * --with-libevent=/path/to/libevent Can be set to either the system install or the build directory. --with-libevent=no (default) gives a builtin alternative diff --git a/ldns-src.tar.gz b/ldns-src.tar.gz deleted file mode 100644 index fdb1a5c33..000000000 Binary files a/ldns-src.tar.gz and /dev/null differ