autoconf & smoketest bugs fixed

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

diff --git a/configure b/configure
index 14e6a7241dfb1cc4068f7c4b42e1c0c4deca24eb..8771f90ee4cd37fe09b861b6a25e0b4d5c4a2675 100755 (executable)
--- a/configure
+++ b/configure
@@ -7548,7 +7548,7 @@ _ACEOF
 fi
 
 if test "$LEDMATRIX" = "yes"; then
-   GRAPHICS="yes"
+   GRAPHIC="yes"
    DRIVERS="$DRIVERS drv_LEDMatrix.o"
 
 cat >>confdefs.h <<\_ACEOF
@@ -7558,7 +7558,7 @@ _ACEOF
 fi
 
 if test "$LPH7508" = "yes"; then
-   GRAPHICS="yes"
+   GRAPHIC="yes"
    GPIO="yes"
    PARPORT="yes"
    DRIVERS="$DRIVERS drv_LPH7508.o"
@@ -7827,6 +7827,12 @@ _ACEOF
 fi
 
 
+# Image driver
+if test "$IMAGE" = "yes"; then
+   GRAPHIC="yes"
+   DRIVERS="$DRIVERS drv_Image.o"
+fi
+
 if test "$DRIVERS" = ""; then
    { { echo "$as_me:$LINENO: error: You should activate at least one driver..." >&5
 echo "$as_me: error: You should activate at least one driver..." >&2;}
@@ -7838,12 +7844,6 @@ if test "$TEXT" = "yes"; then
    DRIVERS="$DRIVERS drv_generic_text.o"
 fi
 
-# Image driver
-if test "$IMAGE" = "yes"; then
-   GRAPHIC="yes"
-   DRIVERS="$DRIVERS drv_Image.o"
-fi
-
 # generic graphic driver
 if test "$GRAPHIC" = "yes"; then
    DRIVERS="$DRIVERS drv_generic_graphic.o"

diff --git a/drivers.m4 b/drivers.m4
index 7bbb8c25cc36211c708e880bedbd1a1fb60538f8..32a624e4c4814b7dca17c85bac5dfb1e51920615 100644 (file)
--- a/drivers.m4
+++ b/drivers.m4
@@ -330,13 +330,13 @@ if test "$LCDTERM" = "yes"; then
 fi
 
 if test "$LEDMATRIX" = "yes"; then
-   GRAPHICS="yes"
+   GRAPHIC="yes"
    DRIVERS="$DRIVERS drv_LEDMatrix.o"
    AC_DEFINE(WITH_LEDMATRIX,1,[LEDMatrix driver])
 fi
 
 if test "$LPH7508" = "yes"; then
-   GRAPHICS="yes"
+   GRAPHIC="yes"
    GPIO="yes"
    PARPORT="yes"
    DRIVERS="$DRIVERS drv_LPH7508.o"
@@ -519,6 +519,12 @@ if test "$X11" = "yes"; then
 fi
 
 
+# Image driver
+if test "$IMAGE" = "yes"; then
+   GRAPHIC="yes"
+   DRIVERS="$DRIVERS drv_Image.o"
+fi
+
 if test "$DRIVERS" = ""; then
    AC_MSG_ERROR([You should activate at least one driver...])
 fi
@@ -528,12 +534,6 @@ if test "$TEXT" = "yes"; then
    DRIVERS="$DRIVERS drv_generic_text.o"
 fi
 
-# Image driver
-if test "$IMAGE" = "yes"; then
-   GRAPHIC="yes"
-   DRIVERS="$DRIVERS drv_Image.o"
-fi
-
 # generic graphic driver
 if test "$GRAPHIC" = "yes"; then
    DRIVERS="$DRIVERS drv_generic_graphic.o"