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

autoconf: fix obsolete macros, check for pkg-config macros, show drivers to be compiled

Browse Source
This commit is contained in:
marschap
2008-10-16 09:16:15 +00:00
parent 8c5266e4d3
commit 07957823d2
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1
View File
@@ -58,6 +58,7 @@ v.0.5dev (ongoing development)
+ picolcd driver: support for 20x4 picoLCDs (Nicu Pavel) + picolcd driver: support for 20x4 picoLCDs (Nicu Pavel)
+ hd44780 driver: new ConnectionType uss720 (Eric Pooch) + hd44780 driver: new ConnectionType uss720 (Eric Pooch)
* new make targets to compile & install server & clients separately * new make targets to compile & install server & clients separately
* autoconf fixes: check for pkg-config macros
v.0.5.2 v.0.5.2
* fix switching on/off the Load screen in lcdproc client using the menu * fix switching on/off the Load screen in lcdproc client using the menu
acinclude.m4
+8 -4
View File
@@ -2,7 +2,7 @@ dnl
dnl Define function/macro for driver selection using the --enable-drivers=... option dnl Define function/macro for driver selection using the --enable-drivers=... option
dnl dnl
AC_DEFUN([LCD_DRIVERS_SELECT], [ AC_DEFUN([LCD_DRIVERS_SELECT], [
AC_CHECKING(which drivers to compile) AC_MSG_NOTICE([checking which drivers to compile...])
AC_ARG_ENABLE(drivers, AC_ARG_ENABLE(drivers,
[ --enable-drivers=<list> compile drivers for LCDs in <list>,] [ --enable-drivers=<list> compile drivers for LCDs in <list>,]
@@ -458,8 +458,12 @@ dnl else
esac esac
done done
actdrivers=`echo $actdrivers | sed -e 's/ /,/g'` AC_MSG_RESULT([---------------------------------------])
AC_MSG_RESULT([Will compile drivers: $actdrivers]) AC_MSG_RESULT([LCDd will be compiled with the drivers:])
for driver in $actdrivers; do
AC_MSG_RESULT([ - $driver])
done
AC_MSG_RESULT([---------------------------------------])
AC_SUBST(LIBCURSES) AC_SUBST(LIBCURSES)
AC_SUBST(LIBIRMAN) AC_SUBST(LIBIRMAN)
@@ -545,7 +549,7 @@ AC_DEFUN([AC_GET_FS_INFO], [
]) ])
AC_CHECK_FUNCS(getmntinfo) AC_CHECK_FUNCS(getmntinfo)
AC_CHECKING(how to get filesystem space usage) AC_MSG_NOTICE([checking how to get filesystem space usage...])
space=no space=no
# Here we'll compromise a little (and perform only the link test) # Here we'll compromise a little (and perform only the link test)
configure.in
+12 -8
View File
@@ -242,9 +242,11 @@ AC_ARG_ENABLE(libusb,
AC_MSG_RESULT($enable_libusb) AC_MSG_RESULT($enable_libusb)
if test "$enable_libusb" = "yes"; then if test "$enable_libusb" = "yes"; then
PKG_CHECK_MODULES(LIBUSB, libusb, ifdef([PKG_CHECK_MODULES],
[PKG_CHECK_MODULES(LIBUSB, libusb,
[AC_DEFINE(HAVE_LIBUSB, [1], [Define to 1 if you have libusb])], [AC_DEFINE(HAVE_LIBUSB, [1], [Define to 1 if you have libusb])],
[ enable_libusb=no ]) [ enable_libusb=no ])],
[AC_MSG_WARN([pkg-config not (fully) installed; drivers requiring libusb may not be built])])
fi fi
AC_SUBST(LIBUSB_LIBS) AC_SUBST(LIBUSB_LIBS)
AC_SUBST(LIBUSB_CFLAGS) AC_SUBST(LIBUSB_CFLAGS)
@@ -263,9 +265,11 @@ AC_ARG_ENABLE(libftdi,
AC_MSG_RESULT($enable_libftdi) AC_MSG_RESULT($enable_libftdi)
if test "$enable_libftdi" = "yes"; then if test "$enable_libftdi" = "yes"; then
PKG_CHECK_MODULES(LIBFTDI, libftdi >= 0.8, ifdef([PKG_CHECK_MODULES],
[PKG_CHECK_MODULES(LIBFTDI, libftdi >= 0.8,
[AC_DEFINE(HAVE_LIBFTDI, [1], [Define to 1 if you have libftdi])], [AC_DEFINE(HAVE_LIBFTDI, [1], [Define to 1 if you have libftdi])],
[ enable_libftdi=no ]) [ enable_libftdi=no ])],
[AC_MSG_WARN([pkg-config not (fully) installed; drivers requiring libftdi may not be built])])
fi fi
AC_SUBST(LIBFTDI_LIBS) AC_SUBST(LIBFTDI_LIBS)
AC_SUBST(LIBFTDI_CFLAGS) AC_SUBST(LIBFTDI_CFLAGS)
@@ -284,8 +288,11 @@ AC_ARG_ENABLE(ethlcd,
AC_MSG_RESULT($enable_ethlcd) AC_MSG_RESULT($enable_ethlcd)
# check for doxygen
BB_ENABLE_DOXYGEN
dnl Select drivers to build
# Select drivers to build
LCD_DRIVERS_SELECT LCD_DRIVERS_SELECT
@@ -364,9 +371,6 @@ AC_ARG_ENABLE(stat-smbfs,
) )
# check for doxygen
BB_ENABLE_DOXYGEN
AC_CONFIG_FILES([Makefile AC_CONFIG_FILES([Makefile
shared/Makefile shared/Makefile
server/Makefile server/Makefile