[lcd4linux @ 2004-02-17 05:37:20 by reinelt]

Namespace clash between Curses driver and general text driver resolved
(thanks to Martin Hejl)

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

diff --git a/configure b/configure
index 692559815eb6a4790060095e54067c0b63c9118b..f13c9d78e0325c3f790ec6d6354fffb30a3bec0d 100755 (executable)
--- a/configure
+++ b/configure
@@ -1061,9 +1061,9 @@ Optional Packages:
                           drivers may be excluded with 'all,!<driver>',
                           (try 'all,\!<driver>' if your shell complains...)
                           possible drivers are:
-                          BeckmannEgle, CrystalFontz, Cwlinux, HD44780,
-                          M50530, T6963, USBLCD, MatrixOrbital,
-                          MilfordInstruments, PalmPilot, PNG, PPM, X11, Text
+                          BeckmannEgle, CrystalFontz, Curses, Cwlinux,
+                          HD44780, M50530, T6963, USBLCD, MatrixOrbital,
+                          MilfordInstruments, PalmPilot, PNG, PPM, X11
 
 Some influential environment variables:
   CXX         C++ compiler command
@@ -20860,6 +20860,7 @@ for driver in $drivers; do
       all)
          BECKMANNEGLE="yes"
          CRYSTALFONTZ="yes"
+         CURSES="yes"
          CWLINUX="yes"
          HD44780="yes"
          M50530="yes"
@@ -20870,7 +20871,6 @@ for driver in $drivers; do
          PALMPILOT="yes"
          PNG="yes"
          PPM="yes"
-         TEXT="yes"
          X11="yes"
          ;;
       BeckmannEgle)
@@ -20879,6 +20879,9 @@ for driver in $drivers; do
       CrystalFontz)
          CRYSTALFONTZ=$val
          ;;
+      Curses)
+         CURSES=$val
+         ;;
       Cwlinux)
          CWLINUX=$val
          ;;
@@ -20909,15 +20912,6 @@ for driver in $drivers; do
       PPM)
          PPM=$val
          ;;
-      SIN)
-         SIN=$val
-         ;;
-      Skeleton)
-         SKELETON=$val
-         ;;
-      Text)
-         TEXT=$val
-         ;;
       X11)
          X11=$val
          ;;
@@ -20959,6 +20953,23 @@ _ACEOF
 
 fi
 
+if test "$CURSES" = "yes"; then
+   if test "$has_curses" = true; then
+#     DRIVERS="$DRIVERS Text.lo"
+#     DRIVERS="$DRIVERS Text.o"
+      DRVLIBS="$DRVLIBS $CURSES_LIBS"
+      CPPFLAGS="$CPPFLAGS $CURSES_INCLUDES"
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_TEXT 1
+_ACEOF
+
+   else
+      { echo "$as_me:$LINENO: WARNING: curses not found: Curses driver disabled" >&5
+echo "$as_me: WARNING: curses not found: Curses driver disabled" >&2;}
+   fi
+fi
+
 if test "$CWLINUX" = "yes"; then
    TEXT="yes"
    SERIAL="yes"
@@ -21079,23 +21090,6 @@ echo "$as_me: WARNING: gd.h not found: PNG driver disabled" >&2;}
    fi
 fi
 
