bugfix#427 & ax_devel_python.m4 fix

bugfix#427: Explicitely link ssl library to the programs that need it
	drill, ldns-signzone & ldns-verify-zone

In ax_devel_python.m4 a here document marker is not on a seperate line, but followed by a backtick. That doesn't work on FreeBSD (at least).

diff --git a/Changelog b/Changelog
index 88efcae6bd0af102cd0c1d7f6388f50baf53b829..b9c9e15efebc0ee0b59920540452bb4bcddfebea 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 1.6.13
+       * bugfix #427: Eplicitely link ssl with the programs that use it.
        * Fix reading \DDD: Error on values that are outside range (>255).
 
 1.6.12

diff --git a/Makefile.in b/Makefile.in
index 2d6a235fdd99f2a1493cb339d4567da0f38f1635..24d4a8b5624bf165fb09a5459ce4bf981903bacc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,13 +74,16 @@ PYLDNS_I_FILES      = $(pywrapdir)/file_py3.i $(pywrapdir)/ldns.i $(pywrapdir)/ldns_b
 DRILL_LOBJS    = drill/chasetrace.lo drill/dnssec.lo drill/drill.lo drill/drill_util.lo drill/error.lo drill/root.lo drill/securetrace.lo drill/work.lo
 
 EXAMPLE_LOBJS  = examples/ldns-chaos.lo examples/ldns-compare-zones.lo examples/ldns-dpa.lo examples/ldns-gen-zone.lo examples/ldns-key2ds.lo examples/ldns-keyfetcher.lo examples/ldns-keygen.lo examples/ldns-mx.lo examples/ldns-notify.lo examples/ldns-nsec3-hash.lo examples/ldns-read-zone.lo examples/ldns-resolver.lo examples/ldns-revoke.lo examples/ldns-rrsig.lo examples/ldns-signzone.lo examples/ldns-test-edns.lo examples/ldns-testns.lo examples/ldns-testpkts.lo examples/ldns-update.lo examples/ldns-verify-zone.lo examples/ldns-version.lo examples/ldns-walk.lo examples/ldns-zcat.lo examples/ldns-zsplit.lo examples/ldnsd.lo
-EXAMPLE_PROGS  = examples/ldns-chaos examples/ldns-compare-zones examples/ldns-gen-zone examples/ldns-key2ds examples/ldns-keyfetcher examples/ldns-keygen examples/ldns-mx examples/ldns-notify examples/ldns-nsec3-hash examples/ldns-read-zone examples/ldns-resolver examples/ldns-revoke examples/ldns-rrsig examples/ldns-signzone examples/ldns-test-edns examples/ldns-update examples/ldns-verify-zone examples/ldns-version examples/ldns-walk examples/ldns-zcat examples/ldns-zsplit examples/ldnsd 
-EX_PROGS_BASENM        = ldns-chaos ldns-compare-zones ldns-gen-zone ldns-key2ds ldns-keyfetcher ldns-keygen ldns-mx ldns-notify ldns-nsec3-hash ldns-read-zone ldns-resolver ldns-revoke ldns-rrsig ldns-signzone ldns-test-edns ldns-update ldns-verify-zone ldns-version ldns-walk ldns-zcat ldns-zsplit ldnsd 
-EXAMPLE_PROGS_EX= ^examples/ldns-testpkts\.c|examples/ldns-testns\.c|examples/ldns-dpa\.c$$
+EXAMPLE_PROGS  = examples/ldns-chaos examples/ldns-compare-zones examples/ldns-gen-zone examples/ldns-key2ds examples/ldns-keyfetcher examples/ldns-keygen examples/ldns-mx examples/ldns-notify examples/ldns-nsec3-hash examples/ldns-read-zone examples/ldns-resolver examples/ldns-revoke examples/ldns-rrsig examples/ldns-test-edns examples/ldns-update examples/ldns-version examples/ldns-walk examples/ldns-zcat examples/ldns-zsplit examples/ldnsd 
+EX_PROGS_BASENM        = ldns-chaos ldns-compare-zones ldns-dpa ldns-gen-zone ldns-key2ds ldns-keyfetcher ldns-keygen ldns-mx ldns-notify ldns-nsec3-hash ldns-read-zone ldns-resolver ldns-revoke ldns-rrsig ldns-signzone ldns-test-edns ldns-testns ldns-update ldns-verify-zone ldns-version ldns-walk ldns-zcat ldns-zsplit ldnsd 
+EXAMPLE_PROGS_EX= ^examples/ldns-testpkts\.c|examples/ldns-testns\.c|examples/ldns-dpa\.c|examples/ldns-signzone\.c|examples/ldns-verify-zone\.c$$
 TESTNS         = examples/ldns-testns
 TESTNS_LOBJS   = examples/ldns-testns.lo examples/ldns-testpkts.lo
 LDNS_DPA       = examples/ldns-dpa
 LDNS_DPA_LOBJS = examples/ldns-dpa.lo
+EX_SSL_PROGS   = examples/ldns-signzone examples/ldns-verify-zone
+EX_SSL_LOBJS   = examples/ldns-signzone.lo examples/ldns-verify-zone.lo
+
 
 COMPILE                = $(CC) $(CPPFLAGS) $(CFLAGS)
 COMP_LIB       = $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS)
