[lcd4linux @ 2006-04-09 14:17:49 by reinelt]

autoconf/library fixes, image and graphic display inversion

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

1 files changed, 19 insertions, 13 deletions

diff --git a/drivers.m4 b/drivers.m4
index 5888051..0687160 100644
--- a/drivers.m4
+++ b/drivers.m4
@@ -180,7 +180,6 @@ AC_MSG_RESULT([done])
 TEXT="no"
 GRAPHIC="no"
 GPIO="no"
-IMAGE="no"
 
 # generiv I/O drivers
 PARPORT="no"
@@ -188,6 +187,8 @@ SERIAL="no"
 I2C="no"
 KEYPAD="no"
 
+# generic libraries
+LIBUSB="no"
 
 if test "$BECKMANNEGLE" = "yes"; then
    TEXT="yes"
@@ -201,7 +202,7 @@ if test "$BWCT" = "yes"; then
    if test "$has_usb" = "true"; then
       TEXT="yes"
       DRIVERS="$DRIVERS drv_BWCT.o"
-      DRVLIBS="$DRVLIBS -lusb"
+      LIBUSB="yes"
       AC_DEFINE(WITH_BWCT,1,[BWCT driver])
    else
       AC_MSG_WARN(usb.h not found: BWCT driver disabled)
@@ -240,8 +241,8 @@ fi
 if test "$G15" = "yes"; then
    if test "$has_usb" = "true"; then
       GRAPHIC="yes"
+      LIBUSB="yes"
       DRIVERS="$DRIVERS drv_G15.o"
-      DRVLIBS="$DRVLIBS -lusb"
       AC_DEFINE(WITH_G15,1,[G-15 driver])
    else
       AC_MSG_WARN(usb.h not found: G15 driver disabled)
@@ -262,7 +263,7 @@ if test "$LCD2USB" = "yes"; then
       TEXT="yes"
       SERIAL="yes"
       DRIVERS="$DRIVERS drv_LCD2USB.o"
-      DRVLIBS="$DRVLIBS -lusb"
+      LIBUSB="yes"
       AC_DEFINE(WITH_LCD2USB,1,[LCD2USB driver])
    else
       AC_MSG_WARN(usb.h not found: LCD2USB driver disabled)
@@ -344,8 +345,6 @@ fi
 if test "$PNG" = "yes"; then
    if test "$has_gd" = "true"; then
       GRAPHIC="yes"
-      IMAGE="yes"
-      DRVLIBS="$DRVLIBS -lgd"
       AC_DEFINE(WITH_PNG,1,[ driver])
    else
       AC_MSG_WARN(gd.h not found: PNG driver disabled)
@@ -354,14 +353,9 @@ fi
 
 if test "$PPM" = "yes"; then
    GRAPHIC="yes"
-   IMAGE="yes"
    AC_DEFINE(WITH_PPM,1,[ driver])
 fi
 
-if test "$IMAGE" = "yes"; then
-   DRIVERS="$DRIVERS drv_Image.o"
-fi
-
 if test "$ROUTERBOARD" = "yes"; then
    TEXT="yes"
    GPIO="yes"
@@ -389,6 +383,9 @@ if test "$SERDISPLIB" = "yes"; then
       DRIVERS="$DRIVERS drv_serdisplib.o"
       DRVLIBS="$DRVLIBS -L/usr/local/lib -lserdisp"
       AC_DEFINE(WITH_SERDISPLIB,1,[serdisplib driver])
+      if test "$has_usb" = "true"; then
+         LIBUSB="yes"
+      fi
    else
       AC_MSG_WARN(serdisp.h not found: serdisplib driver disabled)
    fi
@@ -412,7 +409,7 @@ if test "$Trefon" = "yes"; then
    if test "$has_usb" = "true"; then
       TEXT="yes"
       DRIVERS="$DRIVERS drv_Trefon.o"
-      DRVLIBS="$DRVLIBS -lusb"
+      LIBUSB="yes"
       AC_DEFINE(WITH_TREFON,1,[TREFON driver])
    else
       AC_MSG_WARN(usb.h not found: Trefon driver disabled)
@@ -424,7 +421,7 @@ if test "$USBLCD" = "yes"; then
    SERIAL="yes"
    DRIVERS="$DRIVERS drv_USBLCD.o"
    if test "$has_usb" = "true"; then
-      DRVLIBS="$DRVLIBS -lusb"
+      LIBUSB="yes"
    fi
    AC_DEFINE(WITH_USBLCD,1,[USBLCD driver])
 fi
@@ -462,6 +459,10 @@ fi
 # generic graphic driver
 if test "$GRAPHIC" = "yes"; then
    DRIVERS="$DRIVERS drv_generic_graphic.o"
+   if test "$has_gd" = "true"; then
+      DRIVERS="$DRIVERS drv_Image.o"
+      DRVLIBS="$DRVLIBS -lgd"
+   fi	
 fi
 
 # generic GPIO driver
@@ -490,5 +491,10 @@ if test "$KEYPAD" = "yes"; then
    DRIVERS="$DRIVERS drv_generic_keypad.o"
 fi
 
+# libusb
+if test "$LIBUSB" = "yes"; then
+   DRVLIBS="$DRVLIBS -lusb"
+fi
+
 AC_SUBST(DRIVERS)
 AC_SUBST(DRVLIBS)