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

[gnunet]

Author: grothoff
Date: 2010-05-27 10:52:23 +0200 (Thu, 27 May 2010)
New Revision: 11530

Modified:
   Extractor/configure.ac
   Extractor/doc/version.texi
   Extractor/src/main/extractor.c
Log:
better ltdl.h check

Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2010-05-27 08:33:22 UTC (rev 11529)
+++ Extractor/configure.ac      2010-05-27 08:52:23 UTC (rev 11530)
@@ -277,7 +277,8 @@
 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

Modified: Extractor/doc/version.texi
===================================================================
--- Extractor/doc/version.texi  2010-05-27 08:33:22 UTC (rev 11529)
+++ Extractor/doc/version.texi  2010-05-27 08:52:23 UTC (rev 11530)
@@ -1,4 +1,4 @@
address@hidden UPDATED 29 March 2010
address@hidden UPDATED-MONTH March 2010
address@hidden UPDATED 17 May 2010
address@hidden UPDATED-MONTH May 2010
 @set EDITION 0.6.1
 @set VERSION 0.6.1

Modified: Extractor/src/main/extractor.c
===================================================================
--- Extractor/src/main/extractor.c      2010-05-27 08:33:22 UTC (rev 11529)
+++ Extractor/src/main/extractor.c      2010-05-27 08:52:23 UTC (rev 11530)
@@ -28,8 +28,18 @@
 #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
+
+
+
 /**
  * How many bytes do we actually try to scan? (from the beginning
  * of the file).  Limit to 32 MB.
@@ -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