Fixes to make FR use the local libltld

This helps to avoid stupid libtool issues

diff --git a/configure b/configure
index a60da7d3f4dae58cec7a95310bfbce9f7837c640..941b22a7a363cf84815935bd3712c6d13f181f3d 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 5f4936c8ee48d816a86e3927d5b9bac422f9570a..18a97ae2bb4c067bad1db74afbcd813c8450c2ec 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=
 enable_ltdl_install=no
 ],

diff --git a/src/include/modpriv.h b/src/include/modpriv.h
index b00d3ad8dec78a4dbe7b27f16a690cc25d9dcb6e..cf27616dfd5089dbb4d921a44a4ebc3d848095c2 100644 (file)
--- a/src/include/modpriv.h
+++ b/src/include/modpriv.h
@@ -16,7 +16,11 @@
 #endif
 
 #ifndef WITHOUT_LIBLTDL
+#ifdef WITH_SYSTEM_LTDL
 #include "ltdl.h"
+#else
+#include "libltdl/ltdl.h"
+#endif
 #endif
 
 #ifdef __cplusplus