From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 10 Oct 2011 18:16:01 +0000 (+0200)
Subject: Fixes to make FR use the local libltld
X-Git-Tag: release_3_0_0_beta0~603
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cc2e0ca425dacb2ebd4fb8b102fbd4836b3162c;p=thirdparty%2Ffreeradius-server.git

Fixes to make FR use the local libltld

This helps to avoid stupid libtool issues
---

diff --git a/configure b/configure
index a60da7d3f4d..941b22a7a36 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 5f4936c8ee4..18a97ae2bb4 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=
 enable_ltdl_install=no
 ],
diff --git a/src/include/modpriv.h b/src/include/modpriv.h
index b00d3ad8dec..cf27616dfd5 100644
--- 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