[lcd4linux @ 2002-12-08 07:36:06 by reinelt]

autoconf/automake cleanup

2 files changed, 183 insertions, 112 deletions

diff --git a/configure b/configure
index 6592cf9..4c37abf 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.54.
+# Generated by GNU Autoconf 2.54 for LCD4Linux 0.99.
+#
+# Report bugs to <reinelt@eunet.at>.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -261,11 +263,11 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 : ${ac_max_here_lines=38}
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='LCD4Linux'
+PACKAGE_TARNAME='lcd4linux'
+PACKAGE_VERSION='0.99'
+PACKAGE_STRING='LCD4Linux 0.99'
+PACKAGE_BUGREPORT='reinelt@eunet.at'
 
 ac_unique_file="lcd4linux.c"
 # Factoring default headers for most tests.
@@ -305,7 +307,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S CURSES_LIBS CURSES_INCLUDES CPP EGREP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DRIVERS DRVLIBS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S CURSES_LIBS CURSES_INCLUDEDIR CPP EGREP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DRIVERS DRVLIBS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -774,7 +776,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures LCD4Linux 0.99 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -839,7 +841,9 @@ _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
-
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of LCD4Linux 0.99:";;
+   esac
   cat <<\_ACEOF
 
 Optional Packages:
@@ -873,6 +877,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
+Report bugs to <reinelt@eunet.at>.
 _ACEOF
 fi
 
@@ -935,6 +940,8 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
+LCD4Linux configure 0.99
+generated by GNU Autoconf 2.54
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 Free Software Foundation, Inc.
@@ -948,7 +955,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by LCD4Linux $as_me 0.99, which was
 generated by GNU Autoconf 2.54.  Invocation command line was
 
   $ $0 $@
@@ -1247,6 +1254,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
+
+
+
+
+
+
+
 am__api_version="1.4"
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -1542,6 +1557,7 @@ fi
           ac_config_commands="$ac_config_commands default-1"
 
 
+# Checks for programs.
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2484,6 +2500,7 @@ echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
 
+# Checks for libraries.
 
 
 echo "$as_me:$LINENO: checking for log in -lm" >&5
@@ -2545,6 +2562,11 @@ _ACEOF
 fi
 
 
+# curses
+
+
+
+
 
 
 
@@ -2795,11 +2817,12 @@ if test "${with_sco+set}" = set; then
   withval="$with_sco"
 
 	  if test x$withval = xyes; then
-		cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define SCO_FLAVOR 1
 _ACEOF
 
-		CPPFLAGS="$CPPFLAGS -D_SVID3"
+		CFLAGS="$CFLAGS -D_SVID3"
 	  fi
 
 fi;
@@ -2815,24 +2838,28 @@ if test "${with_sunos_curses+set}" = set; then
 	screen_manager="SunOS 4.x /usr/5include curses"
 	echo "$as_me:$LINENO: result: Using SunOS 4.x /usr/5include curses" >&5
 echo "${ECHO_T}Using SunOS 4.x /usr/5include curses" >&6
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define USE_SUNOS_CURSES 1
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAS_CURSES 1
 _ACEOF
 
 	has_curses=true
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define NO_COLOR_CURSES 1
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define USE_SYSV_CURSES 1
 _ACEOF
 
-	CURSES_INCLUDES="-I/usr/5include"
+	CURSES_INCLUDEDIR="-I/usr/5include"
 	CURSES_LIBS="/usr/5lib/libcurses.a /usr/5lib/libtermcap.a"
 	echo "$as_me:$LINENO: result: Please note that some screen refreshs may fail" >&5
 echo "${ECHO_T}Please note that some screen refreshs may fail" >&6
@@ -2852,16 +2879,19 @@ if test "${with_osf1_curses+set}" = set; then
 echo "${ECHO_T}Using OSF1 curses" >&6
        search_ncurses=false
        screen_manager="OSF1 curses"
-       cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAS_CURSES 1
 _ACEOF
 
        has_curses=true
-       cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define NO_COLOR_CURSES 1
 _ACEOF
 
-       cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define USE_SYSV_CURSES 1
 _ACEOF
 
@@ -2876,17 +2906,19 @@ fi;
 if test "${with_vcurses+set}" = set; then
   withval="$with_vcurses"
   if test x$withval != xyes; then
