diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-04-03 13:53:09 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-04-03 13:53:09 +0200 |
commit | af57a5b89896f734e1ebef947625647fcf5d79bd (patch) | |
tree | c4690ad3b7f412a0374d506d68aa742ca91ffc45 /configure.ac | |
parent | 1c53d67c25a877901e5ff5a8421ccc5972751838 (diff) | |
download | gnunet-af57a5b89896f734e1ebef947625647fcf5d79bd.tar.gz gnunet-af57a5b89896f734e1ebef947625647fcf5d79bd.zip |
fix libzbar detection
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 37 |
1 files changed, 34 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 793612df3..ac8ed60c2 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -534,6 +534,39 @@ else | |||
534 | AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library]) | 534 | AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library]) |
535 | fi | 535 | fi |
536 | 536 | ||
537 | # check for zbar library | ||
538 | zbar=0 | ||
539 | AC_MSG_CHECKING(for libzbar) | ||
540 | AC_ARG_WITH(zbar, | ||
541 | [ --with-zbar=PFX base of libzbar installation], | ||
542 | [AC_MSG_RESULT([$with_zbar]) | ||
543 | case $with_zbar in | ||
544 | no) | ||
545 | ;; | ||
546 | yes) | ||
547 | AC_CHECK_HEADERS(zbar.h, | ||
548 | AC_CHECK_LIB([zbar], [zbar_processor_create], | ||
549 | zbar=1)) | ||
550 | ;; | ||
551 | *) | ||
552 | LDFLAGS="-L$with_zbar/lib $LDFLAGS" | ||
553 | CPPFLAGS="-I$with_zbar/include $CPPFLAGS" | ||
554 | AC_CHECK_HEADERS(zbar.h, | ||
555 | AC_CHECK_LIB([zbar], [zbar_processor_create], | ||
556 | EXT_LIB_PATH="-L$with_zbar/lib $EXT_LIB_PATH" | ||
557 | zbar=1)) | ||
558 | ;; | ||
559 | esac | ||
560 | ], | ||
561 | [AC_MSG_RESULT([--with-zbar not specified]) | ||
562 | AC_CHECK_HEADERS(zbar.h, | ||
563 | AC_CHECK_LIB([zbar], [zbar_processor_create], | ||
564 | zbar=1))]) | ||
565 | AM_CONDITIONAL(HAVE_ZBAR, [test "$zbar" = 1]) | ||
566 | AS_IF([test "x$zbar" = x1], | ||
567 | [AC_DEFINE([HAVE_ZBAR],[1],[Have zbar library])], | ||
568 | [AC_DEFINE([HAVE_ZBAR],[0],[Lacking zbar library])]) | ||
569 | |||
537 | # check for jansson library | 570 | # check for jansson library |
538 | jansson=0 | 571 | jansson=0 |
539 | AC_MSG_CHECKING(for libjansson) | 572 | AC_MSG_CHECKING(for libjansson) |
@@ -563,6 +596,7 @@ AC_ARG_WITH(jansson, | |||
563 | AC_CHECK_LIB([jansson], [json_loads], | 596 | AC_CHECK_LIB([jansson], [json_loads], |
564 | jansson=1))]) | 597 | jansson=1))]) |
565 | AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1]) | 598 | AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1]) |
599 | AM_CONDITIONAL(HAVE_JSON, [test x$jansson = x1]) | ||
566 | AS_IF([test "x$jansson" = x1], | 600 | AS_IF([test "x$jansson" = x1], |
567 | [AC_DEFINE([HAVE_JANSSON],[1],[Have jansson library])], | 601 | [AC_DEFINE([HAVE_JANSSON],[1],[Have jansson library])], |
568 | [AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library])]) | 602 | [AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library])]) |
@@ -1431,9 +1465,6 @@ AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have GnuTLS]) | |||
1431 | AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = x1) | 1465 | AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = x1) |
1432 | AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE support]) | 1466 | AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE support]) |
1433 | 1467 | ||
1434 | # check for libzbar library, required for optional gnunet-qr | ||
1435 | PKG_CHECK_MODULES([libzbar], [zbar >= 0.10], [have_zbar=1 ], [have_zbar=0 ]) | ||
1436 | AM_CONDITIONAL([HAVE_ZBAR], [test "$have_zbar" = 1]) | ||
1437 | 1468 | ||
1438 | 1469 | ||
1439 | # Test if we are building for superMUC | 1470 | # Test if we are building for superMUC |