[xmlsec] fix minor issues with ltdl separation (from Roument)



commit b2065975b23cb1402f2d993f6837ae5129af071c
Author: Aleksey Sanin <aleksey aleksey com>
Date:   Sat Nov 28 17:57:48 2009 -0800

    fix minor issues with ltdl separation (from Roument)

 configure.in    |   16 ++++++++++------
 src/Makefile.am |    1 +
 2 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/configure.in b/configure.in
index fd9ea75..99c2820 100644
--- a/configure.in
+++ b/configure.in
@@ -1245,18 +1245,22 @@ else
 	[
 	XMLSEC_DEFINES="$XMLSEC_DEFINES -DXMLSEC_DL_LIBLTDL=1",
 	AC_CHECK_LIB(
-	    [ltdl], 
+	    [ltdl],
 	    [lt_dlopenext],
-	    [LIBLTDL=-lltdl], 
+	    [LIBLTDL=-lltdl],
 	    [LIBLTDL=]
 	)],
 	[LIBLTDL=]
     )
 
-    XMLSEC_DL_INCLUDES="$INCLTDL"
-    XMLSEC_DL_LIBS="$LIBLTDL"
-    XMLSEC_NO_CRYPTO_DYNAMIC_LOADING="0"
-    AC_MSG_RESULT(yes)
+    if test "z$LIBLTDL" != "z" ; then
+        XMLSEC_DL_INCLUDES="$INCLTDL"
+        XMLSEC_DL_LIBS="$LIBLTDL"
+        XMLSEC_NO_CRYPTO_DYNAMIC_LOADING="0"
+	AC_MSG_RESULT(yes)
+    else
+	AC_MSG_ERROR([libltdl is required for xmlsec-crypto dynamic loading])
+    fi
 fi
 AM_CONDITIONAL(XMLSEC_NO_CRYPTO_DYNAMIC_LOADING, test "z$XMLSEC_NO_CRYPTO_DYNAMIC_LOADING" = "z1")
 AC_SUBST(XMLSEC_NO_CRYPTO_DYNAMIC_LOADING)
diff --git a/src/Makefile.am b/src/Makefile.am
index 7472625..e28bb5e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,6 +7,7 @@ INCLUDES = \
 	-I../include \
 	-I$(top_srcdir)/include \
 	$(XMLSEC_DEFINES) \
+	$(XMLSEC_DL_INCLUDES) \
 	$(LIBXSLT_CFLAGS) \
 	$(LIBXML_CFLAGS) \
 	$(NULL)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]