aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHartmut Goebel <h.goebel@crazy-compilers.com>2019-03-03 02:04:16 +0100
committerChristian Grothoff <christian@grothoff.org>2019-04-03 13:42:16 +0200
commite35cd05d91025475e31c88eb8f46a6ef723f3dae (patch)
treef58c80a635a55d53aea837dd9d0c50cb9f7103fc
parent7dd9b38648dc428d728a966026f0e3d0b105c536 (diff)
downloadgnunet-e35cd05d91025475e31c88eb8f46a6ef723f3dae.tar.gz
gnunet-e35cd05d91025475e31c88eb8f46a6ef723f3dae.zip
configure.ac: Add check for libzbar (using pkgconfig).
libzbar is required for gnunet-qr, which is optional.
-rw-r--r--configure.ac8
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])
1431AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = x1) 1431AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = x1)
1432AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE support]) 1432AC_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
1435PKG_CHECK_MODULES([libzbar], [zbar >= 0.10], [have_zbar=1 ], [have_zbar=0 ])
1436AM_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
1436AC_MSG_CHECKING(if GNUnet is being configured to run on the SuperMUC) 1440AC_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
1946AS_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
1942AS_IF([test "x$enable_java_ports" = "xyes"], 1950AS_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.])])