diff options
author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2019-03-03 02:04:16 +0100 |
---|---|---|
committer | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2019-03-13 18:22:05 +0100 |
commit | db1ae389da242b97dfe06882e9950e3b881cd378 (patch) | |
tree | abcd1d9e7eac58e5d34cd1e0924275964dc0fb46 | |
parent | a89292d9bcc7e4a0f5e2d6d877993a6a496f27b6 (diff) | |
download | gnunet-db1ae389da242b97dfe06882e9950e3b881cd378.tar.gz gnunet-db1ae389da242b97dfe06882e9950e3b881cd378.zip |
configure.ac: Add check for libzbar (using pkgconfig).
libzbar is required for gnunet-qr, which is optional.
-rw-r--r-- | configure.ac | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 53dac3003..851f6543b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1402,6 +1402,10 @@ AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have GnuTLS]) | |||
1402 | AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = x1) | 1402 | AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = x1) |
1403 | AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE support]) | 1403 | AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE support]) |
1404 | 1404 | ||
1405 | # check for libzbar library, required for optional gnunet-qr | ||
1406 | PKG_CHECK_MODULES([libzbar], [zbar >= 0.10], [have_zbar=1 ], [have_zbar=0 ]) | ||
1407 | AM_CONDITIONAL([HAVE_ZBAR], [test "$have_zbar" = 1]) | ||
1408 | |||
1405 | 1409 | ||
1406 | # Test if we are building for superMUC | 1410 | # Test if we are building for superMUC |
1407 | AC_MSG_CHECKING(if GNUnet is being configured to run on the SuperMUC) | 1411 | AC_MSG_CHECKING(if GNUnet is being configured to run on the SuperMUC) |
@@ -1907,6 +1911,10 @@ AS_IF([test x$gnutls != xtrue], | |||
1907 | [AS_IF([test "x$gnutls_dane" != "x1"], | 1911 | [AS_IF([test "x$gnutls_dane" != "x1"], |
1908 | [AC_MSG_NOTICE([WARNING: GnuTLS has no DANE support, DANE validation will not be possible])])]) | 1912 | [AC_MSG_NOTICE([WARNING: GnuTLS has no DANE support, DANE validation will not be possible])])]) |
1909 | 1913 | ||
1914 | # warn user if libzbar is not found | ||
1915 | AS_IF([test "$have_zbar" = 0], | ||
1916 | [AC_MSG_NOTICE([WARNING: zbar not found, gnunet-qr will not be built.])]) | ||
1917 | |||
1910 | # java ports | 1918 | # java ports |
1911 | AS_IF([test "x$enable_java_ports" = "xyes"], | 1919 | AS_IF([test "x$enable_java_ports" = "xyes"], |
1912 | [AC_MSG_NOTICE([NOTICE: Opening ports for gnunet-java bindings by default.])]) | 1920 | [AC_MSG_NOTICE([NOTICE: Opening ports for gnunet-java bindings by default.])]) |