From a1101ce4a41b8d11ff88c28735cdc005aba0c203 Mon Sep 17 00:00:00 2001 From: edman007 Date: Wed, 18 Nov 2009 23:21:32 +0000 Subject: Prevent HD44780 and HD44780_I2C from building at the same time git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1063 3ae390bd-cb1e-0410-b409-cd5a39f66f1f --- drivers.m4 | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) (limited to 'drivers.m4') diff --git a/drivers.m4 b/drivers.m4 index b2e3d9f..0d52bc0 100644 --- a/drivers.m4 +++ b/drivers.m4 @@ -33,7 +33,7 @@ AC_ARG_WITH( [ (try 'all,\!' if your shell complains...)] [ possible drivers are:] [ BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux, D4D,] - [ EA232Graphic, G15, GLCD2USB, HD44780, HD44780-i2c, IRLCD,] + [ EA232Graphic, G15, GLCD2USB, HD44780, HD44780-I2C, IRLCD,] [ LCD2USB, LCDLinux, LEDMatrix, LCDTerm, LPH7508, LUIse,] [ LW_ABP, M50530, MatrixOrbital, MatrixOrbitalGX,] [ MilfordInstruments, Noritake, NULL, Pertelian, PHAnderson,] @@ -359,20 +359,6 @@ if test "$GLCD2USB" = "yes"; then fi fi -if test "$HD44780" = "yes"; then - if test "$has_parport" = "true"; then - TEXT="yes" - PARPORT="yes" - I2C="yes" - GPIO="yes" - KEYPAD="yes" - DRIVERS="$DRIVERS drv_HD44780.o" - AC_DEFINE(WITH_HD44780,1,[HD44780 driver]) - else - AC_MSG_WARN(asm/io.h or {linux/parport.h and linux/ppdev.h} not found: HD44780 driver disabled) - fi -fi - if test "$HD44780_I2C" = "yes"; then TEXT="yes" I2C="yes" @@ -381,6 +367,25 @@ if test "$HD44780_I2C" = "yes"; then AC_DEFINE(WITH_HD44780,1,[HD44780 driver]) fi +if test "$HD44780" = "yes"; then + if test "$HD44780_I2C" != "yes"; then + if test "$has_parport" = "true"; then + TEXT="yes" + PARPORT="yes" + I2C="yes" + GPIO="yes" + KEYPAD="yes" + DRIVERS="$DRIVERS drv_HD44780.o" + AC_DEFINE(WITH_HD44780,1,[HD44780 driver]) + else + AC_MSG_WARN(asm/io.h or {linux/parport.h and linux/ppdev.h} not found: HD44780 driver disabled) + fi + else + HD44780="no" + AC_MSG_WARN(HD44780-i2c enabled disabling HD44780) + fi +fi + if test "$IRLCD" = "yes"; then if test "$has_usb" = "true"; then TEXT="yes" -- cgit v1.2.3