[Pkg-gnupg-commit] [gnupg2] 28/102: configure: Detection of libusb on FreeBSD.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Fri Jun 17 00:14:51 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg2.
commit b3e043ba905fdf2efcdadbd7022ac53f4408b748
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Fri May 27 08:48:04 2016 +0900
configure: Detection of libusb on FreeBSD.
* configure.ac (LIBUSB_LIBS): Use LIBUSB_NAME for AC_CHECK_LIB.
--
Thanks to Michael Sinatra.
GnuPG-bug-id: 2367
Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
configure.ac | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6458f1a..d90921c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -787,24 +787,28 @@ AM_PATH_KSBA("$NEED_KSBA_API:$NEED_KSBA_VERSION",have_ksba=yes,have_ksba=no)
if test "$use_ccid_driver" = auto || test "$use_ccid_driver" = yes; then
case "${host}" in
*-mingw32*)
+ LIBUSB_NAME=
LIBUSB_LIBS=
LIBUSB_CPPFLAGS=
;;
*-*-darwin*)
- LIBUSB_LIBS="-lusb-1.0 -Wl,-framework,CoreFoundation -Wl,-framework,IOKit"
+ LIBUSB_NAME=usb-1.0
+ LIBUSB_LIBS="-Wl,-framework,CoreFoundation -Wl,-framework,IOKit"
;;
*-*-freebsd*)
# FreeBSD has a native 1.0 compatible library by -lusb.
- LIBUSB_LIBS="-lusb"
+ LIBUSB_NAME=usb
+ LIBUSB_LIBS=
;;
*)
- LIBUSB_LIBS="-lusb-1.0"
+ LIBUSB_NAME=usb-1.0
+ LIBUSB_LIBS=
;;
esac
fi
-if test x"$LIBUSB_LIBS" != x ; then
- AC_CHECK_LIB(usb-1.0, libusb_init,
- [ LIBUSB_LIBS="$LIBUSB_LIBS"
+if test x"$LIBUSB_NAME" != x ; then
+ AC_CHECK_LIB($LIBUSB_NAME, libusb_init,
+ [ LIBUSB_LIBS="-l$LIBUSB_NAME $LIBUSB_LIBS"
have_libusb=yes ])
AC_MSG_CHECKING([libusb include dir])
usb_incdir_found="no"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list