diff options
author | michux <michux@3ae390bd-cb1e-0410-b409-cd5a39f66f1f> | 2009-04-06 20:20:50 +0000 |
---|---|---|
committer | michux <michux@3ae390bd-cb1e-0410-b409-cd5a39f66f1f> | 2009-04-06 20:20:50 +0000 |
commit | ae2f27dbb3e780e6abed0e92bc02594987067aae (patch) | |
tree | 0cc9c7ed8caa79355b0dee7f4f63564705f10dda | |
parent | 0aa04e30811665c1d5a0f8f082044a0c8e97c896 (diff) | |
download | lcd4linux-ae2f27dbb3e780e6abed0e92bc02594987067aae.tar.gz |
update autoconf scripts
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1023 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | config.h.in | 3 | ||||
-rwxr-xr-x | configure | 28 | ||||
-rw-r--r-- | drivers.m4 | 14 |
4 files changed, 36 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index 58e48e0..f729105 100644 --- a/Makefile.in +++ b/Makefile.in @@ -298,6 +298,7 @@ drv_RouterBoard.c \ drv_Sample.c \ drv_st2205.c \ drv_serdisplib.c \ +drv_ShuttleVFD.c \ drv_SimpleLCD.c \ drv_T6963.c \ drv_Trefon.c \ @@ -486,6 +487,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_Pertelian.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_RouterBoard.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_Sample.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_ShuttleVFD.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_SimpleLCD.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_T6963.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_Trefon.Po@am__quote@ diff --git a/config.h.in b/config.h.in index 648f8e0..221b786 100644 --- a/config.h.in +++ b/config.h.in @@ -536,6 +536,9 @@ /* serial bus driver */ #undef WITH_SERIAL +/* ShuttleVFD driver */ +#undef WITH_SHUTTLEVFD + /* SimpleLCD driver */ #undef WITH_SIMPLELCD @@ -1346,9 +1346,9 @@ Optional Packages: G15, GLCD2USB, HD44780, IRLCD, LCD2USB, LCDLinux, LCDTerm, LPH7508, LUIse, M50530, MatrixOrbital, MilfordInstruments, Noritake, NULL, PNG, PPM, Pertelian, PHAnderson, picoLCD, - picoLCDGraphic, RouterBoard, Sample, serdisplib, SimpleLCD, - st2205, T6963, Trefon, ULA200, USBLCD, USBHUB, VNC, - WincorNixdorf, X11 + picoLCDGraphic, RouterBoard, Sample, serdisplib, ShuttleVFD, + SimpleLCD, st2205, T6963, Trefon, ULA200, USBLCD, USBHUB, + VNC, WincorNixdorf, X11 --with-plugins=<list> choose which plugins to compile. type --with-plugins=list for a list of avaible plugins @@ -7869,6 +7869,7 @@ for driver in $drivers; do SAMPLE="yes" ST2205="yes" SERDISPLIB="yes" + SHUTTLEVFD="yes" SIMPLELCD="yes" T6963="yes" Trefon="yes" @@ -7963,7 +7964,6 @@ for driver in $drivers; do picoLCDGraphic) PICOLCDGRAPHIC=$val ;; - PNG) PNG=$val ;; @@ -7979,6 +7979,9 @@ for driver in $drivers; do serdisplib) SERDISPLIB=$val; ;; + ShuttleVFD) + SHUTTLEVFD=$val + ;; SimpleLCD) SIMPLELCD=$val ;; @@ -8502,6 +8505,23 @@ echo "$as_me: WARNING: serdisp.h not found: serdisplib driver disabled" >&2;} fi fi +if test "$SHUTTLEVFD" = "yes"; then + if test "$has_usb" = "true"; then + TEXT="yes" + GPIO="yes" + DRIVERS="$DRIVERS drv_ShuttleVFD.o" + LIBUSB="yes" + +cat >>confdefs.h <<\_ACEOF +#define WITH_SHUTTLEVFD 1 +_ACEOF + + else + { echo "$as_me:$LINENO: WARNING: usb.h not found: ShuttleVFD driver disabled" >&5 +echo "$as_me: WARNING: usb.h not found: ShuttleVFD driver disabled" >&2;} + fi +fi + if test "$SIMPLELCD" = "yes"; then TEXT="yes" SERIAL="yes" @@ -203,7 +203,7 @@ for driver in $drivers; do SERDISPLIB=$val; ;; ShuttleVFD) - SHUTTLEVFD=$val + SHUTTLEVFD=$val ;; SimpleLCD) SIMPLELCD=$val @@ -580,12 +580,12 @@ if test "$SERDISPLIB" = "yes"; then fi if test "$SHUTTLEVFD" = "yes"; then - if test "$has_usb" = "true"; then - TEXT="yes" - GPIO="yes" - DRIVERS="$DRIVERS drv_ShuttleVFD.o" - LIBUSB="yes" - AC_DEFINE(WITH_SHUTTLEVFD,1,[ShuttleVFD driver]) + if test "$has_usb" = "true"; then + TEXT="yes" + GPIO="yes" + DRIVERS="$DRIVERS drv_ShuttleVFD.o" + LIBUSB="yes" + AC_DEFINE(WITH_SHUTTLEVFD,1,[ShuttleVFD driver]) else AC_MSG_WARN(usb.h not found: ShuttleVFD driver disabled) fi |