Attachment #143224 for bug #190393

View | Details | Raw Unified | Return to bug 190393
Collapse All | Expand All




# $FreeBSD: head/sysutils/lcdproc/Makefile 351411 2014-04-16 18:28:47Z zeising $

PORTNAME=	lcdproc
PORTVERSION=	0.5.7
PORTREVISION=	1
CATEGORIES=	sysutils
MASTER_SITES=	SF



SUB_FILES=	pkg-message

# Options
OPTIONS_DEFINE=	USB FTDI HID FREETYPE PNG SERDISP X11
MAN8=		LCDd.8

OPTIONS_DEFINE=	USB FTDI HID FREETYPE PNG SERDISP
USB_DESC=	USB support
FTDI_DESC=	Build drivers using libftdi (requires USB)
HID_DESC=	Build drivers using libhid (requires USB)
SERDISP_DESC=	Build drivers using serdisplib

OPTIONS_DEFAULT=USB FREETYPE
NO_OPTIONS_SORT=yes

FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
FREETYPE_CONFIGURE_ENABLE=	freetype

PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
PNG_CONFIGURE_ENABLE=	libpng

SERDISP_LIB_DEPENDS=	libserdisp.so:${PORTSDIR}/devel/serdisplib
SERDISP_CFLAGS=		-I${LOCALBASE}/include
SERDISP_LDFLAGS=	-L${LOCALBASE}/lib
SERDISP_CPPFLAGS=	-I${LOCALBASE}/include

X11_USE=		xorg=x11
X11_CONFIGURE_ENABLE=	libX11

# Empty args to aclocal required!
ACLOCAL_ARGS=


		MtxOrb \
		NoritakeVFD \
		pyramid \
		rawserial \
		SureElec \
		sdeclcd \
		sed1330 \

		tyan \
		vlsys_m428

NO_STAGE=	yes
.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MUSB}

		shuttleVFD

. if ${PORT_OPTIONS:MFTDI}
LIB_DEPENDS+=		libftdi.so:${PORTSDIR}/devel/libftdi
PLIST_SUB+=		FTDI=""
LCDPROC_DRIVERS+=i2500vfd \
		lis \

. endif

. if ${PORT_OPTIONS:MHID}
LIB_DEPENDS+=		libhid.so:${PORTSDIR}/devel/libhid
PLIST_SUB+=		HID=""
LCDPROC_DRIVERS+=mdm166a
. else

PLIST_SUB+=		USB="@comment " FTDI="@comment " HID="@comment "
.endif

.if ${PORT_OPTIONS:MFREETYPE}
LIB_DEPENDS+=		libfreetype.so:${PORTSDIR}/print/freetype2
.else
CONFIGURE_ARGS+=	--disable-freetype
.endif

.if ${PORT_OPTIONS:MPNG}
LIB_DEPENDS+=		png15:${PORTSDIR}/graphics/png
.else
CONFIGURE_ARGS+=	--disable-libpng
.endif

.if ${PORT_OPTIONS:MSERDISP}
LIB_DEPENDS+=		serdisp:${PORTSDIR}/devel/serdisplib
CFLAGS+=		-I${LOCALBASE}/include
LDFLAGS+=		-L${LOCALBASE}/lib
CPPFLAGS+=		-I${LOCALBASE}/include
.endif

post-patch:
	@${REINPLACE_CMD} -e 's!server/drivers!${PREFIX}/lib/lcdproc!' ${WRKSRC}/LCDd.conf

post-install:
	${INSTALL_DATA} ${WRKSRC}/LCDd.conf ${STAGEDIR}${PREFIX}/etc/LCDd.conf.sample
	${INSTALL_DATA} ${WRKSRC}/clients/lcdproc/lcdproc.conf ${STAGEDIR}${PREFIX}/etc/lcdproc.conf.sample
	${INSTALL_DATA} ${WRKSRC}/clients/lcdexec/lcdexec.conf ${STAGEDIR}${PREFIX}/etc/lcdexec.conf.sample
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (lcdproc-0.5.6.tar.gz) = bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a	1	SHA256 (lcdproc-0.5.7.tar.gz) = 843007d377adc856529ed0c7c42c9a7563043f06b1b73add0372bba3a3029804
2	SIZE (lcdproc-0.5.6.tar.gz) = 998996	2	SIZE (lcdproc-0.5.7.tar.gz) = 1047394




--- ./configure.ac.orig	2014-05-17 12:08:57.000000000 +0200
+++ ./configure.ac	2014-05-17 12:12:55.000000000 +0200
@@ -4,6 +4,7 @@
 AC_INIT([lcdproc], [0.5.7], [lcdproc@lists.omnipotent.net])
 AC_CONFIG_SRCDIR([clients/lcdproc/batt.c])
 AM_INIT_AUTOMAKE
