libextractor

commit d881cabc2f55f3fe42170a90bffcc9493343068b
parent a2a49db6a27662716da9af7965ddf8baee9c3616
Author: Christian Grothoff <christian@grothoff.org>
Date:   Thu, 27 May 2010 08:52:23 +0000

better ltdl.h check

Diffstat:
M
configure.ac
 | 
3
++-
M
doc/version.texi
 | 
4
++--
M
src/main/extractor.c
 | 
25
++++++++++---------------

3 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -277,7 +277,8 @@ fi
 AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_STDBOOL
-AC_CHECK_HEADERS([ltdl.h iconv.h fcntl.h netinet/in.h stdlib.h string.h unistd.h libintl.h limits.h stddef.h zlib.h])
+AC_CHECK_HEADERS([iconv.h fcntl.h netinet/in.h stdlib.h string.h unistd.h libintl.h limits.h stddef.h zlib.h])
+AC_CHECK_HEADERS([ltdl.h],,AC_MSG_ERROR([Compiling GNU libextractor requires installed libltdl library (part of GNU libtool)]))
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
diff --git a/doc/version.texi b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 29 March 2010
-@set UPDATED-MONTH March 2010
+@set UPDATED 17 May 2010
+@set UPDATED-MONTH May 2010
 @set EDITION 0.6.1
 @set VERSION 0.6.1
diff --git a/src/main/extractor.c b/src/main/extractor.c
@@ -28,6 +28,16 @@
 #include <sys/shm.h>
 #endif
 #include <signal.h>
+#include <ltdl.h>
+
+#if HAVE_LIBBZ2
+#include <bzlib.h>
+#endif
+
+#if HAVE_ZLIB
+#include <zlib.h>
+#endif
+
 
 
 /**
@@ -54,21 +64,6 @@
 #define DEBUG 1
 
 
-#if HAVE_LTDL_H
-#include <ltdl.h>
-#else
-#include <../../libltdl/ltdl.h>
-#endif
-
-#if HAVE_LIBBZ2
-#include <bzlib.h>
-#endif
-
-#if HAVE_ZLIB
-#include <zlib.h>
-#endif
-
-
 /**
  * Linked list of extractor plugins.  An application builds this list
  * by telling libextractor to load various keyword-extraction