[GNUnet-SVN] r29491 - in Extractor: . src/main

[gnunet]

Author: grothoff
Date: 2013-09-23 14:43:38 +0200 (Mon, 23 Sep 2013)
New Revision: 29491

Modified:
   Extractor/ChangeLog
   Extractor/configure.ac
   Extractor/src/main/Makefile.am
Log:
-better dependency checks

Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2013-09-23 12:43:04 UTC (rev 29490)
+++ Extractor/ChangeLog 2013-09-23 12:43:38 UTC (rev 29491)
@@ -1,3 +1,7 @@
+Mon Sep 23 14:42:58 CEST 2013
+       Required external installation of libltdl.
+       Check for presence of tidyNodeGetValue in libtidy. -CG
+
 Wed Aug 21 18:42:04 CEST 2013
        Updated Dutch translation. -CG
 

Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2013-09-23 12:43:04 UTC (rev 29490)
+++ Extractor/configure.ac      2013-09-23 12:43:38 UTC (rev 29491)
@@ -34,10 +34,6 @@
 # need not have -ldl added
 LIBSOLD=$LIBS
 LT_INIT([disable-static dlopen win32-dll])
-LT_CONFIG_LTDL_DIR([libltdl])
-LTDL_INIT
-AC_SUBST(LTDLINCL)
-AC_SUBST(LIBLTDL)
 AC_SUBST(MKDIR_P)
 
 case "$target_os" in
@@ -231,6 +227,41 @@
 # Checks for libraries.
 
 AC_CHECK_HEADERS(langinfo.h)
+
+# Check for libltdl header (#2999)
+ltdl=0
+AC_MSG_CHECKING(for libltdl)
+AC_ARG_WITH(ltdl,
+   [  --with-ltdl=PFX    base of libltdl installation],
+   [AC_MSG_RESULT([$with_ltdl])
+    case $with_ltdl in
+      no)
+        ;;
+      yes)
+        AC_CHECK_HEADERS(ltdl.h,
+          AC_CHECK_LIB([ltdl], [lt_dlopenext],
+            ltdl=1))
+        ;;
+      *)
+        LDFLAGS="-L$with_ltdl/lib $LDFLAGS"
+        CPPFLAGS="-I$with_ltdl/include $CPPFLAGS"
+        AC_CHECK_HEADERS(ltdl.h,
+          AC_CHECK_LIB([ltdl], [lt_dlopenext],
+            EXT_LIB_PATH="-L$with_ltdl/lib $EXT_LIB_PATH"
+            ltdl=1))
+        ;;
+    esac
+   ],
+   [AC_MSG_RESULT([--with-ltdl not specified])
+    AC_CHECK_HEADERS(ltdl.h,
+     AC_CHECK_LIB([ltdl], [lt_dlopenext],
+      ltdl=1))])
+if test "$ltdl" != 1
+then
+ AC_MSG_ERROR([libextractor requires libltdl (from GNU libtool), try 
installing libltdl-dev])
+fi
+
+# restore LIBS
 LIBS=$LIBSOLD
 # FIXME: allow --with-oggvorbis=PFX
 
@@ -363,16 +394,16 @@
    AM_CONDITIONAL(HAVE_MAGIC, false))],
   AM_CONDITIONAL(HAVE_MAGIC, false))
 
-AC_MSG_CHECKING(for tidyInitSource in -ltidy)
+AC_MSG_CHECKING(for tidyNodeGetValue -ltidy)
 AC_LANG_PUSH(C++)
 SAVED_LIBS=$LIBS
 LIBS="$LIBS -ltidy"
 AC_LINK_IFELSE(
   [AC_LANG_PROGRAM([[#include <tidy/tidy.h>]],
-    [[ Bool b = tidyInitSource (NULL, NULL, NULL, NULL, NULL); ]])],
+    [[ Bool b = tidyNodeGetValue (NULL, NULL, NULL); ]])],
   [AC_MSG_RESULT(yes)
    AM_CONDITIONAL(HAVE_TIDY, true)
-   AC_DEFINE(HAVE_TIDY,1,[Have tidyInitSource in libtidy])],
+   AC_DEFINE(HAVE_TIDY,1,[Have tidyNodeGetValue in libtidy])],
   [AC_MSG_RESULT(no)
    AM_CONDITIONAL(HAVE_TIDY, false)])
 LIBS=$SAVED_LIBS

Modified: Extractor/src/main/Makefile.am
===================================================================
--- Extractor/src/main/Makefile.am      2013-09-23 12:43:04 UTC (rev 29490)
+++ Extractor/src/main/Makefile.am      2013-09-23 12:43:38 UTC (rev 29491)
@@ -1,6 +1,6 @@
 SUBDIRS  = .
 
-INCLUDES = -I$(top_srcdir)/src/include $(LTDLINCL)
+INCLUDES = -I$(top_srcdir)/src/include 
 
 LIBS = \
  @LE_LIBINTL@ @LE_LIB_LIBS@
@@ -59,7 +59,7 @@
 libextractor_la_LDFLAGS = \
   $(LE_LIB_LDFLAGS) -version-info 
@LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@
 libextractor_la_LIBADD = \
-  $(LIBLTDL) $(zlib) $(bz2lib) $(LTLIBICONV) $(XLIB) $(LE_LIBINTL)
+  -lltdl $(zlib) $(bz2lib) $(LTLIBICONV) $(XLIB) $(LE_LIBINTL)
 
 extract_SOURCES = \
   extract.c \