-		CURSES_INCLUDES="-I$withval"
+		CURSES_INCLUDEDIR="-I$withval"
 	  fi
 
 	echo "$as_me:$LINENO: result: Using SysV curses" >&5
 echo "${ECHO_T}Using SysV curses" >&6
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAS_CURSES 1
 _ACEOF
 
 	has_curses=true
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define USE_SYSV_CURSES 1
 _ACEOF
 
@@ -2905,19 +2937,20 @@ if test "${with_ncurses+set}" = set; then
 		search_ncurses=false
 	  elif test x$withval != xyes ; then
 		CURSES_LIBS="$LIBS -L$withval/lib -lncurses"
-		CURSES_INCLUDES="-I$withval/include"
+		CURSES_INCLUDEDIR="-I$withval/include"
 		search_ncurses=false
 		screen_manager="ncurses"
-		cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define USE_NCURSES 1
 _ACEOF
 
-		cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAS_CURSES 1
 _ACEOF
 
 		has_curses=true
-		use_ncurses=true
 	  fi
 
 fi;
@@ -2936,19 +2969,20 @@ echo "$as_me: checking \"location of ncurses.h file\"..." >&6;}
 	    echo "$as_me:$LINENO: result: Found ncurses on /usr/include/ncurses.h" >&5
 echo "${ECHO_T}Found ncurses on /usr/include/ncurses.h" >&6
  	    CURSES_LIBS="-lncurses"
-	    CURSES_INCLUDES=""
+	    CURSES_INCLUDEDIR=""
 	    search_ncurses=false
 	    screen_manager="ncurses on /usr/include"
-            cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAS_CURSES 1
 _ACEOF
 
             has_curses=true
-	    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define USE_NCURSES 1
 _ACEOF
 
-	    use_ncurses=true
 	fi
     fi
 
@@ -2960,19 +2994,20 @@ _ACEOF
 	    echo "$as_me:$LINENO: result: Found ncurses on /usr/include/ncurses/ncurses.h" >&5
 echo "${ECHO_T}Found ncurses on /usr/include/ncurses/ncurses.h" >&6
  	    CURSES_LIBS="-lncurses"
-	    CURSES_INCLUDES="-I/usr/include/ncurses"
+	    CURSES_INCLUDEDIR="-I/usr/include/ncurses"
 	    search_ncurses=false
 	    screen_manager="ncurses on /usr/include/ncurses"
-            cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAS_CURSES 1
 _ACEOF
 
             has_curses=true
-	    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define USE_NCURSES 1
 _ACEOF
 
-	    use_ncurses=true
 	fi
     fi
 
@@ -2984,19 +3019,20 @@ _ACEOF
 	    echo "$as_me:$LINENO: result: Found ncurses on /usr/local/include/ncurses.h" >&5
 echo "${ECHO_T}Found ncurses on /usr/local/include/ncurses.h" >&6
  	    CURSES_LIBS="-L/usr/local/lib -lncurses"
-	    CURSES_INCLUDES="-I/usr/local/include"
+	    CURSES_INCLUDEDIR="-I/usr/local/include"
 	    search_ncurses=false
 	    screen_manager="ncurses on /usr/local"
-            cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAS_CURSES 1
 _ACEOF
 
             has_curses=true
-	    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define USE_NCURSES 1
 _ACEOF
 
-	    use_ncurses=true
 	fi
     fi
 
@@ -3008,19 +3044,20 @@ _ACEOF
 	    echo "$as_me:$LINENO: result: Found ncurses on /usr/local/include/ncurses/ncurses.h" >&5
 echo "${ECHO_T}Found ncurses on /usr/local/include/ncurses/ncurses.h" >&6
  	    CURSES_LIBS="-L/usr/local/lib -L/usr/local/lib/ncurses -lncurses"
-	    CURSES_INCLUDES="-I/usr/local/include/ncurses"
+	    CURSES_INCLUDEDIR="-I/usr/local/include/ncurses"
 	    search_ncurses=false
 	    screen_manager="ncurses on /usr/local/include/ncurses"
-            cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAS_CURSES 1
 _ACEOF
 
             has_curses=true
-	    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define USE_NCURSES 1
 _ACEOF
 
-	    use_ncurses=true
 	fi
     fi
 
