gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [gnunet] 06/30: configure.ac: Add check for libzbar (using


From: gnunet
Subject: [GNUnet-SVN] [gnunet] 06/30: configure.ac: Add check for libzbar (using pkgconfig).
Date: Wed, 03 Apr 2019 13:53:47 +0200

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet.

commit db1ae389da242b97dfe06882e9950e3b881cd378
Author: Hartmut Goebel <address@hidden>
AuthorDate: Sun Mar 3 02:04:16 2019 +0100

    configure.ac: Add check for libzbar (using pkgconfig).
    
    libzbar is required for gnunet-qr, which is optional.
---
 configure.ac | 8 ++++++++
 1 file changed, 8 insertions(+)

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])
 AM_CONDITIONAL(HAVE_GNUTLS_DANE, test x$gnutls_dane = x1)
 AC_DEFINE_UNQUOTED([HAVE_GNUTLS_DANE], $gnutls_dane, [We have GnuTLS with DANE 
support])
 
+# check for libzbar library, required for optional gnunet-qr
+PKG_CHECK_MODULES([libzbar], [zbar >= 0.10], [have_zbar=1 ], [have_zbar=0 ])
+AM_CONDITIONAL([HAVE_ZBAR], [test "$have_zbar" = 1])
+
 
 # Test if we are building for superMUC
 AC_MSG_CHECKING(if GNUnet is being configured to run on the SuperMUC)
@@ -1907,6 +1911,10 @@ AS_IF([test x$gnutls != xtrue],
  [AS_IF([test "x$gnutls_dane" != "x1"],
   [AC_MSG_NOTICE([WARNING: GnuTLS has no DANE support, DANE validation will 
not be possible])])])
 
+# warn user if libzbar is not found
+AS_IF([test "$have_zbar" = 0],
+      [AC_MSG_NOTICE([WARNING: zbar not found, gnunet-qr will not be built.])])
+
 # java ports
 AS_IF([test "x$enable_java_ports" = "xyes"],
       [AC_MSG_NOTICE([NOTICE: Opening ports for gnunet-java bindings by 
default.])])

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]