@@ -130,7 +133,7 @@ no-drill-config-h:
                exit -1 ; \
        fi
 drill/drill: $(DRILL_LOBJS) $(LIB)
-       $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) -lldns -o drill/drill
+       $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill
 
 install-drill: drill/drill
        $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
@@ -147,7 +150,7 @@ uninstall-drill:
 clean-drill:
        $(LIBTOOL) --mode clean rm -f $(DRILL_LOBJS) drill/drill
 
-examples: no-examples-config-h $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA)
+examples: no-examples-config-h $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(EX_SSL_PROGS)
 no-examples-config-h:
        if test -e $(srcdir)/examples/config.h -o -e examples/config.h ; then \
                echo "A config.h was detected in the examples subdirectory." ; \
@@ -166,24 +169,28 @@ $(LDNS_DPA): $(LDNS_DPA_LOBJS) $(LIB)
        $(LINK_EXE) $(LDNS_DPA_LOBJS) $(LIBS) $(LIBPCAP_LIBS) -lldns \
                 -o $(LDNS_DPA)
 
-install-examples: $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA)
+$(EX_SSL_PROGS): $(EX_SSL_LOBJS) $(LIB)
+       $(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@
+
+install-examples: $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(EX_SSL_PROGS)
        $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
        $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)
        $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
-       for p in $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA); do \
+       for p in $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(EX_SSL_PROGS) ; do \
                $(LIBTOOL) --mode=install cp $$p $(DESTDIR)$(bindir) ; \
                $(INSTALL) -m 644 $(srcdir)/$$p.1 $(DESTDIR)$(mandir)/man1 ; \
        done
 
 uninstall-examples:
-       for p in $(EX_PROGS_BASENM) ldns-testns ldns-dpa ; do \
+       for p in $(EX_PROGS_BASENM) ; do \
                rm -f $(DESTDIR)$(bindir)/$$p $(DESTDIR)$(mandir)/man1/$$p.1 ;\
        done
        test ! -d $(DESTDIR)$(mandir) || rmdir -p $(DESTDIR)$(mandir)/man1 || :;
        test ! -d $(DESTDIR)$(bindir) || rmdir -p $(DESTDIR)$(bindir) || : ;
 
 clean-examples:
-       $(LIBTOOL) --mode clean rm -f $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA)
+       $(LIBTOOL) --mode clean rm -f $(EXAMPLE_PROGS) 
+       $(LIBTOOL) --mode clean rm -f $(TESTNS) $(LDNS_DPA) $(EX_SSL_PROGS)
        $(LIBTOOL) --mode clean rm -f $(EXAMPLE_LOBJS)
 
 linktest: $(srcdir)/linktest.c libldns.la
@@ -400,7 +407,7 @@ sources:
                                -e 's?^DRILL_LOBJS[     ]*=.*$$?DRILL_LOBJS     = '"`(cd $(srcdir); echo drill/*.c | sed 's/\.c/\.lo/g')`"'?g' \
                                -e 's?^EXAMPLE_LOBJS[   ]*=.*$$?EXAMPLE_LOBJS   = '"`(cd $(srcdir); echo examples/*.c | sed 's/\.c/\.lo/g')`"'?g' \
                                -e 's?^EXAMPLE_PROGS[   ]*=.*$$?EXAMPLE_PROGS   = '"`(cd $(srcdir); ls -1 examples/*.c | egrep -v '$(EXAMPLE_PROGS_EX)' | sed 's/\.c//g' | tr '\n' ' ')`"'?g' \
-                               -e 's?^EX_PROGS_BASENM[         ]*=.*$$?EX_PROGS_BASENM = '"`(cd $(srcdir); ls -1 examples/*.c | egrep -v '$(EXAMPLE_PROGS_EX)' | sed -e 's/\.c//g' -e 's?examples/??g' | tr '\n' ' ')`"'?g' \
+                               -e 's?^EX_PROGS_BASENM[         ]*=.*$$?EX_PROGS_BASENM = '"`(cd $(srcdir); ls -1 examples/*.c | sed -e 's/\.c//g' -e 's?examples/??g' | tr '\n' ' ')`"'?g' \
                                $$mf > $(TMP_FILE) ;\
                        mv $(TMP_FILE) $$mf ;\
                fi;\

diff --git a/ax_python_devel.m4 b/ax_python_devel.m4
index c71735e6bb34560c87ec45cff971d61b46684825..2ce6afe835096033dcfa8138c600ffc1455cc625 100644 (file)
--- a/ax_python_devel.m4
+++ b/ax_python_devel.m4
@@ -178,7 +178,8 @@ for e in get_config_vars ('VERSION'):
        if (e != None):
                ret += e
 print (ret)
-EOD`
+EOD
+`
 
                if test -z "$ac_python_version"; then
                        if test -n "$PYTHON_VERSION"; then
@@ -202,7 +203,8 @@ for e in distutils.sysconfig.get_config_vars ('LIBDIR'):
        if e != None:
                print (e)
                break
-EOD`
+EOD
+`
 
                # Before checking for libpythonX.Y, we need to know
                # the extension the OS we're on uses for libraries