Skip to content

Commit

Permalink
Don't always add $(OPENSSL_LIBS) to LIBS, this makes the debian depen…
Browse files Browse the repository at this point in the history
…dency stuff complain
  • Loading branch information
arr2036 committed Jan 5, 2014
1 parent 8fefb27 commit 2ce531f
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 6 deletions.
1 change: 0 additions & 1 deletion configure
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion configure.ac
Expand Up @@ -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])
Expand Down
2 changes: 1 addition & 1 deletion src/main/radiusd.mk
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/radsniff.mk.in
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions src/main/unittest.mk
Expand Up @@ -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
Expand Down

0 comments on commit 2ce531f

Please sign in to comment.