update autoconf scripts

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1023 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/Makefile.in b/Makefile.in
index 58e48e0d6991c486e293d540a8621983375c72eb..f729105038b0225775c8387edfe4ff33fd5f2558 100644 (file)
--- 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 648f8e047d6c2c7bf58025825377ac1dd6028a11..221b78629dee6d90d0a1ec3b8ed9c183e509f91f 100644 (file)
--- 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
 

diff --git a/configure b/configure
index 3a1f8803d9f584798af19c6e1aaa2a09c98dc295..4def7542b315e557c2113ac4864f703371e5dc03 100755 (executable)
--- a/configure
+++ b/configure
@@ -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"

diff --git a/drivers.m4 b/drivers.m4
index 2f19f5d014e99672291bbb73741524420aa4ccca..d4b847147a2b5b07d6bcdce0248052a2898f9f7e 100644 (file)
--- a/drivers.m4
+++ b/drivers.m4
@@ -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