Final fix for system libltdl (or not)

diff --git a/src/include/modpriv.h b/src/include/modpriv.h
index cf27616..6850730 100644 (file)
--- a/src/include/modpriv.h
+++ b/src/include/modpriv.h
@@ -17,7 +17,7 @@
 
 #ifndef WITHOUT_LIBLTDL
 #ifdef WITH_SYSTEM_LTDL
-#include "ltdl.h"
+#include <ltdl.h>
 #else
 #include "libltdl/ltdl.h"
 #endif

diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 5ee926d..b82ff8f 100644 (file)
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -96,8 +96,6 @@ session.lo: session.c ../include/modules.h
 
 # It's #include'd for simplicity.  This should be fixed...
 listen.lo: listen.c dhcpd.c command.c
-       @echo CC $<
-       @$(LIBTOOL) --quiet --mode=compile $(CC) $(CFLAGS) $(INCLTDL) -c listen.c
 
 #
 # Helper programs

diff --git a/src/modules/rlm_eap/Makefile.in b/src/modules/rlm_eap/Makefile.in
index 199cff2..5ea4ad5 100644 (file)
--- a/src/modules/rlm_eap/Makefile.in
+++ b/src/modules/rlm_eap/Makefile.in
@@ -5,7 +5,7 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap.c eap.c mem.c
 HEADERS     = eap.h rlm_eap.h
-RLM_CFLAGS  = $(INCLTDL) -Ilibeap
+RLM_CFLAGS  = -Ilibeap
 CLIENTLIBS  = libeap/$(LIBPREFIX)freeradius-eap.la $(LIBRADIUS)
 RLM_LIBS    = libeap/$(LIBPREFIX)freeradius-eap.la $(LIBLTDL)
 RLM_INSTALL = install-subdirs

diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/Makefile b/src/modules/rlm_eap/types/rlm_eap_gtc/Makefile
index f766537..0faf33b 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_gtc/Makefile
+++ b/src/modules/rlm_eap/types/rlm_eap_gtc/Makefile
@@ -6,7 +6,7 @@
 
 TARGET      = rlm_eap_gtc
 SRCS        = rlm_eap_gtc.c
-RLM_CFLAGS  = $(INCLTDL) -I../.. -I../../libeap
+RLM_CFLAGS  = -I../.. -I../../libeap
 HEADERS     =  ../../rlm_eap.h ../../eap.h
 RLM_INSTALL =
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_ikev2/Makefile.in b/src/modules/rlm_eap/types/rlm_eap_ikev2/Makefile.in
index 5a57043..d74a4ea 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ikev2/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_ikev2/Makefile.in
@@ -2,7 +2,7 @@ TARGET      = @targetname@
 SRCS        = logging_impl.c \
              rlm_eap_ikev2.c \
              ike_conf.c
-RLM_CFLAGS  = $(INCLTDL) -I../.. -I../../libeap $(OPENSSL_INCLUDE) @eap_ikev2_cflags@
+RLM_CFLAGS  = -I../.. -I../../libeap $(OPENSSL_INCLUDE) @eap_ikev2_cflags@
 RLM_LDFLAGS = @LDFLAGS@  @LIBS@ $(OPENSSL_LIBS)
 HEADERS     = eap_ikev2.h logging_impl.h ike_conf.h
 RLM_INSTALL = 

diff --git a/src/modules/rlm_eap/types/rlm_eap_leap/Makefile b/src/modules/rlm_eap/types/rlm_eap_leap/Makefile
index 3dbf25e..43eecae 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_leap/Makefile
+++ b/src/modules/rlm_eap/types/rlm_eap_leap/Makefile
@@ -6,7 +6,7 @@
 
 TARGET      = rlm_eap_leap
 SRCS        = rlm_eap_leap.c eap_leap.c smbdes.c
-RLM_CFLAGS  = $(INCLTDL) -I../.. -I../../libeap
+RLM_CFLAGS  = -I../.. -I../../libeap
 HEADERS     = eap_leap.h  ../../eap.h ../../rlm_eap.h
 RLM_INSTALL =
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_md5/Makefile b/src/modules/rlm_eap/types/rlm_eap_md5/Makefile
index 5231e61..b7f6030 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_md5/Makefile
+++ b/src/modules/rlm_eap/types/rlm_eap_md5/Makefile
@@ -7,7 +7,7 @@
 TARGET      = rlm_eap_md5
 SRCS        = rlm_eap_md5.c eap_md5.c
 HEADERS     = eap_md5.h
-RLM_CFLAGS  = $(INCLTDL) -I../.. -I../../libeap
+RLM_CFLAGS  = -I../.. -I../../libeap
 RLM_INSTALL =
 
 RLM_DIR=../../

diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/Makefile b/src/modules/rlm_eap/types/rlm_eap_mschapv2/Makefile
index bd3463d..4d4b72f 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/Makefile
+++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/Makefile
@@ -7,7 +7,7 @@
 TARGET      = rlm_eap_mschapv2
 SRCS        = rlm_eap_mschapv2.c
 HEADERS     = eap_mschapv2.h
-RLM_CFLAGS  = $(INCLTDL) -I../.. -I../../libeap
+RLM_CFLAGS  = -I../.. -I../../libeap
 RLM_INSTALL =
 
 RLM_DIR=../../

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 cb5a109..c890d41 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,7 +5,7 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap_peap.c peap.c
 HEADERS     = eap_peap.h ../../eap.h ../../rlm_eap.h
-RLM_CFLAGS  = -I../.. -I../../libeap $(INCLTDL) $(OPENSSL_INCLUDE) @eap_peap_cflags@
+RLM_CFLAGS  = -I../.. -I../../libeap $(OPENSSL_INCLUDE) @eap_peap_cflags@
 RLM_LIBS    = @eap_peap_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la $(OPENSSL_LIBS)
 RLM_INSTALL =
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_sim/Makefile b/src/modules/rlm_eap/types/rlm_eap_sim/Makefile
index 685cc3a..b30947f 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_sim/Makefile
+++ b/src/modules/rlm_eap/types/rlm_eap_sim/Makefile
@@ -7,7 +7,7 @@
 TARGET      = rlm_eap_sim
 SRCS        = rlm_eap_sim.c
 HEADERS     =
-RLM_CFLAGS  = $(INCLTDL) -I../.. -I../../libeap
+RLM_CFLAGS  = -I../.. -I../../libeap
 RLM_LIBS    =  ../../libeap/$(LIBPREFIX)freeradius-eap.la
 RLM_INSTALL =
 

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 3a76a1b..41240ea 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,7 +5,7 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap_tls.c
 HEADERS     = rlm_eap_tls.h ../../eap.h ../../rlm_eap.h
-RLM_CFLAGS  = -I../.. -I../../libeap $(INCLTDL) $(OPENSSL_INCLUDE) @eap_tls_cflags@
+RLM_CFLAGS  = -I../.. -I../../libeap $(OPENSSL_INCLUDE) @eap_tls_cflags@
 RLM_LIBS    = @eap_tls_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la $(OPENSSL_LIBS)
 RLM_INSTALL =
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_tnc/Makefile.in b/src/modules/rlm_eap/types/rlm_eap_tnc/Makefile.in
index a53d277..c09443e 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_tnc/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_tnc/Makefile.in
@@ -5,7 +5,7 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap_tnc.c eap_tnc.c tncs_connect.c 
 HEADERS     = eap_tnc.h tncs.h tncs_connect.h ../../eap.h ../../rlm_eap.h
-RLM_CFLAGS  = -I../.. -I../../libeap $(INCLTDL) $(OPENSSL_INCLUDE) @eap_tnc_cflags@
+RLM_CFLAGS  = -I../.. -I../../libeap $(OPENSSL_INCLUDE) @eap_tnc_cflags@
 RLM_LIBS    = @eap_tnc_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la $(OPENSSL_LIBS)
 RLM_INSTALL =
 

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 8187fba..d76a72c 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,7 +5,7 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap_ttls.c ttls.c
 HEADERS     = eap_ttls.h ../../eap.h ../../rlm_eap.h
-RLM_CFLAGS  = -I../.. -I../../libeap $(INCLTDL) $(OPENSSL_INCLUDE) @eap_ttls_cflags@
+RLM_CFLAGS  = -I../.. -I../../libeap $(OPENSSL_INCLUDE) @eap_ttls_cflags@
 RLM_LIBS    = @eap_ttls_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la $(OPENSSL_LIBS)
 RLM_INSTALL =
 

diff --git a/src/modules/rlm_eap2/Makefile b/src/modules/rlm_eap2/Makefile
index 4ad2b76..505b3bb 100644 (file)
--- a/src/modules/rlm_eap2/Makefile
+++ b/src/modules/rlm_eap2/Makefile
@@ -20,7 +20,7 @@ HOSTAP            = /path/to/hostap
 TARGET      = 
 SRCS        = rlm_eap2.c
 HEADERS     =
