From 2ce531f7375e2559ed789f6a3ef12152a3d71c5a Mon Sep 17 00:00:00 2001
From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 5 Jan 2014 12:54:26 +0000
Subject: [PATCH] Don't always add $(OPENSSL_LIBS) to LIBS, this makes the
 debian dependency stuff complain

---
 configure               | 1 -
 configure.ac            | 1 -
 src/main/radiusd.mk     | 2 +-
 src/main/radsniff.mk.in | 2 +-
 src/main/unittest.mk    | 4 ++--
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 52b4f0c944db..1d50e97f076e 100755
--- a/configure
+++ b/configure
@@ -7758,7 +7758,6 @@ $as_echo "#define HAVE_LIBSSL 1" >>confdefs.h
             OPENSSL_LIBS="-L$OPENSSL_LIB_DIR"
           fi
           OPENSSL_LIBS="$OPENSSL_LIBS -lcrypto -lssl -lcrypto"
-          LIBS="$OPENSSL_LIBS $LIBS"
 
 else
 
diff --git a/configure.ac b/configure.ac
index ad1dde364a02..36e6e67e29ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -966,7 +966,6 @@ if test "x$WITH_OPENSSL" = xyes; then
             OPENSSL_LIBS="-L$OPENSSL_LIB_DIR"
           fi
           OPENSSL_LIBS="$OPENSSL_LIBS -lcrypto -lssl -lcrypto"
-          LIBS="$OPENSSL_LIBS $LIBS"
         ],
         [
           AC_MSG_FAILURE([failed linking to libssl])
diff --git a/src/main/radiusd.mk b/src/main/radiusd.mk
index 9a33539f90bd..0a8c90ed1380 100644
--- a/src/main/radiusd.mk
+++ b/src/main/radiusd.mk
@@ -10,7 +10,7 @@ endif
 
 SRC_CFLAGS	:= -DHOSTINFO=\"${HOSTINFO}\"
 TGT_INSTALLDIR  := ${sbindir}
-TGT_LDLIBS	:= $(LIBS) $(LCRYPT)
+TGT_LDLIBS	:= $(LIBS) $(OPENSSL_LIBS) $(LCRYPT)
 TGT_PREREQS	:= libfreeradius-server.a libfreeradius-radius.a
 
 # Libraries can't depend on libraries (oops), so make the binary
diff --git a/src/main/radsniff.mk.in b/src/main/radsniff.mk.in
index 973c3e35d1fa..3e8605f9dee7 100644
--- a/src/main/radsniff.mk.in
+++ b/src/main/radsniff.mk.in
@@ -9,4 +9,4 @@ endif
 SOURCES		:= radsniff.c collectd.c
 
 TGT_PREREQS	:= libfreeradius-radius.a
-TGT_LDLIBS	:= $(LIBS) $(OPENSSL_LIBS) $(PCAP_LIBS) $(COLLECTDC_LIBS)
+TGT_LDLIBS	:= $(LIBS) $(PCAP_LIBS) $(PCAP_LIBS) $(COLLECTDC_LIBS)
diff --git a/src/main/unittest.mk b/src/main/unittest.mk
index 7cbcf06225a5..fe5e08ca3208 100644
--- a/src/main/unittest.mk
+++ b/src/main/unittest.mk
@@ -10,8 +10,8 @@ SOURCES	+= cb.c tls.c
 endif
 
 SRC_CFLAGS	:= -DHOSTINFO=\"${HOSTINFO}\"
-TGT_INSTALLDIR  := 
-TGT_LDLIBS	:= $(LIBS) $(LCRYPT)
+TGT_INSTALLDIR  :=
+TGT_LDLIBS	:= $(LIBS) $(OPENSSL_LIBS) $(LCRYPT)
 TGT_PREREQS	:= libfreeradius-server.a libfreeradius-radius.a
 
 # Libraries can't depend on libraries (oops), so make the binary