From 273e61b962c18369f3641e3ade1e036956c3beff Mon Sep 17 00:00:00 2001 From: nbk Date: Sun, 8 Jan 2006 19:52:26 +0000 Subject: [PATCH] Delete the variable RLM_EAP_LINK_MODE support. This terrible hack isn't needed anymore since TLS code moved from module rlm_eap_tls to libeap. Now libtool manages to build correctly the modules rlm_eap_peap and rlm_eap_ttls. --- debian/rules | 3 --- src/main/Makefile.in | 9 --------- src/modules/rlm_eap/libeap/Makefile | 3 +-- src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in | 1 - src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in | 1 - src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in | 1 - src/modules/rules.mak | 6 +++--- 7 files changed, 4 insertions(+), 20 deletions(-) diff --git a/debian/rules b/debian/rules index 0fcae7f..b943cb0 100755 --- a/debian/rules +++ b/debian/rules @@ -40,9 +40,6 @@ else confflags += --host $(DEB_BUILD_GNU_TYPE) --build $(DEB_HOST_GNU_TYPE) endif -# Libtool won't play nice, so we won't play at all -export RLM_EAP_LINK_MODE = -static - build-simple: stamp-build stamp-build: stamp-patch dh_testdir diff --git a/src/main/Makefile.in b/src/main/Makefile.in index 8cf8279..0de13d3 100644 --- a/src/main/Makefile.in +++ b/src/main/Makefile.in @@ -49,15 +49,6 @@ MODULE_LIBS += $(shell for x in $(SUB_MODULES);do test -f ../modules/*/drivers/$ MODULE_OBJS += $(shell for x in $(MODULES);do test -f ../modules/$$x/$$x.la && echo ../modules/$$x/$$x.la;done) MODULE_OBJS += $(shell for x in $(SUB_MODULES);do test -f ../modules/*/types/$$x/$$x.la && echo ../modules/*/types/$$x/$$x.la;done) MODULE_OBJS += $(shell for x in $(SUB_MODULES);do test -f ../modules/*/drivers/$$x/$$x.la && echo ../modules/*/drivers/$$x/$$x.la;done) -else - -# -# Weird EAP nonsense -# -ifeq ($(RLM_EAP_LINK_MODE),-static) -LIBS += $(shell test -f ../modules/rlm_eap/libeap/libeap.a && echo -L../modules/rlm_eap/libeap -leap) -MODULE_LIBS += $(shell for x in rlm_eap_tls rlm_eap_ttls rlm_eap_peap;do test -f ../modules/*/types/$$x/$$x.la && echo -dlpreopen ../modules/*/types/$$x/$$x.la;done) -endif endif LIBS += -lradius $(SNMP_LIBS) diff --git a/src/modules/rlm_eap/libeap/Makefile b/src/modules/rlm_eap/libeap/Makefile index 95acaab..fe3164a 100644 --- a/src/modules/rlm_eap/libeap/Makefile +++ b/src/modules/rlm_eap/libeap/Makefile @@ -7,7 +7,6 @@ SRCS = fips186prf.c eapcrypto.c eapcommon.c eapsimlib.c \ eap_tls.c tls.c cb.c mppe_keys.c INCLUDES = eap_types.h eap_tls.h RLM_CFLAGS = -DEAPLIB -I${top_builddir}/src -I${top_builddir}/src/modules/rlm_eap -I${top_builddir}/src/modules/rlm_eap/libeap -LINK_MODE = $(RLM_EAP_LINK_MODE) RLM_DIR = ../ include ../../rules.mak @@ -16,4 +15,4 @@ include ../../rules.mak $(TARGET).la: $(DYNAMIC_OBJS) $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \ $(LINK_MODE) $(RLM_LDFLAGS) $(LDFLAGS) -o $@ -rpath $(libdir) \ - $^ $(RLM_DIR)../../lib/libradius.la $(RLM_LIBS) $(LIBS) + $^ ${top_builddir}/src/lib/libradius.la $(RLM_LIBS) $(LIBS) diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in b/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in index f94408d..e1f7532 100644 --- a/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in +++ b/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in @@ -8,7 +8,6 @@ HEADERS = eap_peap.h ../../eap.h ../../rlm_eap.h RLM_CFLAGS = $(INCLTDL) -I../.. $(OPENSSL_INCLUDE) -I../../libeap -DOPENSSL_NO_KRB5 @eap_peap_cflags@ RLM_LIBS = @eap_peap_ldflags@ ../../libeap/libeap.la $(OPENSSL_LIBS) RLM_INSTALL = -LINK_MODE = $(RLM_EAP_LINK_MODE) $(STATIC_OBJS): $(HEADERS) diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in b/src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in index f95e309..c1c1113 100644 --- a/src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in +++ b/src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in @@ -8,7 +8,6 @@ HEADERS = rlm_eap_tls.h eap_tls.h ../../eap.h ../../rlm_eap.h RLM_CFLAGS = $(INCLTDL) -I../.. $(OPENSSL_INCLUDE) -I../../libeap -DOPENSSL_NO_KRB5 @eap_tls_cflags@ RLM_LIBS = @eap_tls_ldflags@ ../../libeap/libeap.la $(OPENSSL_LIBS) RLM_INSTALL = -LINK_MODE = $(RLM_EAP_LINK_MODE) $(STATIC_OBJS): $(HEADERS) diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in b/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in index 25e9868..6baaa2a 100644 --- a/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in +++ b/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in @@ -8,7 +8,6 @@ HEADERS = eap_ttls.h ../../eap.h ../../rlm_eap.h RLM_CFLAGS = $(INCLTDL) -I../.. $(OPENSSL_INCLUDE) -I../../libeap -DOPENSSL_NO_KRB5 @eap_ttls_cflags@ RLM_LIBS = @eap_ttls_ldflags@ ../../libeap/libeap.la $(OPENSSL_LIBS) RLM_INSTALL = -LINK_MODE = $(RLM_EAP_LINK_MODE) $(STATIC_OBJS): $(HEADERS) diff --git a/src/modules/rules.mak b/src/modules/rules.mak index c38388c..abfd4d9 100644 --- a/src/modules/rules.mak +++ b/src/modules/rules.mak @@ -86,9 +86,9 @@ ifneq ($(TARGET),) # Yes, this is a horrible hack. # ifeq ($(findstring $(TARGET),$(STATIC_MODULES)),) -LINK_MODE +=-export-dynamic +LINK_MODE = -export-dynamic else -LINK_MODE +=-static +LINK_MODE = -static endif # @@ -96,7 +96,7 @@ endif # link mode to static. # ifneq ($(USE_SHARED_LIBS),yes) -LINK_MODE += -static +LINK_MODE = -static endif $(TARGET).la: $(DYNAMIC_OBJS) -- 2.1.4