+PKG_PROG_PKG_CONFIG()
 
 AC_CONFIG_HEADERS(config.h)
 
@@ -255,26 +256,62 @@
 
 dnl ######################################################################
 dnl libusb support
+dnl Stolen from the gnupg project and modified for LCDproc''s need.
+dnl
+dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 dnl ######################################################################
 AC_MSG_CHECKING([if libusb support has been enabled]);
-AC_ARG_ENABLE(libusb,
-	[AS_HELP_STRING([--disable-libusb],[disable USB support using libusb])],
-	[ if test "$enableval" != "no"; then
-		enable_libusb=yes
-	fi ],
-	[ enable_libusb=yes ]
-)
-AC_MSG_RESULT($enable_libusb)
+AC_ARG_WITH(libusb,
+	AC_HELP_STRING([--with-libusb=DIR],
+		[look for the libusb library in DIR]),
+		[_do_libusb=$withval],[_do_libusb=yes])
+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"
+		LDFLAGS="${LDFLAGS} -L$withval/lib"
+		AC_PATH_PROG([_usb_config],["$_do_libusb/bin/libusb-config"])
+	else
+		AC_PATH_PROG([_usb_config],[libusb-config])
+	fi
+
+	_libusb_save_libs=$LIBS
+	_libusb_save_cflags=$CFLAGS
+
+	if test x$_usb_config != "x" ; then
+		_libusb_try_libs=`$_usb_config --libs`
+		_libusb_try_cflags=`$_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_LINK_IFELSE([AC_LANG_PROGRAM([#include <usb.h>],[
+		usb_interrupt_write(NULL,0,NULL,0,0);
+		])],enable_libusb=yes,enable_libusb=no)
+
+	AC_MSG_RESULT([$enable_libusb])
+
+	if test "$enable_libusb" = "yes" ; then
+		AC_DEFINE(HAVE_LIBUSB, [1], [Define to 1 if you have libusb])
+		AC_SUBST(LIBUSB_CFLAGS, $_libusb_try_cflags)
+		AC_SUBST(LIBUSB_LIBS, $_libusb_try_libs)
+	fi
+
+	LIBS=$_libusb_save_libs
+	CFLAGS=$_libusb_save_cflags
+
+	unset _libusb_save_libs
+	unset _libusb_save_cflags
+	unset _libusb_try_libs
+	unset _libusb_try_cflags
 fi
-AC_SUBST(LIBUSB_LIBS)
-AC_SUBST(LIBUSB_CFLAGS)
 
 dnl ######################################################################
 dnl libusb-1.0 support




--- ./configure.in.orig	2012-11-04 11:41:16.000000000 +0100
+++ ./configure.in	2012-11-07 00:13:35.000000000 +0100
@@ -4,6 +4,7 @@
 AC_INIT([lcdproc], [0.5.6], [lcdproc@lists.omnipotent.net])
 AC_CONFIG_SRCDIR([clients/lcdproc/batt.c])
 AM_INIT_AUTOMAKE
+PKG_PROG_PKG_CONFIG()
 
 AC_CONFIG_HEADERS(config.h)
 
@@ -249,26 +250,62 @@
 
 dnl ######################################################################
 dnl libusb support
+dnl Stolen from the gnupg project and modified for LCDproc's need.
+dnl
+dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 dnl ######################################################################
 AC_MSG_CHECKING([if libusb support has been enabled]);
-AC_ARG_ENABLE(libusb,
-	[AS_HELP_STRING([--disable-libusb],[disable USB support using libusb])],
-	[ if test "$enableval" != "no"; then
-		enable_libusb=yes
-	fi ],
-	[ enable_libusb=yes ]
-)
-AC_MSG_RESULT($enable_libusb)
+AC_ARG_WITH(libusb,
+	AC_HELP_STRING([--with-libusb=DIR],
+		[look for the libusb library in DIR]),
+		[_do_libusb=$withval],[_do_libusb=yes])
+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"
+		LDFLAGS="${LDFLAGS} -L$withval/lib"
+		AC_PATH_PROG([_usb_config],["$_do_libusb/bin/libusb-config"])
+	else
+		AC_PATH_PROG([_usb_config],[libusb-config])
+	fi
+
+	_libusb_save_libs=$LIBS
+	_libusb_save_cflags=$CFLAGS
+
+	if test x$_usb_config != "x" ; then
+		_libusb_try_libs=`$_usb_config --libs`
+		_libusb_try_cflags=`$_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_LINK_IFELSE([AC_LANG_PROGRAM([#include <usb.h>],[
+		usb_interrupt_write(NULL,0,NULL,0,0);
+		])],enable_libusb=yes,enable_libusb=no)
+
+	AC_MSG_RESULT([$enable_libusb])
+
+	if test "$enable_libusb" = "yes" ; then
+		AC_DEFINE(HAVE_LIBUSB, [1], [Define to 1 if you have libusb])
+		AC_SUBST(LIBUSB_CFLAGS, $_libusb_try_cflags)
+		AC_SUBST(LIBUSB_LIBS, $_libusb_try_libs)
+	fi
+
+	LIBS=$_libusb_save_libs
+	CFLAGS=$_libusb_save_cflags
+
+	unset _libusb_save_libs
+	unset _libusb_save_cflags
+	unset _libusb_try_libs
+	unset _libusb_try_cflags
 fi
