Use the libtool name of the library (libeap.la) instead of the -L

	and -l options. (considered SOP when linking against an uninstalled
	library)

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 bf3fde3..f94408d 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in
@@ -5,8 +5,8 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap_peap.c peap.c
 HEADERS     = eap_peap.h ../../eap.h ../../rlm_eap.h
-RLM_CFLAGS  = $(INCLTDL) -I../.. $(OPENSSL_INCLUDE) -I@srcdir@/../../libeap -DOPENSSL_NO_KRB5 @eap_peap_cflags@
-RLM_LIBS    = @eap_peap_ldflags@ -L@srcdir@/../../libeap -leap $(OPENSSL_LIBS)
+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)
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_sim/Makefile.in b/src/modules/rlm_eap/types/rlm_eap_sim/Makefile.in
index 7b3efdd..dd30afb 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_sim/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_sim/Makefile.in
@@ -5,8 +5,8 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap_sim.c
 HEADERS     = eap_sim.h
-RLM_CFLAGS  = $(INCLTDL) -I@srcdir@/../.. -I@srcdir@/../../libeap @eap_sim_cflags@
-RLM_LIBS    = @eap_sim_ldflags@ -L@srcdir@/../../libeap -leap
+RLM_CFLAGS  = $(INCLTDL) -I../.. -I../../libeap @eap_sim_cflags@
+RLM_LIBS    = @eap_sim_ldflags@ ../../libeap/libeap.la
 RLM_INSTALL =
 
 $(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 9590b73..f95e309 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in
@@ -5,8 +5,8 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap_tls.c
 HEADERS     = rlm_eap_tls.h eap_tls.h ../../eap.h ../../rlm_eap.h
-RLM_CFLAGS  = $(INCLTDL) -I@srcdir@/../.. $(OPENSSL_INCLUDE) -I@srcdir@/../../libeap -DOPENSSL_NO_KRB5 @eap_tls_cflags@
-RLM_LIBS    = @eap_tls_ldflags@ -L@srcdir@/../../libeap -leap $(OPENSSL_LIBS)
+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)
 

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 11f5d7c..25e9868 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in
@@ -5,8 +5,8 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap_ttls.c ttls.c
 HEADERS     = eap_ttls.h ../../eap.h ../../rlm_eap.h
-RLM_CFLAGS  = $(INCLTDL) -I@srcdir@/../.. $(OPENSSL_INCLUDE) -I@srcdir@/../../libeap -DOPENSSL_NO_KRB5 @eap_ttls_cflags@
-RLM_LIBS    = @eap_ttls_ldflags@ -L@srcdir@/../../libeap -leap $(OPENSSL_LIBS)
+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)