@@ -3033,19 +3070,20 @@ _ACEOF
 	    echo "$as_me:$LINENO: result: Found ncurses on /usr/local/include/ncurses/curses.h" >&5
 echo "${ECHO_T}Found ncurses on /usr/local/include/ncurses/curses.h" >&6
  	    CURSES_LIBS="-L/usr/local/lib -lncurses"
-	    CURSES_INCLUDES="-I/usr/local/include/ncurses -DRENAMED_NCURSES"
+	    CURSES_INCLUDEDIR="-I/usr/local/include/ncurses -DRENAMED_NCURSES"
 	    search_ncurses=false
 	    screen_manager="renamed ncurses on /usr/local/.../ncurses"
-            cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAS_CURSES 1
 _ACEOF
 
             has_curses=true
-	    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define USE_NCURSES 1
 _ACEOF
 
-	    use_ncurses=true
 	fi
     fi
 
@@ -3058,19 +3096,20 @@ _ACEOF
 	    echo "$as_me:$LINENO: result: Found ncurses on /usr/include/ncurses/curses.h" >&5
 echo "${ECHO_T}Found ncurses on /usr/include/ncurses/curses.h" >&6
  	    CURSES_LIBS="-lncurses"
-	    CURSES_INCLUDES="-I/usr/include/ncurses -DRENAMED_NCURSES"
+	    CURSES_INCLUDEDIR="-I/usr/include/ncurses -DRENAMED_NCURSES"
 	    search_ncurses=false
 	    screen_manager="renamed ncurses on /usr/include/ncurses"
-            cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAS_CURSES 1
 _ACEOF
 
             has_curses=true
-	    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define USE_NCURSES 1
 _ACEOF
 
-	    use_ncurses=true
 	fi
     fi
 
@@ -3088,12 +3127,14 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 
 	echo "$as_me:$LINENO: result: Using SysV curses" >&5
 echo "${ECHO_T}Using SysV curses" >&6
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAS_CURSES 1
 _ACEOF
 
 	has_curses=true
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define USE_SYSV_CURSES 1
 _ACEOF
 
@@ -3118,17 +3159,18 @@ _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "USE_NCURSES" >/dev/null 2>&1; then
 
-	CURSES_INCLUDES="$CURSES_INCLUDES -DRENAMED_NCURSES"
-        cat >>confdefs.h <<\_ACEOF
+	CURSES_INCLUDEDIR="$CURSES_INCLUDEDIR -DRENAMED_NCURSES"
+
+cat >>confdefs.h <<\_ACEOF
 #define HAS_CURSES 1
 _ACEOF
 
 	has_curses=true
-        cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define USE_NCURSES 1
 _ACEOF
 
-	use_ncurses=true
         search_ncurses=false
         screen_manager="ncurses installed as curses"
 
@@ -3146,24 +3188,28 @@ rm -f conftest*
 	screen_manager="SunOS 4.x /usr/5include curses"
 	echo "$as_me:$LINENO: result: Using SunOS 4.x /usr/5include curses" >&5
 echo "${ECHO_T}Using SunOS 4.x /usr/5include curses" >&6
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define USE_SUNOS_CURSES 1
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAS_CURSES 1
 _ACEOF
 
 	has_curses=true
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define NO_COLOR_CURSES 1
 _ACEOF
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define USE_SYSV_CURSES 1
 _ACEOF
 
-	CURSES_INCLUDES="-I/usr/5include"
+	CURSES_INCLUDEDIR="-I/usr/5include"
 	CURSES_LIBS="/usr/5lib/libcurses.a /usr/5lib/libtermcap.a"
 	echo "$as_me:$LINENO: result: Please note that some screen refreshs may fail" >&5
 echo "${ECHO_T}Please note that some screen refreshs may fail" >&6
@@ -3175,7 +3221,7 @@ echo "${ECHO_T}Please note that some screen refreshs may fail" >&6
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 	ncurses_version=unknown
 cat > conftest.$ac_ext <<EOF
-#line 3178 "configure"
+#line 3224 "configure"
 #include "confdefs.h"
 #ifdef RENAMED_NCURSES
 #include <curses.h>
@@ -3185,7 +3231,7 @@ cat > conftest.$ac_ext <<EOF
 #undef VERSION
 VERSION:NCURSES_VERSION
 EOF
