From: Willem Toorop <willem@NLnetLabs.nl>
Date: Mon, 17 Sep 2012 10:47:50 +0000 (+0000)
Subject: Make old way of building work
X-Git-Tag: release-1.6.14rc1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55319020e5885a57547a88354d4b314853082c81;p=thirdparty%2Fldns.git

Make old way of building work
---

diff --git a/examples/Makefile.in b/examples/Makefile.in
index 5344ee67..e17f2181 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -9,6 +9,7 @@ exec_prefix = @exec_prefix@
 bindir = @bindir@
 mandir = @mandir@
 libtool = @libtool@
+datarootdir = @datarootdir@
 
 CC = @CC@
 CFLAGS = -I. -I${srcdir} @CFLAGS@
@@ -18,6 +19,7 @@ LIBNSL_LIBS = @LIBNSL_LIBS@
 LIBSSL_CPPFLAGS = @LIBSSL_CPPFLAGS@
 LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@
 LIBSSL_LIBS = @LIBSSL_LIBS@
+LIBSSL_SSL_LIBS = @LIBSSL_SSL_LIBS@
 LIBS = @LIBS@
 RUNTIME_PATH = @RUNTIME_PATH@
 LDNSDIR = @LDNSDIR@
@@ -70,7 +72,8 @@ MAIN_SOURCES = ldns-read-zone.c \
 MAIN_SSL_SOURCES = ldns-signzone.c \
 		  ldns-verify-zone.c \
 		  ldns-revoke.c \
-		  ldns-nsec3-hash.c
+		  ldns-nsec3-hash.c \
+		  ldns-dane.c
 
 OTHER_SOURCES = ldns-testpkts.c
 
@@ -104,6 +107,18 @@ ldnsd.stc: ldnsd.o
 	$(LINK_STATIC) $(LIBNSL_LDFLAGS) -o $@ $^ ; \
 	fi
 
+ldns-dane.prg-ssl: ldns-dane.o
+	@if test ! -f $(@:.prg-ssl=) -o $< -nt $(@:.prg-ssl=); then \
+	echo $(LINK) $(LIBNSL_LIBS) $(LIBSSL_LDFLAGS) $(LIBSSL_SSL_LIBS) -o $(@:.prg-ssl=) $^ ; \
+	$(LINK) $(LIBNSL_LIBS) $(LIBSSL_LDFLAGS) $(LIBSSL_SSL_LIBS) -o $(@:.prg-ssl=) $^ ; \
+	fi
+
+ldns-dane.stc-ssl: ldns-dane.o
+	@if test ! -f $@ -o $< -nt $@; then \
+	echo $(LINK_STATIC) $(LIBNSL_LIBS) $(LIBSSL_LDFLAGS) $(LIBSSL_SSL_LIBS) -o $@ $^ ; \
+	$(LINK_STATIC) $(LIBNSL_LIBS) $(LIBSSL_LDFLAGS) $(LIBSSL_SSL_LIBS) -o $@ $^ ; \
+	fi
+
 %.prg-ssl: %.o
 	@if test ! -f $(@:.prg-ssl=) -o $< -nt $(@:.prg-ssl=); then \
 	echo $(LINK) $(LIBNSL_LIBS) $(LIBSSL_LDFLAGS) $(LIBSSL_LIBS) -o $(@:.prg-ssl=) $^ ; \
diff --git a/examples/configure.ac b/examples/configure.ac
index ed333b33..c28ae5c4 100644
--- a/examples/configure.ac
+++ b/examples/configure.ac
@@ -136,7 +136,9 @@ ACX_WITH_SSL_OPTIONAL
 AC_SUBST(LIBSSL_CPPFLAGS)
 AC_SUBST(LIBSSL_LDFLAGS)
 AC_SUBST(LIBSSL_LIBS)
-
+if test "x$HAVE_SSL" = "xyes"; then
+AC_SUBST(LIBSSL_SSL_LIBS, ["$LIBSSL_LIBS -lssl"])
+fi
 CPPFLAGS="$tmp_CPPFLAGS"
 LDFLAGS="$tmp_LDFLAGS"
 LIBS="$tmp_LIBS"