diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-09-23 12:43:38 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-09-23 12:43:38 +0000 |
commit | 916cc59d27c4dedbcafc51daf42beb8d1a371416 (patch) | |
tree | 2d7a13e6caf365bce09ba9e6404a804627dacbc5 | |
parent | 13d75a142b68a42f188232cff10402f5e15c1a7c (diff) | |
download | libextractor-916cc59d27c4dedbcafc51daf42beb8d1a371416.tar.gz libextractor-916cc59d27c4dedbcafc51daf42beb8d1a371416.zip |
-better dependency checks
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.ac | 45 | ||||
-rw-r--r-- | src/main/Makefile.am | 4 |
3 files changed, 44 insertions, 9 deletions
@@ -1,3 +1,7 @@ | |||
1 | Mon Sep 23 14:42:58 CEST 2013 | ||
2 | Required external installation of libltdl. | ||
3 | Check for presence of tidyNodeGetValue in libtidy. -CG | ||
4 | |||
1 | Wed Aug 21 18:42:04 CEST 2013 | 5 | Wed Aug 21 18:42:04 CEST 2013 |
2 | Updated Dutch translation. -CG | 6 | Updated Dutch translation. -CG |
3 | 7 | ||
diff --git a/configure.ac b/configure.ac index 43e6ab1..c753f74 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -34,10 +34,6 @@ AC_PROG_LIBTOOL | |||
34 | # need not have -ldl added | 34 | # need not have -ldl added |
35 | LIBSOLD=$LIBS | 35 | LIBSOLD=$LIBS |
36 | LT_INIT([disable-static dlopen win32-dll]) | 36 | LT_INIT([disable-static dlopen win32-dll]) |
37 | LT_CONFIG_LTDL_DIR([libltdl]) | ||
38 | LTDL_INIT | ||
39 | AC_SUBST(LTDLINCL) | ||
40 | AC_SUBST(LIBLTDL) | ||
41 | AC_SUBST(MKDIR_P) | 37 | AC_SUBST(MKDIR_P) |
42 | 38 | ||
43 | case "$target_os" in | 39 | case "$target_os" in |
@@ -231,6 +227,41 @@ fi]) | |||
231 | # Checks for libraries. | 227 | # Checks for libraries. |
232 | 228 | ||
233 | AC_CHECK_HEADERS(langinfo.h) | 229 | AC_CHECK_HEADERS(langinfo.h) |
230 | |||
231 | # Check for libltdl header (#2999) | ||
232 | ltdl=0 | ||
233 | AC_MSG_CHECKING(for libltdl) | ||
234 | AC_ARG_WITH(ltdl, | ||
235 | [ --with-ltdl=PFX base of libltdl installation], | ||
236 | [AC_MSG_RESULT([$with_ltdl]) | ||
237 | case $with_ltdl in | ||
238 | no) | ||
239 | ;; | ||
240 | yes) | ||
241 | AC_CHECK_HEADERS(ltdl.h, | ||
242 | AC_CHECK_LIB([ltdl], [lt_dlopenext], | ||
243 | ltdl=1)) | ||
244 | ;; | ||
245 | *) | ||
246 | LDFLAGS="-L$with_ltdl/lib $LDFLAGS" | ||
247 | CPPFLAGS="-I$with_ltdl/include $CPPFLAGS" | ||
248 | AC_CHECK_HEADERS(ltdl.h, | ||
249 | AC_CHECK_LIB([ltdl], [lt_dlopenext], | ||
250 | EXT_LIB_PATH="-L$with_ltdl/lib $EXT_LIB_PATH" | ||
251 | ltdl=1)) | ||
252 | ;; | ||
253 | esac | ||
254 | ], | ||
255 | [AC_MSG_RESULT([--with-ltdl not specified]) | ||
256 | AC_CHECK_HEADERS(ltdl.h, | ||
257 | AC_CHECK_LIB([ltdl], [lt_dlopenext], | ||
258 | ltdl=1))]) | ||
259 | if test "$ltdl" != 1 | ||
260 | then | ||
261 | AC_MSG_ERROR([libextractor requires libltdl (from GNU libtool), try installing libltdl-dev]) | ||
262 | fi | ||
263 | |||
264 | # restore LIBS | ||
234 | LIBS=$LIBSOLD | 265 | LIBS=$LIBSOLD |
235 | # FIXME: allow --with-oggvorbis=PFX | 266 | # FIXME: allow --with-oggvorbis=PFX |
236 | 267 | ||
@@ -363,16 +394,16 @@ AC_CHECK_LIB(magic, magic_open, | |||
363 | AM_CONDITIONAL(HAVE_MAGIC, false))], | 394 | AM_CONDITIONAL(HAVE_MAGIC, false))], |
364 | AM_CONDITIONAL(HAVE_MAGIC, false)) | 395 | AM_CONDITIONAL(HAVE_MAGIC, false)) |
365 | 396 | ||
366 | AC_MSG_CHECKING(for tidyInitSource in -ltidy) | 397 | AC_MSG_CHECKING(for tidyNodeGetValue -ltidy) |
367 | AC_LANG_PUSH(C++) | 398 | AC_LANG_PUSH(C++) |
368 | SAVED_LIBS=$LIBS | 399 | SAVED_LIBS=$LIBS |
369 | LIBS="$LIBS -ltidy" | 400 | LIBS="$LIBS -ltidy" |
370 | AC_LINK_IFELSE( | 401 | AC_LINK_IFELSE( |
371 | [AC_LANG_PROGRAM([[#include <tidy/tidy.h>]], | 402 | [AC_LANG_PROGRAM([[#include <tidy/tidy.h>]], |
372 | [[ Bool b = tidyInitSource (NULL, NULL, NULL, NULL, NULL); ]])], | 403 | [[ Bool b = tidyNodeGetValue (NULL, NULL, NULL); ]])], |
373 | [AC_MSG_RESULT(yes) | 404 | [AC_MSG_RESULT(yes) |
374 | AM_CONDITIONAL(HAVE_TIDY, true) | 405 | AM_CONDITIONAL(HAVE_TIDY, true) |
375 | AC_DEFINE(HAVE_TIDY,1,[Have tidyInitSource in libtidy])], | 406 | AC_DEFINE(HAVE_TIDY,1,[Have tidyNodeGetValue in libtidy])], |
376 | [AC_MSG_RESULT(no) | 407 | [AC_MSG_RESULT(no) |
377 | AM_CONDITIONAL(HAVE_TIDY, false)]) | 408 | AM_CONDITIONAL(HAVE_TIDY, false)]) |
378 | LIBS=$SAVED_LIBS | 409 | LIBS=$SAVED_LIBS |
diff --git a/src/main/Makefile.am b/src/main/Makefile.am index 51ceb10..cff991b 100644 --- a/src/main/Makefile.am +++ b/src/main/Makefile.am | |||
@@ -1,6 +1,6 @@ | |||
1 | SUBDIRS = . | 1 | SUBDIRS = . |
2 | 2 | ||
3 | INCLUDES = -I$(top_srcdir)/src/include $(LTDLINCL) | 3 | INCLUDES = -I$(top_srcdir)/src/include |
4 | 4 | ||
5 | LIBS = \ | 5 | LIBS = \ |
6 | @LE_LIBINTL@ @LE_LIB_LIBS@ | 6 | @LE_LIBINTL@ @LE_LIB_LIBS@ |
@@ -59,7 +59,7 @@ libextractor_la_SOURCES = \ | |||
59 | libextractor_la_LDFLAGS = \ | 59 | libextractor_la_LDFLAGS = \ |
60 | $(LE_LIB_LDFLAGS) -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@ | 60 | $(LE_LIB_LDFLAGS) -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@ |
61 | libextractor_la_LIBADD = \ | 61 | libextractor_la_LIBADD = \ |
62 | $(LIBLTDL) $(zlib) $(bz2lib) $(LTLIBICONV) $(XLIB) $(LE_LIBINTL) | 62 | -lltdl $(zlib) $(bz2lib) $(LTLIBICONV) $(XLIB) $(LE_LIBINTL) |
63 | 63 | ||
64 | extract_SOURCES = \ | 64 | extract_SOURCES = \ |
65 | extract.c \ | 65 | extract.c \ |