|
Line 0
Link Here
|
|
|
1 |
Index: configure.in |
| 2 |
=================================================================== |
| 3 |
RCS file: /cvsroot/lcdproc/lcdproc/configure.in,v |
| 4 |
retrieving revision 1.79 |
| 5 |
diff -u -r1.79 configure.in |
| 6 |
--- configure.in 6 Jun 2009 16:01:38 -0000 1.79 |
| 7 |
+++ configure.in 20 Jul 2009 06:38:04 -0000 |
| 8 |
@@ -230,26 +230,63 @@ |
| 9 |
|
| 10 |
dnl ###################################################################### |
| 11 |
dnl libusb support |
| 12 |
+dnl Stolen from the gnupg project and modified for LCDproc's need. |
| 13 |
+dnl |
| 14 |
+dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
| 15 |
dnl ###################################################################### |
| 16 |
AC_MSG_CHECKING([if libusb support has been enabled]); |
| 17 |
-AC_ARG_ENABLE(libusb, |
| 18 |
- [AS_HELP_STRING([--disable-libusb],[disable USB support using libusb])], |
| 19 |
- [ if test "$enableval" != "no"; then |
| 20 |
- enable_libusb="yes" |
| 21 |
- fi ], |
| 22 |
- [ enable_libusb=yes ] |
| 23 |
-) |
| 24 |
-AC_MSG_RESULT($enable_libusb) |
| 25 |
- |
| 26 |
-if test "$enable_libusb" = "yes"; then |
| 27 |
- ifdef([PKG_CHECK_MODULES], |
| 28 |
- [PKG_CHECK_MODULES(LIBUSB, libusb, |
| 29 |
- [AC_DEFINE(HAVE_LIBUSB, [1], [Define to 1 if you have libusb])], |
| 30 |
- [ enable_libusb=no ])], |
| 31 |
- [AC_MSG_WARN([pkg-config not (fully) installed; drivers requiring libusb may not be built])]) |
| 32 |
+AC_ARG_WITH(libusb, |
| 33 |
+ AC_HELP_STRING([--with-libusb=DIR], |
| 34 |
+ [look for the libusb library in DIR]), |
| 35 |
+ [_do_libusb=$withval],[_do_libusb=yes]) |
| 36 |
+AC_MSG_RESULT($_do_libusb) |
| 37 |
+ |
| 38 |
+if test "$_do_libusb" != "no" ; then |
| 39 |
+ if test -d "$withval" ; then |
| 40 |
+ CPPFLAGS="${CPPFLAGS} -I$withval/include" |
| 41 |
+ LDFLAGS="${LDFLAGS} -L$withval/lib" |
| 42 |
+ AC_PATH_PROG([_usb_config],["$_do_libusb/bin/libusb-config"]) |
| 43 |
+ else |
| 44 |
+ AC_PATH_PROG([_usb_config],[libusb-config]) |
| 45 |
+ fi |
| 46 |
+ |
| 47 |
+ _libusb_save_libs=$LIBS |
| 48 |
+ _libusb_save_cflags=$CFLAGS |
| 49 |
+ |
| 50 |
+ if test x$_usb_config != "x" ; then |
| 51 |
+ _libusb_try_libs=`$_usb_config --libs` |
| 52 |
+ _libusb_try_cflags=`$_usb_config --cflags` |
| 53 |
+ else |
| 54 |
+ _libusb_try_libs="-lusb" |
| 55 |
+ _libusb_try_cflags="" |
| 56 |
+ fi |
| 57 |
+ |
| 58 |
+ LIBS="$LIBS $_libusb_try_libs" |
| 59 |
+ CFLAGS="$CFLAGS $_libusb_try_cflags" |
| 60 |
+ |
| 61 |
+ AC_MSG_CHECKING([whether libusb is present and sane]) |
| 62 |
+ |
| 63 |
+ AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <usb.h>],[ |
| 64 |
+ usb_interrupt_write(NULL,0,NULL,0,0); |
| 65 |
+ ]),enable_libusb=yes,enable_libusb=no) |
| 66 |
+ |
| 67 |
+ AC_MSG_RESULT([$enable_libusb]) |
| 68 |
+ |
| 69 |
+ if test "$enable_libusb" = "yes" ; then |
| 70 |
+ AC_DEFINE(HAVE_LIBUSB, [1], [Define to 1 if you have libusb]) |
| 71 |
+ AC_SUBST(LIBUSB_CFLAGS, $_libusb_try_cflags) |
| 72 |
+ AC_SUBST(LIBUSB_LIBS, $_libusb_try_libs) |
| 73 |
+ fi |
| 74 |
+ |
| 75 |
+ LIBS=$_libusb_save_libs |
| 76 |
+ CFLAGS=$_libusb_save_cflags |
| 77 |
+ |
| 78 |
+ unset _libusb_save_libs |
| 79 |
+ unset _libusb_save_cflags |
| 80 |
+ unset _libusb_try_libs |
| 81 |
+ unset _libusb_try_cflags |
| 82 |
fi |
| 83 |
-AC_SUBST(LIBUSB_LIBS) |
| 84 |
-AC_SUBST(LIBUSB_CFLAGS) |
| 85 |
+ |
| 86 |
|
| 87 |
dnl ###################################################################### |
| 88 |
dnl libftdi support |