From: Alan T. DeKok Date: Tue, 19 Feb 2013 18:13:09 +0000 (-0500) Subject: Removed unused definitions for LTDL X-Git-Tag: release_3_0_0_beta1~1029 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdffcaf02f729f575d11849b23cd95fa85b68f5b;p=thirdparty%2Ffreeradius-server.git Removed unused definitions for LTDL --- diff --git a/Make.inc.in b/Make.inc.in index 92a86055657..c3c9f8902cf 100644 --- a/Make.inc.in +++ b/Make.inc.in @@ -61,10 +61,6 @@ SBINDIR = ${sbindir} RADIR = ${radacctdir} LIBRADIUS = $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la -LIBLTDL = @LIBLTDL@ -INCLTDL = @INCLTDL@ -CFLAGS += $(INCLTDL) - #USE_SHARED_LIBS = @USE_SHARED_LIBS@ #USE_STATIC_LIBS = @USE_STATIC_LIBS@ @@ -78,12 +74,6 @@ CFLAGS += $(OPENSSL_INCLUDE) LIBREADLINE = @LIBREADLINE@ -# -# SQL driver defines -# -SQL_ODBC_LIBS = @ODBC_LIBS@ -SQL_ODBC_INCLUDE = @ODBC_INCLUDE@ - # # Version to use for packaging and other Make related things # diff --git a/src/main/Makefile.in b/src/main/Makefile.in index ac4890bfefc..a7032f5995c 100644 --- a/src/main/Makefile.in +++ b/src/main/Makefile.in @@ -65,7 +65,7 @@ radiusd$(EXEEXT): $(SERVER_OBJS) $(MODULE_OBJS) $(LIBRADIUS) $(LIBTOOL) --quiet --mode=link $(CC) -export-dynamic \ $(LDFLAGS) $(LINK_MODE) -o $@ $(SERVER_OBJS) \ $(MODULE_LIBS) $(LIBRADIUS) $(LIBS) $(SNMP_LIBS) \ - $(LCRYPT) $(PTHREADLIB) $(LIBLTDL) $(OPENSSL_LIBS) + $(LCRYPT) $(PTHREADLIB) $(OPENSSL_LIBS) radiusd.lo: radiusd.c ../include/modules.h ../include/modcall.h ../include/modpriv.h diff --git a/src/modules/rlm_eap/Makefile.in b/src/modules/rlm_eap/Makefile.in index 5ea4ad5f931..d3f108ab1b4 100644 --- a/src/modules/rlm_eap/Makefile.in +++ b/src/modules/rlm_eap/Makefile.in @@ -7,7 +7,7 @@ SRCS = rlm_eap.c eap.c mem.c HEADERS = eap.h rlm_eap.h RLM_CFLAGS = -Ilibeap CLIENTLIBS = libeap/$(LIBPREFIX)freeradius-eap.la $(LIBRADIUS) -RLM_LIBS = libeap/$(LIBPREFIX)freeradius-eap.la $(LIBLTDL) +RLM_LIBS = libeap/$(LIBPREFIX)freeradius-eap.la RLM_INSTALL = install-subdirs RLM_SUBDIRS = libeap @eaptypes@ RLM_UTILS = diff --git a/src/modules/rlm_sql/Makefile.in b/src/modules/rlm_sql/Makefile.in index c716f02341a..1fc41b539e4 100644 --- a/src/modules/rlm_sql/Makefile.in +++ b/src/modules/rlm_sql/Makefile.in @@ -7,7 +7,7 @@ SRCS = rlm_sql.c sql.c HEADERS = rlm_sql.h conf.h RLM_INSTALL = install-drivers RLM_CFLAGS = -I$(top_builddir)/src/modules/rlm_sql -RLM_LIBS = $(LIBLTDL) +RLM_LIBS = RLM_SUBDIRS = drivers # diff --git a/src/modules/rlm_sqlhpwippool/Makefile.in b/src/modules/rlm_sqlhpwippool/Makefile.in index 286486575e9..75c39ab99ec 100644 --- a/src/modules/rlm_sqlhpwippool/Makefile.in +++ b/src/modules/rlm_sqlhpwippool/Makefile.in @@ -2,7 +2,7 @@ TARGET = @targetname@ SRCS = rlm_sqlhpwippool.c HEADERS = RLM_CFLAGS = @sqlhpwippool_cflags@ -I$(top_builddir)/src/modules/rlm_sql -RLM_LIBS = $(LIBLTDL) @sqlhpwippool_ldflags@ +RLM_LIBS = @sqlhpwippool_ldflags@ RLM_INSTALL = include ../rules.mak