Final fix for system libltdl (or not)

diff --git a/src/include/modpriv.h b/src/include/modpriv.h
index cf27616dfd5089dbb4d921a44a4ebc3d848095c2..6850730716c576476328ac0afc225113e3387ca4 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 5ee926db75db0fffc4448455de673b2177e4c7e4..b82ff8fdc2e1eb5807aced3a0485c07642cb816f 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 199cff2dc1c11d13275fb72850a63f65b4e18c44..5ea4ad5f9312caa53822ba1c25c418878f96dc81 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 f766537e6718ff38c7fad3971668a41f3a989e3f..0faf33b63ceadad1dfdc3df1e414a2ee03f329c5 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 5a5704371fdd3b5061d3e98d788aaf6ed0a3e576..d74a4ea1bd434e75d1e16d66e6ac8e4e0119b147 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 3dbf25e913a496ce4d9337f82e7370b7e287430c..43eecaea221e245b1a3235ac39cad3b4f18d0d5e 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 5231e6195f4ad92c46c7815523322c8f1460ae4d..b7f60306e1c36c0b3ce817d493c74c1c59a3bc10 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 bd3463da4209838d30d6b5890ae8e3dbfdc0a4a7..4d4b72f4838059c2c0a58e40db3a704e95be8b99 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 cb5a10920ca05a32af939ae4c3f257fcc7e1bbc9..c890d41dfa8ff36eb810a1f78e3af5f25c5b591c 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 685cc3a0f3b93074075f8b1af63527e9ac3bc6c6..b30947fc0e45ff1f2aaa2d19462f29db81bddc12 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 3a76a1b21e15d670b1d25ff348456a4960f3d94b..41240eaa7d80c59541e166944c0cae704ef8baab 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 a53d27717013b14d1b20913d3590ff39b773cf62..c09443ef90560e12d571ed9a50c93a934ec1d793 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 8187fba40bfd3a142dcf8462cfa4b6ad13ded994..d76a72cf846eab1a4090f58f828c2c81a56b11d9 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 4ad2b76acd60710996dab3b329d7d1077b523241..505b3bb810e24a03bfd5ae4ff5464f1784e3c9b6 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 3a4509c5f7b11fa09dd55da2d32a1db2f6a29309..6e5b4d4796eac61a8652441fc34038d541af7acd 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 5ab0ab18a3d2b1b83c48c58b028fdded067cf2b0..c716f02341a1a67a26a38c3bfa5532cd15d4dfd1 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 7342f100e8042023c34f107266a7c5fd80289b1a..5d3d1e63021079e16fce6b845330996602121d6e 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 624ab45d58177ce26b2aa302164c4920929bc487..aac77afd8558baa56c6ea0a15609726b115f1c73 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 8c080889827c3e5e5813f19a6fd6cdc7e0f7336e..64af56d3ff69fac27ac887e8abb215bcfbe6199d 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 9152bf0fbb7dba39845362fce0a485e900bb841d..a17bb3da3fc30746cbbfc99c144e5793177835fa 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 000e0b39e8b40b41862ba3d5312c09415c162973..b9b4bcf3688b43f93771465397cebb0a764ff0b2 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 55076a2220b7aa24f724d97da942415af59baede..e56442609e692f3592d58f10b53a0d69b0c1b9c8 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 b534b63dc3d7052d7272a3244ec067f74da70d76..8151a5bb14cfcde8d0e1c54a9406789cc7f20089 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 02dc6b99657211871da51df561662f0b6787eecf..8dc15d3ae92f2764058c251ca813813d5939aba8 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 1a28477f94e0fc564361a3c076f87697f741ac55..55bd9bfeffcf1f021796aac80a99e5ccadfa2bc2 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 548e69ae00211e86e907074deb2255b6d9df5b26..286486575e915b24766e0e25b6f921f23f399bb0 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 3114c16573d5a171751b21920f42e1286115a171..af28710f09ff162000a5142f96faa471c83aa005 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 =