From 7c0fb2e980af93923f2071e1af087010962e06bd Mon Sep 17 00:00:00 2001
From: Reinhard Tartler <siretart@tauware.de>
Date: Fri, 26 Aug 2011 09:24:25 +0200
Subject: Import upstream version 0.11.0~svn1158

---
 drivers.m4 | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

(limited to 'drivers.m4')

diff --git a/drivers.m4 b/drivers.m4
index 7ee94ce..3931e48 100644
--- a/drivers.m4
+++ b/drivers.m4
@@ -1,4 +1,4 @@
-dnl $Id: drivers.m4 1137 2011-01-02 00:39:10Z michael $
+dnl $Id: drivers.m4 1158 2011-07-28 02:09:16Z michael $
 dnl $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/drivers.m4 $
 
 
@@ -35,8 +35,8 @@ AC_ARG_WITH(
   [                        ASTUSB, BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux, D4D,]
   [                        EA232Graphic, EFN, FW8888, G15, GLCD2USB, HD44780, HD44780-I2C,]
   [                        IRLCD, LCD2USB, LCDLinux, LEDMatrix, LCDTerm, LPH7508, LUIse,]
-  [                        LW_ABP, M50530, MatrixOrbital, MatrixOrbitalGX,]
-  [                        MilfordInstruments, Noritake, NULL, Pertelian, PHAnderson,]
+  [                        LW_ABP, M50530, MatrixOrbital, MatrixOrbitalGX, MilfordInstruments, MDM166A,]
+  [                        Newhaven, Noritake, NULL, Pertelian, PHAnderson,]
   [                        PICGraphic, picoLCD, picoLCDGraphic, PNG, PPM, RouterBoard,]
   [                        Sample, serdisplib, ShuttleVFD, SimpleLCD, st2205, T6963,]
   [                        Trefon, ULA200, USBHUB, USBLCD, VNC, WincorNixdorf, X11],
@@ -85,7 +85,9 @@ for driver in $drivers; do
          M50530="yes"
          MATRIXORBITAL="yes"
          MATRIXORBITALGX="yes"
+         MDM166A="yes"
          MILINST="yes"
+         NEWHAVEN="yes"
          NORITAKE="yes"
          NULL="yes"
          PERTELIAN="yes"
@@ -185,9 +187,15 @@ for driver in $drivers; do
       MatrixOrbitalGX)
          MATRIXORBITALGX=$val
          ;;
+      MDM166A)
+         MDM166A=$val
+         ;;
       MilfordInstruments)
          MILINST=$val
          ;;
+      Newhaven)
+         NEWHAVEN=$val
+         ;;
       Noritake)
          NORITAKE=$val;
          ;;
@@ -280,6 +288,7 @@ KEYPAD="no"
 
 # generic libraries
 LIBUSB="no"
+LIBUSB10="no"
 LIBFTDI="no"
 
 if test "$ASTUSB" = "yes"; then
@@ -535,6 +544,18 @@ if test "$MATRIXORBITALGX" = "yes"; then
     fi
 fi
 
+if test "$MDM166A" = "yes"; then 
+   if test "$has_usb10" = "true"; then 
+      GRAPHIC="yes"
+      DRIVERS="$DRIVERS drv_mdm166a.o" 
+      GPIO="yes" 
+      LIBUSB10="yes"
+      AC_DEFINE(WITH_MDM166A,1,[MDM166A driver]) 
+    else 
+      AC_MSG_WARN(libusb-1.0/libusb.h not found: MDM166A driver disabled) 
+    fi 
+fi 
+
 if test "$MILINST" = "yes"; then
    TEXT="yes"
    SERIAL="yes"
@@ -542,6 +563,14 @@ if test "$MILINST" = "yes"; then
    AC_DEFINE(WITH_MILINST,1,[Milford Instruments driver])
 fi
 
+if test "$NEWHAVEN" = "yes"; then
+   TEXT="yes"
+   #SERIAL="yes"
+   I2C="yes"
+   DRIVERS="$DRIVERS drv_Newhaven.o"
+   AC_DEFINE(WITH_NEWHAVEN,1,[Newhaven driver])
+fi
+
 if test "$NORITAKE" = "yes"; then
    if test "$has_parport" = "true"; then
       TEXT="yes"
@@ -601,6 +630,7 @@ if test "$PICOLCDGRAPHIC" = "yes"; then
    if test "$has_usb" = "true"; then
       TEXT="yes"
       GRAPHIC="yes"
+      KEYPAD="yes"      
       GPIO="yes"
       SERIAL="yes"
       LIBUSB="yes"
@@ -849,6 +879,11 @@ if test "$LIBUSB" = "yes"; then
    DRVLIBS="$DRVLIBS -lusb"
 fi
 
+# libusb-1.0
+if test "$LIBUSB10" = "yes"; then
+   DRVLIBS="$DRVLIBS -lusb-1.0"
+fi
+
 # libftdi
 if test "$LIBFTDI" = "yes"; then
    DRVLIBS="$DRVLIBS -lftdi"
-- 
cgit v1.2.3