From 878bcdff8bfb245fe889b56e98159b3885444b3e Mon Sep 17 00:00:00 2001
From: Thomas Ries <tries@gmx.net>
Date: Sat, 19 Jun 2010 20:39:11 +0000
Subject: [PATCH] - fix: include correct ltdl.h for system & convenience
 libltdl

---
 ChangeLog       | 1 +
 src/Makefile.am | 6 +++++-
 src/plugins.h   | 9 +++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 35abb49..a8c0aa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 0.8.1
 =====
+  19-Jun-2010:  - fix: include correct ltdl.h for system & convenience libltdl
   26-Apr-2010:  - Clean building from distribuion TAR did fail if the host
                   installed libltdl lib was used (and not the convenience lib)
   29-Mar-2010:  - fix: siproxd could crash when trying to rewrite a malformed
diff --git a/src/Makefile.am b/src/Makefile.am
index 356091e..cf814fc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,11 @@
 #
 
 
-AM_CFLAGS = -Wall -D_GNU_SOURCE \
+if use_convenience_ltdl
+   LTDLDEF = -DLTDL_CONVLIB
+endif
+
+AM_CFLAGS = -Wall -D_GNU_SOURCE $(LTDLDEF) \
             -DBUILDSTR="\"`cat .buildno`\""
 
 #
diff --git a/src/plugins.h b/src/plugins.h
index cd9cfaa..9be381a 100644
--- a/src/plugins.h
+++ b/src/plugins.h
@@ -20,8 +20,13 @@
 
 /* $Id$ */
 
-/* fetch local version of ltdl */
-#include "../libltdl/ltdl.h"
+#ifdef LTDL_CONVLIB
+   /* fetch local version of ltdl */
+   #include "../libltdl/ltdl.h"
+#else
+   /* fetch system version of libltdl */
+   #include <ltdl.h>
+#endif
 
 
 /* Plugins must return STS_SUCCESS / SUCCESS_FAILURE */