diff -Nru freeradius-snapshot-20051115/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in freeradius-snapshot-20051115.neu/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in
--- freeradius-snapshot-20051115/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in     2005-03-25 00:04:16.000000000 +0100
+++ freeradius-snapshot-20051115.neu/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in 2005-11-16 13:36:36.000000000 +0100
@@ -3,7 +3,7 @@
 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@ $(OPENSSL_LIBS)
+RLM_LIBS    = -L@srcdir@/../../libeap -leap -L@srcdir@/../rlm_eap_tls -lrlm_eap_tls @eap_peap_ldflags@ $(OPENSSL_LIBS)
 LINK_MODE   = $(RLM_EAP_LINK_MODE)

 $(STATIC_OBJS): $(HEADERS)
diff -Nru freeradius-snapshot-20051115/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in freeradius-snapshot-20051115.neu/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in
--- freeradius-snapshot-20051115/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in     2005-03-25 00:04:16.000000000 +0100
+++ freeradius-snapshot-20051115.neu/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in 2005-11-16 13:36:36.000000000 +0100
@@ -3,7 +3,7 @@
 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@ $(OPENSSL_LIBS)
+RLM_LIBS    = -L@srcdir@/../../libeap -leap -L@srcdir@/../rlm_eap_tls -lrlm_eap_tls @eap_ttls_ldflags@ $(OPENSSL_LIBS)
 LINK_MODE   = $(RLM_EAP_LINK_MODE)

 $(STATIC_OBJS): $(HEADERS)
diff -Nru freeradius-snapshot-20051115/src/modules/rules.mak freeradius-snapshot-20051115.neu/src/modules/rules.mak
--- freeradius-snapshot-20051115/src/modules/rules.mak  2005-11-11 01:32:55.000000000 +0100
+++ freeradius-snapshot-20051115.neu/src/modules/rules.mak      2005-11-16 13:36:36.000000000 +0100
@@ -104,6 +104,14 @@
        -module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) \
        -o $@ -rpath $(libdir) $^ $(RLM_DIR)../../lib/libradius.la \
        $(RLM_LIBS) $(LIBS)
+       for file in .libs/rlm_eap_*.so ; do \
+               [ -f $$file ] || continue; \
+               name=$${file#.libs/}; \
+               name=$${name%.so}; \
+               ln -s .libs/$${name}.so lib$${name}.so; \
+               ln -s .libs/$${name}.la lib$${name}.la; \
+       done
+

 #######################################################################
 #
@@ -146,6 +154,7 @@
        @rm -f *.a *.o *.lo *.la *~
        @rm -rf .libs _libs
        @rm -f config.cache config.log config.status $(RLM_UTILS)
+       @rm -f librlm_eap_*.la librlm_eap_*.so
        @[ "x$(RLM_SUBDIRS)" = "x" ] || $(MAKE) $(MFLAGS) WHAT_TO_MAKE=clean common

 distclean: clean