security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

* libusb.m4: Check for libusb-config and if we find it, use --libs and

Browse Source 
--cflags.  This is needed for OS X since libusb brings in dependencies
to various Apple libraries.
This commit is contained in:
David Shaw 2005-11-06 04:25:52 +00:00
parent 2a662f7870
commit db90be2e94
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
m4/ChangeLog
View File

@ -1,3 +1,9 @@
2005-11-05 David Shaw <dshaw@jabberwocky.com>
* libusb.m4: Check for libusb-config and if we find it, use --libs
and --cflags. This is needed for OS X since libusb brings in
dependencies to various Apple libraries.
2005-10-21 David Shaw <dshaw@jabberwocky.com> 2005-10-21 David Shaw <dshaw@jabberwocky.com>
* readline.m4: Check for rl_completion_func_t and * readline.m4: Check for rl_completion_func_t and

25
m4/libusb.m4
View File

@ -1,5 +1,5 @@
dnl Check for libusb dnl Check for libusb
dnl Copyright (C) 2004 Free Software Foundation, Inc. dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
dnl dnl
dnl This file is free software, distributed under the terms of the GNU dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General dnl General Public License. As a special exception to the GNU General
@ -22,10 +22,24 @@ AC_DEFUN([GNUPG_CHECK_LIBUSB],
if test -d "$withval" ; then if test -d "$withval" ; then
CPPFLAGS="${CPPFLAGS} -I$withval/include" CPPFLAGS="${CPPFLAGS} -I$withval/include"
LDFLAGS="${LDFLAGS} -L$withval/lib" LDFLAGS="${LDFLAGS} -L$withval/lib"
AC_PATH_PROG([_usb_config],["$_do_libusb/bin/libusb-config"])
else
AC_PATH_PROG([_usb_config],[libusb-config])
fi fi
_libusb_save_libs=$LIBS _libusb_save_libs=$LIBS
LIBS="$LIBS -lusb" _libusb_save_cflags=$CFLAGS
if test x$_usb_config != "x" ; then
_libusb_try_libs=`$LIBS $_usb_config --libs`
_libusb_try_cflags=`$LIBS $_usb_config --cflags`
else
_libusb_try_libs="-lusb"
_libusb_try_cflags=""
fi
LIBS="$LIBS $_libusb_try_libs"
CFLAGS="$CFLAGS $_libusb_try_cflags"
AC_MSG_CHECKING([whether libusb is present and sane]) AC_MSG_CHECKING([whether libusb is present and sane])
@ -38,13 +52,18 @@ usb_bulk_write(NULL,0,NULL,0,0);
if test $_found_libusb = yes ; then if test $_found_libusb = yes ; then
AC_DEFINE(HAVE_LIBUSB,1, AC_DEFINE(HAVE_LIBUSB,1,
[Define to 1 if you have a fully functional libusb library.]) [Define to 1 if you have a fully functional libusb library.])
AC_SUBST(LIBUSB,"-lusb") AC_SUBST(LIBUSB_CPPFLAGS,$_libusb_try_cflags)
AC_SUBST(LIBUSB,$_libusb_try_libs)
AC_CHECK_FUNCS(usb_get_busses) AC_CHECK_FUNCS(usb_get_busses)
fi fi
LIBS=$_libusb_save_libs LIBS=$_libusb_save_libs
CFLAGS=$_libusb_save_cflags
unset _libusb_save_libs unset _libusb_save_libs
unset _libusb_save_cflags
unset _libusb_try_libs
unset _libusb_try_cflags
unset _found_libusb unset _found_libusb
fi fi
])dnl ])dnl