diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2011-11-12 16:53:47 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2011-11-12 16:53:47 +0000 |
| commit | 2a542a60ae7cd9ef08e6e0b9b55f15e35a27d885 (patch) | |
| tree | 0e2eb49f735798d14c2871952c366db42c417b86 /sysutils/lcdproc/files | |
| parent | - Update to 4.6.1 (diff) | |
- Update to 0.5.5
PR: 162452
Submitted by: "Markus Dolze" <bsdfan@nurfuerspam.de> (maintainer)
Feature safe: yes
Diffstat (limited to 'sysutils/lcdproc/files')
| -rw-r--r-- | sysutils/lcdproc/files/patch-configure.in | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/sysutils/lcdproc/files/patch-configure.in b/sysutils/lcdproc/files/patch-configure.in index dbe33248518c..5ab27e62f72e 100644 --- a/sysutils/lcdproc/files/patch-configure.in +++ b/sysutils/lcdproc/files/patch-configure.in @@ -1,15 +1,15 @@ ---- configure.in.orig 2011-02-19 16:17:22.000000000 +0100 -+++ configure.in 2011-02-19 21:29:50.000000000 +0100 +--- ./configure.in.orig 2011-11-09 20:52:28.000000000 +0100 ++++ ./configure.in 2011-11-10 23:29:33.000000000 +0100 @@ -4,6 +4,7 @@ - AC_INIT(lcdproc, 0.5.4, lcdproc@lists.omnipotent.net) + AC_INIT(lcdproc, 0.5.5, lcdproc@lists.omnipotent.net) AC_CONFIG_SRCDIR([clients/lcdproc/batt.c]) AM_INIT_AUTOMAKE(1.7) +PKG_PROG_PKG_CONFIG() - + AC_CONFIG_HEADERS(config.h) - -@@ -248,26 +249,63 @@ - + +@@ -249,26 +250,63 @@ + dnl ###################################################################### dnl libusb support +dnl Stolen from the gnupg project and modified for LCDproc's need. @@ -29,8 +29,14 @@ + AC_HELP_STRING([--with-libusb=DIR], + [look for the libusb library in DIR]), + [_do_libusb=$withval],[_do_libusb=yes]) -+AC_MSG_RESULT($_do_libusb) -+ ++AC_MSG_RESULT($_do_libusb) + +-if test "$enable_libusb" = "yes"; then +- ifdef([PKG_CHECK_MODULES], +- [PKG_CHECK_MODULES(LIBUSB, libusb, +- [AC_DEFINE(HAVE_LIBUSB, [1], [Define to 1 if you have libusb])], +- [ enable_libusb=no ])], +- [AC_MSG_WARN([pkg-config not (fully) installed; drivers requiring libusb may not be built])]) +if test "$_do_libusb" != "no" ; then + if test -d "$withval" ; then + CPPFLAGS="${CPPFLAGS} -I$withval/include" @@ -39,13 +45,7 @@ + else + AC_PATH_PROG([_usb_config],[libusb-config]) + fi - --if test "$enable_libusb" = "yes"; then -- ifdef([PKG_CHECK_MODULES], -- [PKG_CHECK_MODULES(LIBUSB, libusb, -- [AC_DEFINE(HAVE_LIBUSB, [1], [Define to 1 if you have libusb])], -- [ enable_libusb=no ])], -- [AC_MSG_WARN([pkg-config not (fully) installed; drivers requiring libusb may not be built])]) ++ + _libusb_save_libs=$LIBS + _libusb_save_cflags=$CFLAGS + @@ -62,9 +62,9 @@ + + AC_MSG_CHECKING([whether libusb is present and sane]) + -+ AC_LINK_IFELSE(AC_LANG_PROGRAM([#include <usb.h>],[ ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <usb.h>],[ + usb_interrupt_write(NULL,0,NULL,0,0); -+ ]),enable_libusb=yes,enable_libusb=no) ++ ])],enable_libusb=yes,enable_libusb=no) + + AC_MSG_RESULT([$enable_libusb]) + @@ -85,6 +85,6 @@ -AC_SUBST(LIBUSB_LIBS) -AC_SUBST(LIBUSB_CFLAGS) + - + dnl ###################################################################### dnl libftdi support |