-RLM_CFLAGS  = $(INCLTDL) -I$(HOSTAP)/src/eap_common \
+RLM_CFLAGS  = -I$(HOSTAP)/src/eap_common \
              -I$(HOSTAP)/src/eap_server  -I$(HOSTAP)/src  \
              -I$(HOSTAP)/src/common -I$(HOSTAP)/src/utils
 RLM_LIBS    = $(HOSTAP)/eap_example/libeap.so

diff --git a/src/modules/rlm_rediswho/Makefile.in b/src/modules/rlm_rediswho/Makefile.in
index 3a4509c..6e5b4d4 100644 (file)
--- a/src/modules/rlm_rediswho/Makefile.in
+++ b/src/modules/rlm_rediswho/Makefile.in
@@ -1,7 +1,7 @@
 TARGET      = @targetname@
 SRCS        = rlm_rediswho.c
 HEADERS     = $(top_builddir)/src/modules/rlm_redis/rlm_redis.h
-RLM_CFLAGS  = -I$(top_builddir)/src/modules/rlm_redis $(INCLTDL) @redis_cflags@
+RLM_CFLAGS  = -I$(top_builddir)/src/modules/rlm_redis @redis_cflags@
 RLM_LIBS    = @redis_ldflags@
 RLM_INSTALL =
 

diff --git a/src/modules/rlm_sql/Makefile.in b/src/modules/rlm_sql/Makefile.in
index 5ab0ab1..c716f02 100644 (file)
--- a/src/modules/rlm_sql/Makefile.in
+++ b/src/modules/rlm_sql/Makefile.in
@@ -6,7 +6,7 @@ TARGET          = @targetname@
 SRCS           = rlm_sql.c sql.c
 HEADERS                = rlm_sql.h conf.h
 RLM_INSTALL    = install-drivers
-RLM_CFLAGS     = $(INCLTDL) -I$(top_builddir)/src/modules/rlm_sql
+RLM_CFLAGS     = -I$(top_builddir)/src/modules/rlm_sql
 RLM_LIBS       = $(LIBLTDL)
 RLM_SUBDIRS    = drivers
 

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/Makefile.in b/src/modules/rlm_sql/drivers/rlm_sql_db2/Makefile.in
index 7342f10..5d3d1e6 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/Makefile.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/Makefile.in
@@ -2,7 +2,7 @@ include ../../../../../Make.inc
 
 TARGET         = @targetname@
 SRCS           = sql_db2.c
-RLM_SQL_CFLAGS = @sql_ibmdb2_cflags@ $(INCLTDL)
+RLM_SQL_CFLAGS = @sql_ibmdb2_cflags@
 RLM_SQL_LIBS   = @sql_ibmdb2_ldflags@
 
 include ../rules.mak

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/Makefile.in b/src/modules/rlm_sql/drivers/rlm_sql_firebird/Makefile.in
index 624ab45..aac77af 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/Makefile.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/Makefile.in
@@ -7,7 +7,7 @@ include ../../../../../Make.inc
 TARGET         = @targetname@
 SRCS           = sql_firebird.c sql_fbapi.c
 HEADERS                = sql_fbapi.h
-RLM_SQL_CFLAGS = @sql_firebird_cflags@ $(INCLTDL)
+RLM_SQL_CFLAGS = @sql_firebird_cflags@
 RLM_SQL_LIBS   = @sql_firebird_ldflags@
 
 # this uses the RLM_SQL_CFLAGS and RLM_SQL_LIBS and SRCS defs to make TARGET.

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/Makefile.in b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/Makefile.in
index 8c08088..64af56d 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_iodbc/Makefile.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_iodbc/Makefile.in
@@ -2,7 +2,7 @@ include ../../../../../Make.inc
 
 TARGET         = @targetname@
 SRCS           = sql_iodbc.c
-RLM_SQL_CFLAGS = @sql_iodbc_cflags@ $(INCLTDL)
+RLM_SQL_CFLAGS = @sql_iodbc_cflags@
 RLM_SQL_LIBS   = @sql_iodbc_ldflags@
 
 include ../rules.mak

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/Makefile.in b/src/modules/rlm_sql/drivers/rlm_sql_mysql/Makefile.in
index 9152bf0..a17bb3d 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/Makefile.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/Makefile.in
@@ -2,7 +2,7 @@ include ../../../../../Make.inc
 
 TARGET         = @targetname@
 SRCS           = sql_mysql.c
-RLM_SQL_CFLAGS = @sql_mysql_cflags@ $(INCLTDL)
+RLM_SQL_CFLAGS = @sql_mysql_cflags@
 RLM_SQL_LIBS   = @sql_mysql_ldflags@
 
 include ../rules.mak

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/Makefile.in b/src/modules/rlm_sql/drivers/rlm_sql_oracle/Makefile.in
index 000e0b3..b9b4bcf 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/Makefile.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/Makefile.in
@@ -2,7 +2,7 @@ include ../../../../../Make.inc
 
 TARGET         = @targetname@
 SRCS           = sql_oracle.c