-AC_SUBST(LIBUSB_LIBS)
-AC_SUBST(LIBUSB_CFLAGS)
 
 dnl ######################################################################
 dnl libusb-1.0 support

Lines 28-33 Link Here

(-)./pkg-plist (+5 lines)
28	lib/lcdproc/mtc_s16209x.so	28	lib/lcdproc/mtc_s16209x.so
29	%%USB%%lib/lcdproc/picolcd.so	29	%%USB%%lib/lcdproc/picolcd.so
30	lib/lcdproc/pyramid.so	30	lib/lcdproc/pyramid.so
		31	lib/lcdproc/rawserial.so
31	lib/lcdproc/SureElec.so	32	lib/lcdproc/SureElec.so
32	lib/lcdproc/sdeclcd.so	33	lib/lcdproc/sdeclcd.so
33	lib/lcdproc/sed1330.so	34	lib/lcdproc/sed1330.so
Lines 42-46 Link Here
42	lib/lcdproc/tyan.so	43	lib/lcdproc/tyan.so
43	%%FTDI%%lib/lcdproc/ula200.so	44	%%FTDI%%lib/lcdproc/ula200.so
44	lib/lcdproc/vlsys_m428.so	45	lib/lcdproc/vlsys_m428.so
		46	man/man1/lcdexec.1.gz
		47	man/man1/lcdproc.1.gz
		48	man/man5/lcdproc-config.5.gz
		49	man/man8/LCDd.8.gz
45	sbin/LCDd	50	sbin/LCDd
46	@dirrm lib/lcdproc	51	@dirrm lib/lcdproc

Return to bug 190393

Lines 2-9 Link Here

(-)./Makefile (-33 / +24 lines)
2	# $FreeBSD: head/sysutils/lcdproc/Makefile 351411 2014-04-16 18:28:47Z zeising $	2	# $FreeBSD: head/sysutils/lcdproc/Makefile 351411 2014-04-16 18:28:47Z zeising $
3		3
4	PORTNAME= lcdproc	4	PORTNAME= lcdproc
5	PORTVERSION= 0.5.6	5	PORTVERSION= 0.5.7
6	PORTREVISION= 1
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9		8
Lines 27-44 Link Here
27		26
28	SUB_FILES= pkg-message	27	SUB_FILES= pkg-message
29		28
30	MAN1= lcdexec.1 lcdproc.1	29	# Options
31	MAN5= lcdproc-config.5	30	OPTIONS_DEFINE= USB FTDI HID FREETYPE PNG SERDISP X11
32	MAN8= LCDd.8
33
34	OPTIONS_DEFINE= USB FTDI HID FREETYPE PNG SERDISP
35	USB_DESC= USB support	31	USB_DESC= USB support
36	FTDI_DESC= Build drivers using libftdi (requires USB)	32	FTDI_DESC= Build drivers using libftdi (requires USB)
37	HID_DESC= Build drivers using libhid (requires USB)	33	HID_DESC= Build drivers using libhid (requires USB)
38	SERDISP_DESC= Build drivers using serdisplib	34	SERDISP_DESC= Build drivers using serdisplib
		35
39	OPTIONS_DEFAULT=USB FREETYPE	36	OPTIONS_DEFAULT=USB FREETYPE
40	NO_OPTIONS_SORT=yes	37	NO_OPTIONS_SORT=yes
41		38
		39	FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
		40	FREETYPE_CONFIGURE_ENABLE= freetype
		41
		42	PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
		43	PNG_CONFIGURE_ENABLE= libpng
		44
		45	SERDISP_LIB_DEPENDS= libserdisp.so:${PORTSDIR}/devel/serdisplib
		46	SERDISP_CFLAGS= -I${LOCALBASE}/include
		47	SERDISP_LDFLAGS= -L${LOCALBASE}/lib
		48	SERDISP_CPPFLAGS= -I${LOCALBASE}/include
		49
		50	X11_USE= xorg=x11
		51	X11_CONFIGURE_ENABLE= libX11
		52
