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 854badede61d46a7aaf246783b9184306b2501c9..8aefaca7043d20adb8f83be1f4e759d6ec06f243 100644 (file)
--- 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 f5257f4e3b0d57d95047e40510352a5f58f1ed6a..5316a5e76f7d64a9d3a480c84638d83983aa7b86 100755 (executable)
--- 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 62b0de81a023598f377091c795839e30ff0b7bf7..7172642deb9b1951aa9ecfe19b6a2eb7c28acc55 100644 (file)
--- 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 674d4ed7d43f357ab137a18a03e7967b16016f54..5cbaaab96dcf53355cb2e8e9c8c9975c643002cf 100644 (file)
--- 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