Pull fixes from the head

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 ba8b29a..cc98cd4 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in
@@ -3,7 +3,7 @@ SRCS        = rlm_eap_peap.c peap.c
 RLM_CFLAGS  = $(INCLTDL) -I../.. @eap_peap_cflags@ -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    += @eap_peap_ldflags@
+RLM_LIBS    = -L@srcdir@/../../libeap -leap @srcdir@/../rlm_eap_tls/rlm_eap_tls.la @eap_peap_ldflags@
 
 $(STATIC_OBJS): $(HEADERS)