From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 4 Nov 2011 14:18:57 +0000 (+0100)
Subject: What appears to be the definitive fix to libltl nonsense
X-Git-Tag: release_2_2_0~270
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce27f4e96e051c11be818d5f7bb665fdaea3432f;p=thirdparty%2Ffreeradius-server.git

What appears to be the definitive fix to libltl nonsense

FORCE the compiler to use out libltdl, rather than the system
one.  This gets rid of the _lt__PROGRAM__LTX_preloaded_symbols
nonsense.
---

diff --git a/Make.inc.in b/Make.inc.in
index 854badede61..8aefaca7043 100644
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -28,7 +28,7 @@ datarootdir	= @datarootdir@
 MAKE		= @MAKE@
 CC		= @CC@
 RANLIB		= @RANLIB@
-INCLUDE		=
+INCLUDE		= -I${top_srcdir} -I${top_srcdir}/src
 CFLAGS		= $(INCLUDE) @CFLAGS@
 CPPFLAGS	= @CPPFLAGS@
 LIBPREFIX	= @LIBPREFIX@
diff --git a/configure b/configure
index f5257f4e3b0..5316a5e76f7 100755
--- a/configure
+++ b/configure
@@ -4796,7 +4796,7 @@ fi
 if test "${with_system_libltdl+set}" = set; then
   withval=$with_system_libltdl;
 LIBLTDL="-lltdl"
-INCLTDL=
+INCLTDL=-DWITH_SYSTEM_LTDL
 LTDL_SUBDIRS=
 
 else
diff --git a/configure.in b/configure.in
index 62b0de81a02..7172642deb9 100644
--- a/configure.in
+++ b/configure.in
@@ -83,7 +83,7 @@ AC_ARG_WITH(system-libltdl,
 [  --with-system-libltdl   Use the libltdl installed in your system (default=use our own)],
 [
 LIBLTDL="-lltdl"
-INCLTDL=
+INCLTDL=-DWITH_SYSTEM_LTDL
 LTDL_SUBDIRS=
 ],
 [
diff --git a/src/include/modpriv.h b/src/include/modpriv.h
index 674d4ed7d43..5cbaaab96dc 100644
--- a/src/include/modpriv.h
+++ b/src/include/modpriv.h
@@ -9,7 +9,11 @@
 #include <freeradius-devel/modules.h>
 
 #ifndef WITHOUT_LIBLTDL
-#include "ltdl.h"
+#ifdef WITH_SYSTEM_LTDL
+#include <ltdl.h>
+#else
+#include "libltdl/ltdl.h"
+#endif
 #endif
 
 #ifdef __cplusplus