tag 288547 -help +patch
quit

Hi.

When library is in the same project, it is for linking better 
to specify "$dir/lib$name.la" instead of "-L$dir -l$name".

When attached patch is applied, freeradius can be compiled 
and started on amd64.

The patch patches same files as 06_libtool14_vs_rlm_eap_tls.dpatch 
and (unused) 08_make_install_libeap_before_make_dynamic_eap_types.dpatch.
The attached patch should be applied after "debian/rules patch"

It would be better to integrate this patches together. 

Regards
                Petr

diff -ur freeradius-1.0.5.ap/src/modules/rlm_eap/Makefile.in 
freeradius-1.0.5/src/modules/rlm_eap/Makefile.in
--- freeradius-1.0.5.ap/src/modules/rlm_eap/Makefile.in 2005-04-11 
21:18:28.000000000 +0000
+++ freeradius-1.0.5/src/modules/rlm_eap/Makefile.in    2005-09-25 
09:18:49.000000000 +0000
@@ -2,9 +2,8 @@
 SRCS        = rlm_eap.c eap.c mem.c state.c
 HEADERS     = eap.h rlm_eap.h
 RLM_CFLAGS  = $(INCLTDL) [EMAIL PROTECTED]@/libeap
-CLIENTLIBS  = -Llibeap -leap -L../../lib -lradius
-RLM_LIBS    = -Llibeap -leap
-#RLM_LIBS    = $(shell for x in types/rlm_eap*/rlm_eap*.la;do echo -dlpreopen 
$$x;done)
+RLM_LIBS    = @srcdir@/libeap/libeap.la
+CLIENTLIBS  = $(RLM_LIBS) -L../../lib -lradius
 RLM_INSTALL = install-types
 RLM_SUBDIRS = libeap @eaptypes@ 
 RLM_UTILS   = radeapclient
diff -ur freeradius-1.0.5.ap/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in 
freeradius-1.0.5/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in
--- freeradius-1.0.5.ap/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in      
2005-09-25 09:17:37.000000000 +0000
+++ freeradius-1.0.5/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in 
2005-09-25 09:19:38.000000000 +0000
@@ -3,7 +3,7 @@
 RLM_CFLAGS  = $(INCLTDL) -I../.. @eap_peap_cflags@ -I../rlm_eap_tls 
-DOPENSSL_NO_KRB5 [EMAIL PROTECTED]@/../../libeap
 HEADERS     = ../rlm_eap_tls/rlm_eap_tls.h eap_peap.h ../../eap.h 
../../rlm_eap.h
 RLM_INSTALL = 
-RLM_LIBS    = [EMAIL PROTECTED]@/../../libeap -leap [EMAIL 
PROTECTED]@/../rlm_eap_tls -lrlm_eap_tls @eap_peap_ldflags@
+RLM_LIBS    = @srcdir@/../../libeap/libeap.la 
@srcdir@/../rlm_eap_tls/liblrlm_eap_tls.la @eap_peap_ldflags@
 
 $(STATIC_OBJS): $(HEADERS)
 
diff -ur freeradius-1.0.5.ap/src/modules/rlm_eap/types/rlm_eap_sim/Makefile.in 
freeradius-1.0.5/src/modules/rlm_eap/types/rlm_eap_sim/Makefile.in
--- freeradius-1.0.5.ap/src/modules/rlm_eap/types/rlm_eap_sim/Makefile.in       
2004-05-28 16:17:48.000000000 +0000
+++ freeradius-1.0.5/src/modules/rlm_eap/types/rlm_eap_sim/Makefile.in  
2005-09-25 09:18:49.000000000 +0000
@@ -2,7 +2,7 @@
 SRCS        = rlm_eap_sim.c 
 RLM_CFLAGS  = $(INCLTDL) [EMAIL PROTECTED]@/../.. [EMAIL 
PROTECTED]@/../../libeap
 HEADERS     = eap_sim.h
-RLM_LIBS    = [EMAIL PROTECTED]@/../../libeap -leap
+RLM_LIBS    = @srcdir@/../../libeap/libeap.la
 RLM_INSTALL = 
 
 $(STATIC_OBJS): $(HEADERS)
diff -ur freeradius-1.0.5.ap/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in 
freeradius-1.0.5/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in
--- freeradius-1.0.5.ap/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in      
2005-09-25 09:17:37.000000000 +0000
+++ freeradius-1.0.5/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in 
2005-09-25 09:21:42.000000000 +0000
@@ -3,7 +3,7 @@
 RLM_CFLAGS  = $(INCLTDL) [EMAIL PROTECTED]@/../.. [EMAIL 
PROTECTED]@/../../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    = [EMAIL PROTECTED]@/../../libeap -leap [EMAIL 
PROTECTED]@/../rlm_eap_tls -lrlm_eap_tls @eap_ttls_ldflags@
+RLM_LIBS    = @srcdir@/../../libeap/libeap.la 
@srcdir@/../rlm_eap_tls/librlm_eap_tls.la @eap_ttls_ldflags@
 
 $(STATIC_OBJS): $(HEADERS)
 

Reply via email to