-        if (eval "$ac_cpp $CURSES_INCLUDES conftest.$ac_ext") 2>&5 |
+        if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "VERSION:" >conftest.out 2>&1; then
             ncurses_version=`cat conftest.out|sed -e 's/^[^"]*"//' -e 's/".*//'`
 	fi
@@ -3194,19 +3240,22 @@ EOF
 echo "${ECHO_T}$ncurses_version" >&6
 	case "$ncurses_version" in
 	4.[01])
-            cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define NCURSES_970530 2
 _ACEOF
 
             ;;
 	1.9.9g)
-            cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define NCURSES_970530 1
 _ACEOF
 
             ;;
 	1*)
-            cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define NCURSES_970530 0
 _ACEOF
 
@@ -3218,6 +3267,8 @@ _ACEOF
 
 
 
+
+# Checks for X11
 echo "$as_me:$LINENO: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
@@ -4294,6 +4345,7 @@ fi
 fi
 
 
+# drivers
 echo "$as_me:$LINENO: checking which drivers to compile" >&5
 echo $ECHO_N "checking which drivers to compile... $ECHO_C" >&6
 
@@ -4396,7 +4448,8 @@ RASTER="no"
 
 if test "$BECKMANNEGLE" = "yes"; then
    DRIVERS="$DRIVERS BeckmannEgle.o"
-   cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define WITH_BECKMANNEGLE 1
 _ACEOF
 
@@ -4404,7 +4457,8 @@ fi
 
 if test "$CRYSTALFONTZ" = "yes"; then
    DRIVERS="$DRIVERS Crystalfontz.o"
-   cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define WITH_CRYSTALFONTZ 1
 _ACEOF
 
@@ -4412,7 +4466,8 @@ fi
 
 if test "$CWLINUX" = "yes"; then
    DRIVERS="$DRIVERS Cwlinux.o"
-   cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define WITH_CWLINUX 1
 _ACEOF
 
@@ -4420,7 +4475,8 @@ fi
 
 if test "$HD44780" = "yes"; then
    DRIVERS="$DRIVERS HD44780.o"
-   cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define WITH_HD44780 1
 _ACEOF
 
@@ -4428,7 +4484,8 @@ fi
 
 if test "$M50530" = "yes"; then
    DRIVERS="$DRIVERS M50530.o"
-   cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define WITH_M50530 1
 _ACEOF
 
@@ -4436,7 +4493,8 @@ fi
 
 if test "$T6963" = "yes"; then
    DRIVERS="$DRIVERS T6963.o"
-   cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define WITH_T6963 1
 _ACEOF
 
@@ -4444,7 +4502,8 @@ fi
 
 if test "$USBLCD" = "yes"; then
    DRIVERS="$DRIVERS USBLCD.o"
-   cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define WITH_USBLCD 1
 _ACEOF
 
@@ -4452,7 +4511,8 @@ fi
 
 if test "$MATRIXORBITAL" = "yes"; then
    DRIVERS="$DRIVERS MatrixOrbital.o"
-   cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define WITH_MATRIXORBITAL 1
 _ACEOF
 
@@ -4460,7 +4520,8 @@ fi
 
 if test "$PALMPILOT" = "yes"; then
    DRIVERS="$DRIVERS PalmPilot.o"
-   cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define WITH_PALMPILOT 1
 _ACEOF
 
@@ -4468,7 +4529,8 @@ fi
 
 if test "$PNG" = "yes"; then
    RASTER="yes"
-   cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define WITH_PNG 1
 _ACEOF
 
@@ -4477,7 +4539,8 @@ fi
 
 if test "$PPM" = "yes"; then
    RASTER="yes"
-   cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define WITH_PPM 1
 _ACEOF
 
@@ -4485,7 +4548,8 @@ fi
 
 if test "$SIN" = "yes"; then
    DRIVERS="$DRIVERS SIN.o"
-   cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define WITH_SIN 1
 _ACEOF
 
@@ -4493,7 +4557,8 @@ fi
 
 if test "$SKELETON" = "yes"; then
    DRIVERS="$DRIVERS Skeleton.o"
-   cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define WITH_SKELETON 1
 _ACEOF
 