-if test "$TEXT" = "yes"; then
-   if test "$has_curses" = true; then
-#     DRIVERS="$DRIVERS Text.lo"
-#     DRIVERS="$DRIVERS Text.o"
-      DRVLIBS="$DRVLIBS $CURSES_LIBS"
-      CPPFLAGS="$CPPFLAGS $CURSES_INCLUDES"
-
-cat >>confdefs.h <<\_ACEOF
-#define WITH_TEXT 1
-_ACEOF
-
-   else
-      { echo "$as_me:$LINENO: WARNING: curses not found: Text driver disabled" >&5
-echo "$as_me: WARNING: curses not found: Text driver disabled" >&2;}
-   fi
-fi
-
 if test "$X11" = "yes"; then
    if test "$no_x" = "yes"; then
       { { echo "$as_me:$LINENO: error: X11 headers or libraries not available: X11 driver disabled" >&5

diff --git a/configure.in b/configure.in
index cd157bc9a3b279f57c752ae813696d8c0662b455..8ea41cfa68ef11d99c71e8abb1ab442ab0b65345 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -45,9 +45,9 @@ AC_ARG_WITH(
   [                        drivers may be excluded with 'all,!<driver>',]      
   [                        (try 'all,\!<driver>' if your shell complains...)]  
   [                        possible drivers are:]      
-  [                        BeckmannEgle, CrystalFontz, Cwlinux, HD44780,]
-  [                        M50530, T6963, USBLCD, MatrixOrbital,]
-  [                        MilfordInstruments, PalmPilot, PNG, PPM, X11, Text],
+  [                        BeckmannEgle, CrystalFontz, Curses, Cwlinux,]
+  [                        HD44780, M50530, T6963, USBLCD, MatrixOrbital,]
+  [                        MilfordInstruments, PalmPilot, PNG, PPM, X11],
   drivers=$withval, 
   drivers=all
 )
@@ -70,6 +70,7 @@ for driver in $drivers; do
       all)
          BECKMANNEGLE="yes"
          CRYSTALFONTZ="yes"
+         CURSES="yes"
          CWLINUX="yes"
          HD44780="yes"
          M50530="yes"
@@ -80,7 +81,6 @@ for driver in $drivers; do
          PALMPILOT="yes"
          PNG="yes"
          PPM="yes"
-         TEXT="yes"
          X11="yes"
          ;;
       BeckmannEgle)
@@ -89,6 +89,9 @@ for driver in $drivers; do
       CrystalFontz)
          CRYSTALFONTZ=$val
          ;;
+      Curses)
+         CURSES=$val
+         ;;
       Cwlinux)
          CWLINUX=$val
          ;;
@@ -119,15 +122,6 @@ for driver in $drivers; do
       PPM)
          PPM=$val
          ;;
-      SIN)
-         SIN=$val
-         ;;
-      Skeleton)
-         SKELETON=$val
-         ;;
-      Text)
-         TEXT=$val
-         ;;
       X11)
          X11=$val
          ;;
@@ -158,6 +152,18 @@ if test "$CRYSTALFONTZ" = "yes"; then
    AC_DEFINE(WITH_CRYSTALFONTZ,1,[Crystalfontz driver])
 fi
 
+if test "$CURSES" = "yes"; then
+   if test "$has_curses" = true; then
+#     DRIVERS="$DRIVERS Text.lo"
+#     DRIVERS="$DRIVERS Text.o"
+      DRVLIBS="$DRVLIBS $CURSES_LIBS"
+      CPPFLAGS="$CPPFLAGS $CURSES_INCLUDES"
+      AC_DEFINE(WITH_TEXT,1,[Curses driver])
+   else
+      AC_MSG_WARN(curses not found: Curses driver disabled)
+   fi   
+fi
+
 if test "$CWLINUX" = "yes"; then
    TEXT="yes"
    SERIAL="yes"
@@ -236,18 +242,6 @@ if test "$PPM" = "yes"; then
    fi
 fi
 
-if test "$TEXT" = "yes"; then
-   if test "$has_curses" = true; then
-#     DRIVERS="$DRIVERS Text.lo"
-#     DRIVERS="$DRIVERS Text.o"
-      DRVLIBS="$DRVLIBS $CURSES_LIBS"
-      CPPFLAGS="$CPPFLAGS $CURSES_INCLUDES"
-      AC_DEFINE(WITH_TEXT,1,[Curses driver])
-   else
-      AC_MSG_WARN(curses not found: Text driver disabled)
-   fi   
-fi
-
 if test "$X11" = "yes"; then
    if test "$no_x" = "yes"; then
       AC_MSG_ERROR(X11 headers or libraries not available: X11 driver disabled)