diff options
author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2019-03-03 02:04:16 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-04-03 13:42:16 +0200 |
commit | e35cd05d91025475e31c88eb8f46a6ef723f3dae (patch) | |
tree | f58c80a635a55d53aea837dd9d0c50cb9f7103fc /configure.ac | |
parent | 7dd9b38648dc428d728a966026f0e3d0b105c536 (diff) | |
download | gnunet-e35cd05d91025475e31c88eb8f46a6ef723f3dae.tar.gz gnunet-e35cd05d91025475e31c88eb8f46a6ef723f3dae.zip |
configure.ac: Add check for libzbar (using pkgconfig).
libzbar is required for gnunet-qr, which is optional.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 96d7cbbc0..793612df3 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1431,6 +1431,10 @@ AC_DEFINE_UNQUOTED([HAVE_GNUTLS], $gnutls, [We have GnuTLS]) | |||
1431 | AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = x1) | 1431 | 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]) | 1432 | AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE support]) |
1433 | 1433 | ||
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 | |||
1434 | 1438 | ||
1435 | # Test if we are building for superMUC | 1439 | # Test if we are building for superMUC |
1436 | AC_MSG_CHECKING(if GNUnet is being configured to run on the SuperMUC) | 1440 | AC_MSG_CHECKING(if GNUnet is being configured to run on the SuperMUC) |
@@ -1938,6 +1942,10 @@ AS_IF([test x$gnutls != xtrue], | |||
1938 | [AS_IF([test "x$gnutls_dane" != "x1"], | 1942 | [AS_IF([test "x$gnutls_dane" != "x1"], |
1939 | [AC_MSG_NOTICE([WARNING: GnuTLS has no DANE support, DANE validation will not be possible])])]) | 1943 | [AC_MSG_NOTICE([WARNING: GnuTLS has no DANE support, DANE validation will not be possible])])]) |
1940 | 1944 | ||
1945 | # warn user if libzbar is not found | ||
1946 | AS_IF([test "$have_zbar" = 0], | ||
1947 | [AC_MSG_NOTICE([WARNING: zbar not found, gnunet-qr will not be built.])]) | ||
1948 | |||
1941 | # java ports | 1949 | # java ports |
1942 | AS_IF([test "x$enable_java_ports" = "xyes"], | 1950 | AS_IF([test "x$enable_java_ports" = "xyes"], |
1943 | [AC_MSG_NOTICE([NOTICE: Opening ports for gnunet-java bindings by default.])]) | 1951 | [AC_MSG_NOTICE([NOTICE: Opening ports for gnunet-java bindings by default.])]) |