@@ -4504,7 +4569,8 @@ if test "$TEXT" = "yes"; then
       DRIVERS="$DRIVERS Text.o"
       DRVLIBS="$DRVLIBS $CURSES_LIBS"
       CPPFLAGS="$CPPFLAGS $CURSES_INCLUDES"
-      cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define WITH_TEXT 1
 _ACEOF
 
@@ -4522,13 +4588,15 @@ echo "$as_me: error: X11 headers or libraries not available: X11 driver disabled
    else
       DRIVERS="$DRIVERS XWindow.o"
       DRVLIBS="$DRVLIBS -L$ac_x_libraries -lX11"
-      cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define WITH_X11 1
 _ACEOF
 
    fi
 fi
 
+# Raster.o depends on PPM or PNG
 if test "$RASTER" = "yes"; then
    DRIVERS="$DRIVERS Raster.o"
 fi
@@ -4543,6 +4611,7 @@ fi
 
 
 
+# Checks for header files.
 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
@@ -5747,6 +5816,7 @@ fi
 done
 
 
+# Checks for typedefs, structures, and compiler characteristics.
 echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
@@ -6133,6 +6203,7 @@ _ACEOF
 fi
 
 
+# Checks for library functions.
 if test $ac_cv_c_compiler_gnu = yes; then
     echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
@@ -6738,7 +6809,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by $as_me, which was
+This file was extended by LCD4Linux $as_me 0.99, which was
 generated by GNU Autoconf 2.54.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6800,7 +6871,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-config.status
+LCD4Linux config.status 0.99
 configured by $0, generated by GNU Autoconf 2.54,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -7003,7 +7074,7 @@ s,@EXEEXT@,$EXEEXT,;t t
 s,@OBJEXT@,$OBJEXT,;t t
 s,@LN_S@,$LN_S,;t t
 s,@CURSES_LIBS@,$CURSES_LIBS,;t t
-s,@CURSES_INCLUDES@,$CURSES_INCLUDES,;t t
+s,@CURSES_INCLUDEDIR@,$CURSES_INCLUDEDIR,;t t
 s,@CPP@,$CPP,;t t
 s,@EGREP@,$EGREP,;t t
 s,@X_CFLAGS@,$X_CFLAGS,;t t
diff --git a/configure.in b/configure.in
index c2f40da..45399f6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,26 +1,26 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT
+# Process this file with autoconf to produce a configure script.
+AC_INIT([LCD4Linux],[0.99],[reinelt@eunet.at])
 AC_CONFIG_SRCDIR([lcd4linux.c])
-AM_INIT_AUTOMAKE(lcd4linux, 0.99)
+AM_INIT_AUTOMAKE(lcd4linux,0.99)
 AM_CONFIG_HEADER(config.h)
 
-dnl Checks for programs.
+# Checks for programs.
 AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
-dnl Checks for libraries.
+# Checks for libraries.
 AC_CHECK_LIB(m, log)
 
-dnl curses
+# curses
 sinclude(curses.m4)
 AC_CHECK_CURSES
 
-dnl Checks for X11
+# Checks for X11
 AC_PATH_XTRA
 
