[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 29/30: fix libzbar detection
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 29/30: fix libzbar detection |
Date: |
Wed, 03 Apr 2019 13:54:10 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
commit af57a5b89896f734e1ebef947625647fcf5d79bd
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Apr 3 13:53:09 2019 +0200
fix libzbar detection
---
configure.ac | 37 ++++++++++++++++++++++++++++++++++---
1 file 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
AC_DEFINE([HAVE_LIBBLUETOOTH],[0],[Lacking bluetooth library])
fi
+# check for zbar library
+zbar=0
+AC_MSG_CHECKING(for libzbar)
+AC_ARG_WITH(zbar,
+ [ --with-zbar=PFX base of libzbar installation],
+ [AC_MSG_RESULT([$with_zbar])
+ case $with_zbar in
+ no)
+ ;;
+ yes)
+ AC_CHECK_HEADERS(zbar.h,
+ AC_CHECK_LIB([zbar], [zbar_processor_create],
+ zbar=1))
+ ;;
+ *)
+ LDFLAGS="-L$with_zbar/lib $LDFLAGS"
+ CPPFLAGS="-I$with_zbar/include $CPPFLAGS"
+ AC_CHECK_HEADERS(zbar.h,
+ AC_CHECK_LIB([zbar], [zbar_processor_create],
+ EXT_LIB_PATH="-L$with_zbar/lib $EXT_LIB_PATH"
+ zbar=1))
+ ;;
+ esac
+ ],
+ [AC_MSG_RESULT([--with-zbar not specified])
+ AC_CHECK_HEADERS(zbar.h,
+ AC_CHECK_LIB([zbar], [zbar_processor_create],
+ zbar=1))])
+AM_CONDITIONAL(HAVE_ZBAR, [test "$zbar" = 1])
+AS_IF([test "x$zbar" = x1],
+ [AC_DEFINE([HAVE_ZBAR],[1],[Have zbar library])],
+ [AC_DEFINE([HAVE_ZBAR],[0],[Lacking zbar library])])
+
# check for jansson library
jansson=0
AC_MSG_CHECKING(for libjansson)
@@ -563,6 +596,7 @@ AC_ARG_WITH(jansson,
AC_CHECK_LIB([jansson], [json_loads],
jansson=1))])
AM_CONDITIONAL(HAVE_JANSSON, [test "$jansson" = 1])
+AM_CONDITIONAL(HAVE_JSON, [test x$jansson = x1])
AS_IF([test "x$jansson" = x1],
[AC_DEFINE([HAVE_JANSSON],[1],[Have jansson library])],
[AC_DEFINE([HAVE_JANSSON],[0],[Lacking jansson library])])
@@ -1431,9 +1465,6 @@ 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
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] 20/30: gnunet-qr: Add into Makefile.am and pofiles,, (continued)
- [GNUnet-SVN] [gnunet] 20/30: gnunet-qr: Add into Makefile.am and pofiles,, gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 16/30: Add helper lib "gnunet-qr-utils.h"., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 11/30: contrib/guix: Add package zbar (for gnunet-qr)., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 26/30: gnunet-qr: Implement functionality of gnunet-uri, don't spawn., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 23/30: gnunet-qr: Use GNUNET_PROGRAM_run to simplify the code., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 24/30: contrib/guix: Add package zbar (for gnunet-qr)., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 13/30: gnunet-qr: Implement functionality of gnunet-uri, don't spawn., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 21/30: gnunet-qr: Use the `gnunet-uri` binary installed into PREFIX., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 22/30: gnunet-qr: Update documentation and scripts to changed dependencies., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 28/30: merge conflict resolution, gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 29/30: fix libzbar detection,
gnunet <=
- [GNUnet-SVN] [gnunet] 14/30: gnunet-qr: Reimplement in C - yet only a proof of concept., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 30/30: Merge branch 'gnunet-qt-c-2', gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 27/30: add error handling for gnunet-qr, gnunet, 2019/04/03