New way of looking for OpenSSL libraries and includes: makefile changes

diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index ab02401..f4bf214 100644 (file)
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -36,9 +36,8 @@ SUB_MODULES += rlm_eap_md5 rlm_eap_leap rlm_eap_tls rlm_eap_ttls rlm_eap_sim
 SUB_MODULES += rlm_eap_peap rlm_eap_mschapv2 rlm_eap_gtc
 SUB_MODULES += rlm_sql_db2 rlm_sql_freetds rlm_sql_iodbc rlm_sql_mysql
 SUB_MODULES += rlm_sql_oracle rlm_sql_postgresql rlm_sql_sybase rlm_sql_unixodbc
-ifneq ($(OPENSSL_LIBS),)
-LIBS += -L$(OPENSSL_LIBS) -L../modules/rlm_eap/libeap -leap -lcrypto -lssl -lcrypto -lssl 
-endif
+LIBS        += $(shell -f ../modules/rlm_eap/libeap/libeap.a && echo -L../modules/rlm_eap/libeap -leap)
+
 #
 MODULE_LIBS    += $(shell for x in $(MODULES);do test -f ../modules/$$x/$$x.la && echo -dlpreopen ../modules/$$x/$$x.la;done)
 MODULE_LIBS    += $(shell for x in $(SUB_MODULES);do test -f ../modules/*/types/$$x/$$x.la && echo -dlpreopen ../modules/*/types/$$x/$$x.la;done)
@@ -57,7 +56,7 @@ radiusd: $(SERVER_OBJS) ../lib/libradius.la $(MODULE_OBJS)
        $(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \
                $(LT_BIN_FLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
                $(SERVER_OBJS) $(LCRYPT) $(MODULE_LIBS) $(LIBS) \
-               $(PTHREADLIB) $(LIBLTDL) $(LCRYPT)
+               $(PTHREADLIB) $(LIBLTDL) $(LCRYPT) $(OPENSSL_LIBS)
 
 radiusd.o: radiusd.c $(INCLUDES)  ../include/request_list.h ../include/modules.h ../include/modcall.h ../include/modpriv.h
        $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radiusd.c

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 d8c366c..7bc2bbd 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in
@@ -1,9 +1,9 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap_peap.c peap.c
-RLM_CFLAGS  = $(INCLTDL) -I../.. @eap_peap_cflags@ -I../rlm_eap_tls -DOPENSSL_NO_KRB5 -I@srcdir@/../../libeap
+RLM_CFLAGS  = $(INCLTDL) -I../.. @eap_peap_cflags@ $(OPENSSL_INCLUDE) -I../rlm_eap_tls -DOPENSSL_NO_KRB5 -I@srcdir@/../../libeap
 HEADERS     = ../rlm_eap_tls/rlm_eap_tls.h eap_peap.h ../../eap.h ../../rlm_eap.h
 RLM_INSTALL = 
-RLM_LIBS    = ../rlm_eap_tls/rlm_eap_tls.la -L@srcdir@/../../libeap -leap @eap_peap_ldflags@
+RLM_LIBS    = ../rlm_eap_tls/rlm_eap_tls.la -L@srcdir@/../../libeap -leap @eap_peap_ldflags@ $(OPENSSL_LIBS)
 
 $(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 f743b45..541b49b 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in
@@ -1,9 +1,9 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap_tls.c eap_tls.c cb.c tls.c mppe_keys.c
-RLM_CFLAGS  = $(INCLTDL) -I@srcdir@/../.. -I@srcdir@/../../libeap @eap_tls_cflags@ -DOPENSSL_NO_KRB5 
+RLM_CFLAGS  = $(INCLTDL) -I@srcdir@/../.. $(OPENSSL_INCLUDE) -I@srcdir@/../../libeap @eap_tls_cflags@ -DOPENSSL_NO_KRB5 
 HEADERS     = rlm_eap_tls.h eap_tls.h ../../eap.h ../../rlm_eap.h
 RLM_INSTALL = 
-RLM_LIBS    += @eap_tls_ldflags@
+RLM_LIBS    += @eap_tls_ldflags@ $(OPENSSL_LIBS)
 
 $(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 605e9ff..a07d958 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in
@@ -1,9 +1,9 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap_ttls.c ttls.c
-RLM_CFLAGS  = $(INCLTDL) -I@srcdir@/../.. -I@srcdir@/../../libeap @eap_ttls_cflags@ -I../rlm_eap_tls -DOPENSSL_NO_KRB5
+RLM_CFLAGS  = $(INCLTDL) -I@srcdir@/../.. $(OPENSSL_INCLUDE) -I@srcdir@/../../libeap @eap_ttls_cflags@ -I../rlm_eap_tls -DOPENSSL_NO_KRB5
 HEADERS     = ../rlm_eap_tls/rlm_eap_tls.h eap_ttls.h ../../eap.h ../../rlm_eap.h
 RLM_INSTALL = 
-RLM_LIBS    = ../rlm_eap_tls/rlm_eap_tls.la -L@srcdir@/../../libeap -leap @eap_ttls_ldflags@
+RLM_LIBS    = ../rlm_eap_tls/rlm_eap_tls.la -L@srcdir@/../../libeap -leap @eap_ttls_ldflags@ $(OPENSSL_LIBS)
 
 $(STATIC_OBJS): $(HEADERS)
 

diff --git a/src/modules/rlm_x99_token/Makefile.in b/src/modules/rlm_x99_token/Makefile.in
index f02dad3..085e2af 100644 (file)
--- a/src/modules/rlm_x99_token/Makefile.in
+++ b/src/modules/rlm_x99_token/Makefile.in
@@ -24,8 +24,8 @@ TARGET      = @targetname@
 SRCS        = x99_rlm.c x99_util.c x99_state.c x99_mac.c x99_sync.c
 SRCS       += x99_site.c x99_pwe.c x99_log.c
 HEADERS     = x99.h x99_rad.h x99_sync.h x99_pwe.h
-RLM_CFLAGS  = @x99_token_cflags@
-RLM_LIBS    = @x99_token_ldflags@
+RLM_CFLAGS  = @x99_token_cflags@ $(OPENSSL_INCLUDE)
+RLM_LIBS    = @x99_token_ldflags@ $(OPENSSL_LIBS)
 
 ## this uses the RLM_CFLAGS and RLM_LIBS and SRCS defs to make TARGET.
 include ../rules.mak