-dnl drivers
+# drivers
 AC_MSG_CHECKING([which drivers to compile])
 AC_ARG_WITH(
   drivers, 
@@ -124,68 +124,68 @@ RASTER="no"
 
 if test "$BECKMANNEGLE" = "yes"; then
    DRIVERS="$DRIVERS BeckmannEgle.o"
-   AC_DEFINE(WITH_BECKMANNEGLE)
+   AC_DEFINE(WITH_BECKMANNEGLE,1,[junk])
 fi
 
 if test "$CRYSTALFONTZ" = "yes"; then
    DRIVERS="$DRIVERS Crystalfontz.o"
-   AC_DEFINE(WITH_CRYSTALFONTZ)
+   AC_DEFINE(WITH_CRYSTALFONTZ,1,[junk])
 fi
 
 if test "$CWLINUX" = "yes"; then
    DRIVERS="$DRIVERS Cwlinux.o"
-   AC_DEFINE(WITH_CWLINUX)
+   AC_DEFINE(WITH_CWLINUX,1,[junk])
 fi
 
 if test "$HD44780" = "yes"; then
    DRIVERS="$DRIVERS HD44780.o"
-   AC_DEFINE(WITH_HD44780)
+   AC_DEFINE(WITH_HD44780,1,[junk])
 fi
 
 if test "$M50530" = "yes"; then
    DRIVERS="$DRIVERS M50530.o"
-   AC_DEFINE(WITH_M50530)
+   AC_DEFINE(WITH_M50530,1,[junk])
 fi
 
 if test "$T6963" = "yes"; then
    DRIVERS="$DRIVERS T6963.o"
-   AC_DEFINE(WITH_T6963)
+   AC_DEFINE(WITH_T6963,1,[junk])
 fi
 
 if test "$USBLCD" = "yes"; then
    DRIVERS="$DRIVERS USBLCD.o"
-   AC_DEFINE(WITH_USBLCD)
+   AC_DEFINE(WITH_USBLCD,1,[junk])
 fi
 
 if test "$MATRIXORBITAL" = "yes"; then
    DRIVERS="$DRIVERS MatrixOrbital.o"
-   AC_DEFINE(WITH_MATRIXORBITAL)
+   AC_DEFINE(WITH_MATRIXORBITAL,1,[junk])
 fi
 
 if test "$PALMPILOT" = "yes"; then
    DRIVERS="$DRIVERS PalmPilot.o"
-   AC_DEFINE(WITH_PALMPILOT)
+   AC_DEFINE(WITH_PALMPILOT,1,[junk])
 fi
 
 if test "$PNG" = "yes"; then
    RASTER="yes"
-   AC_DEFINE(WITH_PNG)
+   AC_DEFINE(WITH_PNG,1,[junk])
    DRVLIBS="$DRVLIBS -lgd"
 fi
 
 if test "$PPM" = "yes"; then
    RASTER="yes"
-   AC_DEFINE(WITH_PPM)
+   AC_DEFINE(WITH_PPM,1,[junk])
 fi
 
 if test "$SIN" = "yes"; then
    DRIVERS="$DRIVERS SIN.o"
-   AC_DEFINE(WITH_SIN)
+   AC_DEFINE(WITH_SIN,1,[junk])
 fi
 
 if test "$SKELETON" = "yes"; then
    DRIVERS="$DRIVERS Skeleton.o"
-   AC_DEFINE(WITH_SKELETON)
+   AC_DEFINE(WITH_SKELETON,1,[junk])
 fi
 
 if test "$TEXT" = "yes"; then
@@ -193,7 +193,7 @@ if test "$TEXT" = "yes"; then
       DRIVERS="$DRIVERS Text.o"
       DRVLIBS="$DRVLIBS $CURSES_LIBS"
       CPPFLAGS="$CPPFLAGS $CURSES_INCLUDES"
-      AC_DEFINE(WITH_TEXT)
+      AC_DEFINE(WITH_TEXT,1,[junk])
    else
       AC_MSG_WARN(curses not found: Text driver disabled)
    fi   
@@ -205,11 +205,11 @@ if test "$X11" = "yes"; then
    else
       DRIVERS="$DRIVERS XWindow.o"
       DRVLIBS="$DRVLIBS -L$ac_x_libraries -lX11"
-      AC_DEFINE(WITH_X11)
+      AC_DEFINE(WITH_X11,1,[junk])
    fi
 fi
 
-dnl Raster.o depends on PPM or PNG
+# Raster.o depends on PPM or PNG
 if test "$RASTER" = "yes"; then
    DRIVERS="$DRIVERS Raster.o"
 fi
@@ -222,7 +222,7 @@ fi
 AC_SUBST(DRIVERS)
 AC_SUBST(DRVLIBS)
 
-dnl Checks for header files.
+# Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_SYS_WAIT
@@ -233,7 +233,7 @@ AC_CHECK_HEADERS(gd/gd.h gd.h)
 AC_CHECK_HEADERS(net/if_ppp.h)
 AC_CHECK_HEADERS(asm/msr.h)
 
-dnl Checks for typedefs, structures, and compiler characteristics.
+# Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
 AC_TYPE_PID_T
@@ -242,7 +242,7 @@ AC_HEADER_TIME
 AC_STRUCT_TM
 AC_TYPE_UID_T
 
-dnl Checks for library functions.
+# Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MEMCMP
 AC_TYPE_SIGNAL