diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-05-30 18:35:02 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-05-30 18:35:02 +0000 |
commit | 93fba12ad8159dc6b683f9e7ce9f0528a11047f5 (patch) | |
tree | 73b1bd212c6c5a32adb924d208d8a315b606e854 /configure.ac | |
parent | cfd880578bd21f9adedba557291c903d325e93cd (diff) | |
download | gnunet-93fba12ad8159dc6b683f9e7ce9f0528a11047f5.tar.gz gnunet-93fba12ad8159dc6b683f9e7ce9f0528a11047f5.zip |
make libextractor actually optional, both for GNUnet and GNUnet-taler builds
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 039652b78..ebbb69465 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -557,11 +557,6 @@ AC_ARG_ENABLE([taler-wallet], | |||
557 | AC_MSG_RESULT($taler_only) | 557 | AC_MSG_RESULT($taler_only) |
558 | AM_CONDITIONAL([TALER_ONLY], [test "x$taler_only" = "xyes"]) | 558 | AM_CONDITIONAL([TALER_ONLY], [test "x$taler_only" = "xyes"]) |
559 | 559 | ||
560 | if test "$taler_only" != yes | ||
561 | then | ||
562 | |||
563 | |||
564 | |||
565 | # test for libextractor | 560 | # test for libextractor |
566 | extractor=0 | 561 | extractor=0 |
567 | AC_MSG_CHECKING(for libextractor) | 562 | AC_MSG_CHECKING(for libextractor) |
@@ -590,14 +585,22 @@ AC_ARG_WITH(extractor, | |||
590 | AC_CHECK_HEADERS(extractor.h, | 585 | AC_CHECK_HEADERS(extractor.h, |
591 | AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults], | 586 | AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults], |
592 | extractor=1))]) | 587 | extractor=1))]) |
588 | # restore LIBS | ||
589 | LIBS=$SAVE_LIBS | ||
590 | |||
593 | if test "$extractor" != 1 | 591 | if test "$extractor" != 1 |
594 | then | 592 | then |
595 | AC_MSG_ERROR([GNUnet requires libextractor]) | 593 | AM_CONDITIONAL(HAVE_LIBEXTRACTOR, false) |
594 | AC_DEFINE([HAVE_LIBEXTRACTOR],[0],[Lacking libextractor]) | ||
595 | else | ||
596 | AM_CONDITIONAL(HAVE_LIBEXTRACTOR, true) | ||
597 | AC_DEFINE([HAVE_LIBEXTRACTOR],[1],[Have libextractor]) | ||
596 | fi | 598 | fi |
597 | # restore LIBS | ||
598 | LIBS=$SAVE_LIBS | ||
599 | 599 | ||
600 | 600 | ||
601 | if test "$taler_only" != yes | ||
602 | then | ||
603 | |||
601 | # Check for libltdl header (#2999) | 604 | # Check for libltdl header (#2999) |
602 | ltdl=0 | 605 | ltdl=0 |
603 | AC_MSG_CHECKING(for libltdl) | 606 | AC_MSG_CHECKING(for libltdl) |
@@ -1674,6 +1677,10 @@ then | |||
1674 | fi | 1677 | fi |
1675 | fi | 1678 | fi |
1676 | 1679 | ||
1680 | if test "$extractor" != 1 | ||
1681 | then | ||
1682 | AC_MSG_WARN([NOTICE: libextractor not found, but various file-sharing functions require it]) | ||
1683 | fi | ||
1677 | 1684 | ||
1678 | AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite, Postgres: $postgres]) | 1685 | AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: $sqlite, Postgres: $postgres]) |
1679 | 1686 | ||