diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-11-21 00:26:16 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-11-21 00:26:16 +0100 |
commit | ae68c8145575866c1ffb4c859f48e44054d1d59f (patch) | |
tree | 21fc46f3877148af651d0fb778c04ede389a1591 /configure.ac | |
parent | 1816097b7a4dca73a163b89c243ebf855e371ae5 (diff) | |
download | gnunet-ae68c8145575866c1ffb4c859f48e44054d1d59f.tar.gz gnunet-ae68c8145575866c1ffb4c859f48e44054d1d59f.zip |
fixing #5439
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index d09bd7c30..82329ef45 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -607,8 +607,8 @@ PKG_CHECK_MODULES([GLIB], [glib-2.0], | |||
607 | pbc=0 | 607 | pbc=0 |
608 | AC_CHECK_HEADER([pbc/pbc.h],pbc=1) | 608 | AC_CHECK_HEADER([pbc/pbc.h],pbc=1) |
609 | AC_CHECK_HEADER([gabe.h],abe=1) | 609 | AC_CHECK_HEADER([gabe.h],abe=1) |
610 | AM_CONDITIONAL(HAVE_PBC, [test "$pbc" = 1]) | 610 | AM_CONDITIONAL(HAVE_PBC, [test "x$pbc" = x1]) |
611 | AM_CONDITIONAL(HAVE_ABE, [test "$abe" = 1]) | 611 | AM_CONDITIONAL(HAVE_ABE, [test "x$abe" = x1]) |
612 | if test "x$pbc" = x1 | 612 | if test "x$pbc" = x1 |
613 | then | 613 | then |
614 | AC_DEFINE([HAVE_PBC],[1],[Have pbc library]) | 614 | AC_DEFINE([HAVE_PBC],[1],[Have pbc library]) |
@@ -623,8 +623,8 @@ else | |||
623 | fi | 623 | fi |
624 | , | 624 | , |
625 | # glib-2 not found | 625 | # glib-2 not found |
626 | AM_CONDITIONAL(HAVE_PBC, [0]) | 626 | AM_CONDITIONAL(HAVE_PBC, [false]) |
627 | AM_CONDITIONAL(HAVE_ABE, [0]) | 627 | AM_CONDITIONAL(HAVE_ABE, [false]) |
628 | AC_DEFINE([HAVE_PBC],[0],[Lacking glib library]) | 628 | AC_DEFINE([HAVE_PBC],[0],[Lacking glib library]) |
629 | ) | 629 | ) |
630 | 630 | ||
@@ -778,14 +778,14 @@ AC_ARG_WITH(extractor, | |||
778 | no) | 778 | no) |
779 | ;; | 779 | ;; |
780 | yes) | 780 | yes) |
781 | AC_CHECK_HEADERS(extractor.h, | 781 | AC_CHECK_HEADERS([extractor.h], |
782 | AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults], | 782 | AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults], |
783 | extractor=1)) | 783 | extractor=1)) |
784 | ;; | 784 | ;; |
785 | *) | 785 | *) |
786 | LDFLAGS="-L$with_extractor/lib $LDFLAGS" | 786 | LDFLAGS="-L$with_extractor/lib $LDFLAGS" |
787 | CPPFLAGS="-I$with_extractor/include $CPPFLAGS" | 787 | CPPFLAGS="-I$with_extractor/include $CPPFLAGS" |
788 | AC_CHECK_HEADERS(extractor.h, | 788 | AC_CHECK_HEADERS([extractor.h], |
789 | AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults], | 789 | AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults], |
790 | EXT_LIB_PATH="-L$with_extractor/lib $EXT_LIB_PATH" | 790 | EXT_LIB_PATH="-L$with_extractor/lib $EXT_LIB_PATH" |
791 | extractor=1)) | 791 | extractor=1)) |
@@ -793,7 +793,7 @@ AC_ARG_WITH(extractor, | |||
793 | esac | 793 | esac |
794 | ], | 794 | ], |
795 | [AC_MSG_RESULT([--with-extractor not specified]) | 795 | [AC_MSG_RESULT([--with-extractor not specified]) |
796 | AC_CHECK_HEADERS(extractor.h, | 796 | AC_CHECK_HEADERS([extractor.h], |
797 | AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults], | 797 | AC_CHECK_LIB([extractor], [EXTRACTOR_plugin_add_defaults], |
798 | extractor=1))]) | 798 | extractor=1))]) |
799 | # restore LIBS | 799 | # restore LIBS |
@@ -1164,7 +1164,7 @@ then | |||
1164 | fi | 1164 | fi |
1165 | fi | 1165 | fi |
1166 | AM_CONDITIONAL(HAVE_MYSQL, test x$mysql = xtrue) | 1166 | AM_CONDITIONAL(HAVE_MYSQL, test x$mysql = xtrue) |
1167 | AM_CONDITIONAL(HAVE_MYSQLE, test "0" = "1") | 1167 | AM_CONDITIONAL(HAVE_MYSQLE, false) |
1168 | # restore LIBS | 1168 | # restore LIBS |
1169 | LIBS=$SAVE_LIBS | 1169 | LIBS=$SAVE_LIBS |
1170 | LDFLAGS=$SAVE_LDFLAGS | 1170 | LDFLAGS=$SAVE_LDFLAGS |