42	# Empty args to aclocal required!	53	# Empty args to aclocal required!
43	ACLOCAL_ARGS=	54	ACLOCAL_ARGS=
44		55
Lines 62-67 Link Here
62	MtxOrb \	73	MtxOrb \
63	NoritakeVFD \	74	NoritakeVFD \
64	pyramid \	75	pyramid \
		76	rawserial \
65	SureElec \	77	SureElec \
66	sdeclcd \	78	sdeclcd \
67	sed1330 \	79	sed1330 \
Lines 75-81 Link Here
75	tyan \	87	tyan \
76	vlsys_m428	88	vlsys_m428
77		89
78	NO_STAGE= yes
79	.include <bsd.port.options.mk>	90	.include <bsd.port.options.mk>
80		91
81	.if ${PORT_OPTIONS:MUSB}	92	.if ${PORT_OPTIONS:MUSB}
Lines 86-92 Link Here
86	shuttleVFD	97	shuttleVFD
87		98
88	. if ${PORT_OPTIONS:MFTDI}	99	. if ${PORT_OPTIONS:MFTDI}
89	LIB_DEPENDS+= ftdi:${PORTSDIR}/devel/libftdi	100	LIB_DEPENDS+= libftdi.so:${PORTSDIR}/devel/libftdi
90	PLIST_SUB+= FTDI=""	101	PLIST_SUB+= FTDI=""
91	LCDPROC_DRIVERS+=i2500vfd \	102	LCDPROC_DRIVERS+=i2500vfd \
92	lis \	103	lis \
Lines 97-103 Link Here
97	. endif	108	. endif
98		109
99	. if ${PORT_OPTIONS:MHID}	110	. if ${PORT_OPTIONS:MHID}
100	LIB_DEPENDS+= hid:${PORTSDIR}/devel/libhid	111	LIB_DEPENDS+= libhid.so:${PORTSDIR}/devel/libhid
101	PLIST_SUB+= HID=""	112	PLIST_SUB+= HID=""
102	LCDPROC_DRIVERS+=mdm166a	113	LCDPROC_DRIVERS+=mdm166a
103	. else	114	. else
Lines 110-141 Link Here
110	PLIST_SUB+= USB="@comment " FTDI="@comment " HID="@comment "	121	PLIST_SUB+= USB="@comment " FTDI="@comment " HID="@comment "
111	.endif	122	.endif
112		123
113	.if ${PORT_OPTIONS:MFREETYPE}
114	LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2
115	.else
116	CONFIGURE_ARGS+= --disable-freetype
117	.endif
118
119	.if ${PORT_OPTIONS:MPNG}
120	LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
121	.else
122	CONFIGURE_ARGS+= --disable-libpng
123	.endif
124
125	.if ${PORT_OPTIONS:MSERDISP}
126	LIB_DEPENDS+= serdisp:${PORTSDIR}/devel/serdisplib
127	CFLAGS+= -I${LOCALBASE}/include
128	LDFLAGS+= -L${LOCALBASE}/lib
129	CPPFLAGS+= -I${LOCALBASE}/include
130	.endif
131
132	post-patch:	124	post-patch:
133	@${REINPLACE_CMD} -e 's!server/drivers!${PREFIX}/lib/lcdproc!' ${WRKSRC}/LCDd.conf	125	@${REINPLACE_CMD} -e 's!server/drivers!${PREFIX}/lib/lcdproc!' ${WRKSRC}/LCDd.conf
134		126
135	post-install:	127	post-install:
136	${INSTALL_DATA} ${WRKSRC}/LCDd.conf ${PREFIX}/etc/LCDd.conf.sample	128	${INSTALL_DATA} ${WRKSRC}/LCDd.conf ${STAGEDIR}${PREFIX}/etc/LCDd.conf.sample
137	${INSTALL_DATA} ${WRKSRC}/clients/lcdproc/lcdproc.conf ${PREFIX}/etc/lcdproc.conf.sample	129	${INSTALL_DATA} ${WRKSRC}/clients/lcdproc/lcdproc.conf ${STAGEDIR}${PREFIX}/etc/lcdproc.conf.sample
138	${INSTALL_DATA} ${WRKSRC}/clients/lcdexec/lcdexec.conf ${PREFIX}/etc/lcdexec.conf.sample	130	${INSTALL_DATA} ${WRKSRC}/clients/lcdexec/lcdexec.conf ${STAGEDIR}${PREFIX}/etc/lcdexec.conf.sample
139	@${CAT} ${PKGMESSAGE}
140		131
141	.include <bsd.port.mk>	132	.include <bsd.port.mk>

Line 0 Link Here

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

Lines 1-89 Link Here

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