mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change configure to use autoconf macros installed by xosd to check for

Browse Source 
its presence.
This commit is contained in:
mmdolze
2011-01-05 14:53:38 +00:00
parent d86e2a369c
commit c4326258e6
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1
View File
@@ -7,6 +7,7 @@ Key:
v.0.5dev (ongoing development) v.0.5dev (ongoing development)
+ sed1330 driver: Add support for HG25504 (L. Lagendijk) + sed1330 driver: Add support for HG25504 (L. Lagendijk)
* Build system: Fix xosd detection
v0.5.4 v0.5.4
* Update driver includes and LDFLAGS (fixed glk and bayrad binding error) * Update driver includes and LDFLAGS (fixed glk and bayrad binding error)
acinclude.m4
+1 -7
View File
@@ -466,19 +466,13 @@ dnl else
fi fi
;; ;;
xosd) xosd)
AC_CHECK_HEADERS([xosd.h],[ AM_PATH_LIBXOSD([
AC_CHECK_LIB(xosd, main,[
LIBXOSD=`xosd-config --libs`
DRIVERS="$DRIVERS xosd${SO}" DRIVERS="$DRIVERS xosd${SO}"
actdrivers=["$actdrivers xosd"] actdrivers=["$actdrivers xosd"]
],[ ],[
dnl else dnl else
AC_MSG_WARN([The xosd driver needs the xosd library]) AC_MSG_WARN([The xosd driver needs the xosd library])
]) ])
],[
dnl else
AC_MSG_WARN([The xosd driver needs xosd.h])
])
;; ;;
*) *)
AC_MSG_ERROR([Unknown driver $driver]) AC_MSG_ERROR([Unknown driver $driver])
server/drivers/Makefile.am
+2 -1
View File
@@ -33,6 +33,7 @@ mdm166a_CFLAGS = @LIBHID_CFLAGS@ $(AM_CFLAGS)
picolcd_CFLAGS = @LIBUSB_CFLAGS@ $(AM_CFLAGS) picolcd_CFLAGS = @LIBUSB_CFLAGS@ $(AM_CFLAGS)
shuttleVFD_CFLAGS = @LIBUSB_CFLAGS@ $(AM_CFLAGS) shuttleVFD_CFLAGS = @LIBUSB_CFLAGS@ $(AM_CFLAGS)
ula200_CFLAGS = @LIBFTDI_CFLAGS@ $(AM_CFLAGS) ula200_CFLAGS = @LIBFTDI_CFLAGS@ $(AM_CFLAGS)
xosd_CFLAGS = @LIBXOSD_CFLAGS@ $(AM_CFLAGS)
bayrad_LDADD = libLCD.a bayrad_LDADD = libLCD.a
CFontz_LDADD = libLCD.a libbignum.a CFontz_LDADD = libLCD.a libbignum.a
@@ -69,7 +70,7 @@ svga_LDADD = @LIBSVGA@
t6963_LDADD = libLCD.a t6963_LDADD = libLCD.a
tyan_LDADD = libLCD.a libbignum.a tyan_LDADD = libLCD.a libbignum.a
ula200_LDADD = @LIBFTDI_LIBS@ ula200_LDADD = @LIBFTDI_LIBS@
xosd_LDADD = @LIBXOSD@ libbignum.a xosd_LDADD = @LIBXOSD_LIBS@ libbignum.a
libLCD_a_SOURCES = lcd_lib.h lcd_lib.c libLCD_a_SOURCES = lcd_lib.h lcd_lib.c
libbignum_a_SOURCES = adv_bignum.h adv_bignum.c libbignum_a_SOURCES = adv_bignum.h adv_bignum.c