-RLM_SQL_CFLAGS = @sql_oracle_cflags@ $(INCLTDL)
+RLM_SQL_CFLAGS = @sql_oracle_cflags@
 RLM_SQL_LIBS   = @sql_oracle_ldflags@
 
 include ../rules.mak

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in
index 55076a2..e564426 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in
@@ -2,7 +2,7 @@ include ../../../../../Make.inc
 
 TARGET         = @targetname@
 SRCS           = sql_postgresql.c
-RLM_SQL_CFLAGS = @postgresql_cflags@ $(INCLTDL)
+RLM_SQL_CFLAGS = @postgresql_cflags@
 RLM_SQL_LIBS   = @postgresql_ldflags@
 
 include ../rules.mak

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/Makefile.in b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/Makefile.in
index b534b63..8151a5b 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/Makefile.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/Makefile.in
@@ -2,7 +2,7 @@ include ../../../../../Make.inc
 
 TARGET         = @targetname@
 SRCS           = sql_sqlite.c
-RLM_SQL_CFLAGS = @sql_sqlite_cflags@ $(INCLTDL)
+RLM_SQL_CFLAGS = @sql_sqlite_cflags@
 RLM_SQL_LIBS   = @sql_sqlite_ldflags@
 
 include ../rules.mak

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sybase/Makefile b/src/modules/rlm_sql/drivers/rlm_sql_sybase/Makefile
index 02dc6b9..8dc15d3 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_sybase/Makefile
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sybase/Makefile
@@ -8,7 +8,7 @@ include ../../../../../Make.inc
 TARGET         =
 #TARGET         = rlm_sql_sybase
 SRCS           = sql_sybase.c
-RLM_SQL_CFLAGS =  $(INCLTDL)  -I/opt/sybase/OCS-12_0/include
+RLM_SQL_CFLAGS =   -I/opt/sybase/OCS-12_0/include
 RLM_SQL_LIBS   =  -L/opt/sybase/OCS-12_0/lib -ltcl -lcomn -lintl -lnsl -ldl -lm -lcs -lct
 
 include ../rules.mak

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/Makefile.in b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/Makefile.in
index 1a28477..55bd9bf 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/Makefile.in
+++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/Makefile.in
@@ -2,7 +2,7 @@ include ../../../../../Make.inc
 
 TARGET         = @targetname@
 SRCS           = sql_unixodbc.c
-RLM_SQL_CFLAGS = @sql_unixodbc_cflags@ $(INCLTDL)
+RLM_SQL_CFLAGS = @sql_unixodbc_cflags@
 RLM_SQL_LIBS   = @sql_unixodbc_ldflags@
 
 include ../rules.mak

diff --git a/src/modules/rlm_sqlhpwippool/Makefile.in b/src/modules/rlm_sqlhpwippool/Makefile.in
index 548e69a..2864865 100644 (file)
--- a/src/modules/rlm_sqlhpwippool/Makefile.in
+++ b/src/modules/rlm_sqlhpwippool/Makefile.in
@@ -1,7 +1,7 @@
 TARGET      = @targetname@
 SRCS        = rlm_sqlhpwippool.c
 HEADERS     =
-RLM_CFLAGS  = $(INCLTDL) @sqlhpwippool_cflags@ -I$(top_builddir)/src/modules/rlm_sql
+RLM_CFLAGS  = @sqlhpwippool_cflags@ -I$(top_builddir)/src/modules/rlm_sql
 RLM_LIBS    = $(LIBLTDL) @sqlhpwippool_ldflags@
 RLM_INSTALL =
 

diff --git a/src/modules/rlm_sqlippool/Makefile.in b/src/modules/rlm_sqlippool/Makefile.in
index 3114c16..af28710 100644 (file)
--- a/src/modules/rlm_sqlippool/Makefile.in
+++ b/src/modules/rlm_sqlippool/Makefile.in
@@ -7,7 +7,7 @@ INCLUDE += -I/usr/local/include/
 TARGET      = @targetname@
 SRCS        = rlm_sqlippool.c
 HEADERS     = $(top_builddir)/src/modules/rlm_sql/rlm_sql.h
-RLM_CFLAGS  = -I$(top_builddir)/src/modules/rlm_sql $(INCLTDL)
+RLM_CFLAGS  = -I$(top_builddir)/src/modules/rlm_sql
 RLM_LIBS    =
 RLM_INSTALL =