]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Revert "Build tls functions into libfreeradius-server not radiusd"
authorAlan T. DeKok <aland@freeradius.org>
Thu, 2 Nov 2017 16:12:35 +0000 (12:12 -0400)
committerAlan T. DeKok <aland@freeradius.org>
Thu, 2 Nov 2017 16:12:35 +0000 (12:12 -0400)
This reverts commit 6087844e40959be171062dde235294810954bca1.

this breaks the build.  It needs to be re-done once it builds
correctly.

src/main/libfreeradius-server.mk
src/main/radiusd.mk

index 2a579e9e90bd04d2317ca81b2ad733826c7fd98f..5408f81c7c8a1a6ec482018a04bbfe249ed4d5fe 100644 (file)
@@ -24,10 +24,6 @@ SOURCES      :=      cond_eval.c \
                xlat_func.c \
                xlat_tokenize.c
 
-ifneq ($(OPENSSL_LIBS),)
-include ${top_srcdir}/src/main/tls.mk
-endif
-
 # This lets the linker determine which version of the SSLeay functions to use.
 TGT_LDLIBS  := $(LIBS) $(OPENSSL_LIBS) $(GPERFTOOLS_FLAGS) $(GPERFTOOLS_LIBS)
 TGT_PREREQS    := libfreeradius-util.la libfreeradius-radius.a
index cd353d8cd514cea18d50c4fe8adc97a7b86f51ec..bdf2961ed039eb1206907a8f5dffef0e6cca1d4a 100644 (file)
@@ -17,6 +17,10 @@ SOURCES := \
     virtual_servers.c \
     process.c
 
+ifneq ($(OPENSSL_LIBS),)
+include ${top_srcdir}/src/main/tls.mk
+endif
+
 SRC_CFLAGS     :=
 
 TGT_INSTALLDIR  := ${sbindir}