From ad88d0d37d3d32e1290777cf5b77e5cc1bf46dd0 Mon Sep 17 00:00:00 2001 From: reinelt <> Date: Sun, 8 Dec 2002 07:36:07 +0000 Subject: [lcd4linux @ 2002-12-08 07:36:06 by reinelt] autoconf/automake cleanup --- AUTHORS | 5 ++ ChangeLog | 0 Makefile.am | 4 +- Makefile.in | 18 ++--- acconfig.h | 72 ------------------ aclocal.m4 | 2 +- config.h.in | 132 ++++++++++++++++---------------- configure | 241 ++++++++++++++++++++++++++++++++++++++--------------------- configure.in | 54 ++++++------- curses.m4 | 101 ++++++++++++------------- depcomp | 0 11 files changed, 314 insertions(+), 315 deletions(-) create mode 100644 AUTHORS create mode 100644 ChangeLog delete mode 100644 acconfig.h create mode 100644 depcomp diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..228750e --- /dev/null +++ b/AUTHORS @@ -0,0 +1,5 @@ +LCD4Linux development team: + +Michael Reinelt +Herbert Rosmanith +Leo Tötsch diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..e69de29 diff --git a/Makefile.am b/Makefile.am index 5847120..f975678 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = gnu CLEANFILES = *~ bin_PROGRAMS = lcd4linux @@ -33,7 +33,6 @@ mail2.c \ socket.c socket.h EXTRA_lcd4linux_SOURCES= \ -acconfig.h \ BeckmannEgle.c \ Crystalfontz.c Crystalfontz.h \ Cwlinux.c \ @@ -55,6 +54,7 @@ lcd4kde.conf \ lcd4linux.kdelnk \ lcd4linux.xpm \ lcd4linux.lsm \ +AUTHORS \ CREDITS \ FAQ \ NEWS \ diff --git a/Makefile.in b/Makefile.in index 1f01c8b..43d3b7f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -59,7 +59,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : AWK = @AWK@ CC = @CC@ -CURSES_INCLUDES = @CURSES_INCLUDES@ +CURSES_INCLUDEDIR = @CURSES_INCLUDEDIR@ CURSES_LIBS = @CURSES_LIBS@ DRIVERS = @DRIVERS@ DRVLIBS = @DRVLIBS@ @@ -68,7 +68,7 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = gnu CLEANFILES = *~ bin_PROGRAMS = lcd4linux @@ -81,10 +81,10 @@ lcd4linux_DEPENDENCIES = @DRIVERS@ lcd4linux_SOURCES = lcd4linux.c debug.c debug.h cfg.c cfg.h lock.c lock.h parser.c parser.h processor.c processor.h system.c system.h isdn.c isdn.h mail.c mail.h seti.c seti.h battery.c battery.h filter.c filter.h udelay.c udelay.h display.c display.h pixmap.c pixmap.h bar.c bar.h fontmap.c fontmap.h exec.c exec.h mail2.c socket.c socket.h -EXTRA_lcd4linux_SOURCES = acconfig.h BeckmannEgle.c Crystalfontz.c Crystalfontz.h Cwlinux.c HD44780.c M50530.c T6963.c USBLCD.c MatrixOrbital.c PalmPilot.c Raster.c SIN.c Skeleton.c XWindow.c Text.c +EXTRA_lcd4linux_SOURCES = BeckmannEgle.c Crystalfontz.c Crystalfontz.h Cwlinux.c HD44780.c M50530.c T6963.c USBLCD.c MatrixOrbital.c PalmPilot.c Raster.c SIN.c Skeleton.c XWindow.c Text.c -EXTRA_DIST = lcd4linux.conf.sample lcd4kde.conf lcd4linux.kdelnk lcd4linux.xpm lcd4linux.lsm CREDITS FAQ NEWS TODO README README.Drivers README.MatrixOrbital README.HD44780 README.HD44780.GPO README.Crystalfontz README.X11 README.KDE README.Raster README.Png README.Webinterface README.Text +EXTRA_DIST = lcd4linux.conf.sample lcd4kde.conf lcd4linux.kdelnk lcd4linux.xpm lcd4linux.lsm AUTHORS CREDITS FAQ NEWS TODO README README.Drivers README.MatrixOrbital README.HD44780 README.HD44780.GPO README.Crystalfontz README.X11 README.KDE README.Raster README.Png README.Webinterface README.Text ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -108,8 +108,8 @@ CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = README ./stamp-h.in COPYING INSTALL Makefile.am \ -Makefile.in NEWS TODO acconfig.h aclocal.m4 config.h.in configure \ +DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ +Makefile.am Makefile.in NEWS TODO aclocal.m4 config.h.in configure \ configure.in install-sh missing mkinstalldirs @@ -133,7 +133,7 @@ all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .o .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ @@ -162,7 +162,7 @@ $(srcdir)/config.h.in: $(srcdir)/stamp-h.in rm -f $(srcdir)/stamp-h.in; \ $(MAKE) $(srcdir)/stamp-h.in; \ else :; fi -$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h +$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOHEADER) @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null @@ -291,7 +291,7 @@ distdir: $(DISTFILES) top_distdir=`cd $(distdir) && pwd`; \ distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/acconfig.h b/acconfig.h deleted file mode 100644 index 6e35fbb..0000000 --- a/acconfig.h +++ /dev/null @@ -1,72 +0,0 @@ -/* Define if you want the Beckmann&Egle driver compiled */ -#undef WITH_BECKMANNEGLE - -/* Define if you want the Crystalfontz driver compiled */ -#undef WITH_CRYSTALFONTZ - -/* Define if you want the Cwlinux driver compiled */ -#undef WITH_CWLINUX - -/* Define if you want the HD44780 driver compiled */ -#undef WITH_HD44780 - -/* Define if you want the M50530 driver compiled */ -#undef WITH_M50530 - -/* Define if you want the T6963 driver compiled */ -#undef WITH_T6963 - -/* Define if you want the USBLCD driver compiled */ -#undef WITH_USBLCD - -/* Define if you want the Matrix Orbital driver compiled */ -#undef WITH_MATRIXORBITAL - -/* Define if you want the PalmPilot driver compiled */ -#undef WITH_PALMPILOT - -/* Define if you want the PNG Raster driver compiled */ -#undef WITH_PNG - -/* Define if you want the PPM Raster driver compiled */ -#undef WITH_PPM - -/* Define if you want the SIN Router driver compiled */ -#undef WITH_SIN - -/* Define if you want the Skeleton driver compiled */ -#undef WITH_SKELETON - -/* Define if you want the Text driver compiled */ -#undef WITH_TEXT - -/* Define if you want the X11 driver compiled */ -#undef WITH_X11 - -/*=== Curses version detection defines ===*/ -/* Found some version of curses that we're going to use */ -#undef HAS_CURSES - -/* Use SunOS SysV curses? */ -#undef USE_SUNOS_CURSES - -/* Use old BSD curses - not used right now */ -#undef USE_BSD_CURSES - -/* Use SystemV curses? */ -#undef USE_SYSV_CURSES - -/* Use Ncurses? */ -#undef USE_NCURSES - -/* If you Curses does not have color define this one */ -#undef NO_COLOR_CURSES - -/* Define if you want to turn on SCO-specific code */ -#undef SCO_FLAVOR - -/* Set to reflect version of ncurses * - * 0 = version 1.* - * 1 = version 1.9.9g - * 2 = version 4.0/4.1 */ -#undef NCURSES_970530 diff --git a/aclocal.m4 b/aclocal.m4 index 964b7ac..b9440d0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p6 +dnl aclocal.m4t generated automatically by aclocal 1.4-p6 dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation diff --git a/config.h.in b/config.h.in index 7bc97bb..d44ff98 100644 --- a/config.h.in +++ b/config.h.in @@ -1,76 +1,7 @@ /* config.h.in. Generated from configure.in by autoheader. */ -/* Define if you want the Beckmann&Egle driver compiled */ -#undef WITH_BECKMANNEGLE - -/* Define if you want the Crystalfontz driver compiled */ -#undef WITH_CRYSTALFONTZ - -/* Define if you want the Cwlinux driver compiled */ -#undef WITH_CWLINUX - -/* Define if you want the HD44780 driver compiled */ -#undef WITH_HD44780 - -/* Define if you want the M50530 driver compiled */ -#undef WITH_M50530 - -/* Define if you want the T6963 driver compiled */ -#undef WITH_T6963 - -/* Define if you want the USBLCD driver compiled */ -#undef WITH_USBLCD - -/* Define if you want the Matrix Orbital driver compiled */ -#undef WITH_MATRIXORBITAL - -/* Define if you want the PalmPilot driver compiled */ -#undef WITH_PALMPILOT - -/* Define if you want the PNG Raster driver compiled */ -#undef WITH_PNG - -/* Define if you want the PPM Raster driver compiled */ -#undef WITH_PPM -/* Define if you want the SIN Router driver compiled */ -#undef WITH_SIN - -/* Define if you want the Skeleton driver compiled */ -#undef WITH_SKELETON - -/* Define if you want the Text driver compiled */ -#undef WITH_TEXT - -/* Define if you want the X11 driver compiled */ -#undef WITH_X11 - -/*=== Curses version detection defines ===*/ /* Found some version of curses that we're going to use */ #undef HAS_CURSES - -/* Use SunOS SysV curses? */ -#undef USE_SUNOS_CURSES - -/* Use old BSD curses - not used right now */ -#undef USE_BSD_CURSES - -/* Use SystemV curses? */ -#undef USE_SYSV_CURSES - -/* Use Ncurses? */ -#undef USE_NCURSES - -/* If you Curses does not have color define this one */ -#undef NO_COLOR_CURSES - -/* Define if you want to turn on SCO-specific code */ -#undef SCO_FLAVOR - -/* Set to reflect version of ncurses * - * 0 = version 1.* - * 1 = version 1.9.9g - * 2 = version 4.0/4.1 */ -#undef NCURSES_970530 /* Define to 1 if you have the header file. */ #undef HAVE_ASM_IO_H @@ -186,6 +117,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Set to reflect version of ncurses */ +#undef NCURSES_970530 + +/* If you Curses does not have color define this one */ +#undef NO_COLOR_CURSES + /* Name of package */ #undef PACKAGE @@ -207,6 +144,9 @@ /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE +/* Define if you want to turn on SCO-specific code */ +#undef SCO_FLAVOR + /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS @@ -216,9 +156,63 @@ /* Define to 1 if your declares `struct tm'. */ #undef TM_IN_SYS_TIME +/* Use Ncurses? */ +#undef USE_NCURSES + +/* Use SunOS SysV curses? */ +#undef USE_SUNOS_CURSES + +/* Use SystemV curses? */ +#undef USE_SYSV_CURSES + /* Version number of package */ #undef VERSION +/* junk */ +#undef WITH_BECKMANNEGLE + +/* junk */ +#undef WITH_CRYSTALFONTZ + +/* junk */ +#undef WITH_CWLINUX + +/* junk */ +#undef WITH_HD44780 + +/* junk */ +#undef WITH_M50530 + +/* junk */ +#undef WITH_MATRIXORBITAL + +/* junk */ +#undef WITH_PALMPILOT + +/* junk */ +#undef WITH_PNG + +/* junk */ +#undef WITH_PPM + +/* junk */ +#undef WITH_SIN + +/* junk */ +#undef WITH_SKELETON + +/* junk */ +#undef WITH_T6963 + +/* junk */ +#undef WITH_TEXT + +/* junk */ +#undef WITH_USBLCD + +/* junk */ +#undef WITH_X11 + /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING 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 . # # 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 #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 . _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 $@ @@ -1239,6 +1246,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + + + @@ -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 < @@ -3185,7 +3231,7 @@ cat > conftest.$ac_ext <&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 diff --git a/curses.m4 b/curses.m4 index a1e6857..5d30fe6 100644 --- a/curses.m4 +++ b/curses.m4 @@ -1,5 +1,4 @@ dnl Curses detection: Munged from Midnight Commander's configure.in -dnl stolen from pinfo/macros dnl dnl What it does: dnl ============= @@ -7,16 +6,16 @@ dnl dnl - Determine which version of curses is installed on your system dnl and set the -I/-L/-l compiler entries and add a few preprocessor dnl symbols -dnl - Do an AC_SUBST on the CURSES_INCLUDES and CURSES_LIBS so that -dnl @CURSES_INCLUDES@ and @CURSES_LIBS@ will be available in +dnl - Do an AC_SUBST on the CURSES_INCLUDEDIR and CURSES_LIBS so that +dnl @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in dnl Makefile.in's dnl - Modify the following configure variables (these are the only dnl curses.m4 variables you can access from within configure.in) -dnl CURSES_INCLUDES - contains -I's and possibly -DRENAMED_CURSES if +dnl CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if dnl an ncurses.h that's been renamed to curses.h dnl is found. dnl CURSES_LIBS - sets -L and -l's appropriately -dnl CPPFLAGS - if --with-sco, add -D_SVID3 +dnl CFLAGS - if --with-sco, add -D_SVID3 dnl has_curses - exports result of tests to rest of configure dnl dnl Usage: @@ -32,7 +31,7 @@ dnl #else dnl #include dnl #endif dnl -dnl 4) Make sure to add @CURSES_INCLUDES@ to your preprocessor flags +dnl 4) Make sure to add @CURSES_INCLUDEDIR@ to your preprocessor flags dnl 5) Make sure to add @CURSES_LIBS@ to your linker flags or LIBS dnl dnl Notes with automake: @@ -40,7 +39,7 @@ dnl - call AM_CONDITIONAL(HAS_CURSES, test "$has_curses" = true) from dnl configure.in dnl - your Makefile.am can look something like this dnl ----------------------------------------------- -dnl INCLUDES= blah blah blah $(CURSES_INCLUDES) +dnl INCLUDES= blah blah blah $(CURSES_INCLUDEDIR) dnl if HAS_CURSES dnl CURSES_TARGETS=name_of_curses_prog dnl endif @@ -87,7 +86,7 @@ dnl /*=== End new stuff for acconfig.h ===*/ dnl -AC_DEFUN(AC_CHECK_CURSES,[ +AC_DEFUN([AC_CHECK_CURSES],[ search_ncurses=true screen_manager="" has_curses=false @@ -95,13 +94,13 @@ AC_DEFUN(AC_CHECK_CURSES,[ CFLAGS=${CFLAGS--O} AC_SUBST(CURSES_LIBS) - AC_SUBST(CURSES_INCLUDES) + AC_SUBST(CURSES_INCLUDEDIR) AC_ARG_WITH(sco, [ --with-sco Use this to turn on SCO-specific code],[ if test x$withval = xyes; then - AC_DEFINE(SCO_FLAVOR) - CPPFLAGS="$CPPFLAGS -D_SVID3" + AC_DEFINE(SCO_FLAVOR,1,[Define if you want to turn on SCO-specific code]) + CFLAGS="$CFLAGS -D_SVID3" fi ]) @@ -122,7 +121,7 @@ AC_DEFUN(AC_CHECK_CURSES,[ AC_ARG_WITH(vcurses, [ --with-vcurses[=incdir] Used to force SysV curses], if test x$withval != xyes; then - CURSES_INCLUDES="-I$withval" + CURSES_INCLUDEDIR="-I$withval" fi AC_USE_SYSV_CURSES ) @@ -133,13 +132,12 @@ AC_DEFUN(AC_CHECK_CURSES,[ 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" - AC_DEFINE(USE_NCURSES) - AC_DEFINE(HAS_CURSES) + AC_DEFINE(USE_NCURSES,1,[Use Ncurses?]) + AC_DEFINE(HAS_CURSES,1,[Found some version of curses that we're going to use]) has_curses=true - use_ncurses=true fi ) @@ -147,40 +145,41 @@ AC_DEFUN(AC_CHECK_CURSES,[ then AC_SEARCH_NCURSES() fi - + + ]) -AC_DEFUN(AC_USE_SUNOS_CURSES, [ +AC_DEFUN([AC_USE_SUNOS_CURSES], [ search_ncurses=false screen_manager="SunOS 4.x /usr/5include curses" AC_MSG_RESULT(Using SunOS 4.x /usr/5include curses) - AC_DEFINE(USE_SUNOS_CURSES) - AC_DEFINE(HAS_CURSES) + AC_DEFINE(USE_SUNOS_CURSES,1,[Use SunOS SysV curses?]) + AC_DEFINE(HAS_CURSES,1,[Found some version of curses that we're going to use]) has_curses=true - AC_DEFINE(NO_COLOR_CURSES) - AC_DEFINE(USE_SYSV_CURSES) - CURSES_INCLUDES="-I/usr/5include" + AC_DEFINE(NO_COLOR_CURSES,1,[If you Curses does not have color define this one]) + AC_DEFINE(USE_SYSV_CURSES,1,[Use SystemV curses?]) + CURSES_INCLUDEDIR="-I/usr/5include" CURSES_LIBS="/usr/5lib/libcurses.a /usr/5lib/libtermcap.a" AC_MSG_RESULT(Please note that some screen refreshs may fail) ]) -AC_DEFUN(AC_USE_OSF1_CURSES, [ +AC_DEFUN([AC_USE_OSF1_CURSES], [ AC_MSG_RESULT(Using OSF1 curses) search_ncurses=false screen_manager="OSF1 curses" - AC_DEFINE(HAS_CURSES) + AC_DEFINE(HAS_CURSES,1,[Found some version of curses that we're going to use]) has_curses=true - AC_DEFINE(NO_COLOR_CURSES) - AC_DEFINE(USE_SYSV_CURSES) + AC_DEFINE(NO_COLOR_CURSES,1,[If you Curses does not have color define this one]) + AC_DEFINE(USE_SYSV_CURSES,1,[Use SystemV curses?]) CURSES_LIBS="-lcurses" ]) -AC_DEFUN(AC_USE_SYSV_CURSES, [ +AC_DEFUN([AC_USE_SYSV_CURSES], [ AC_MSG_RESULT(Using SysV curses) - AC_DEFINE(HAS_CURSES) + AC_DEFINE(HAS_CURSES,1,[Found some version of curses that we're going to use]) has_curses=true - AC_DEFINE(USE_SYSV_CURSES) + AC_DEFINE(USE_SYSV_CURSES,1,[Use SystemV curses?]) search_ncurses=false screen_manager="SysV/curses" CURSES_LIBS="-lcurses" @@ -198,38 +197,37 @@ dnl THIS_CURSES=curses dnl fi dnl dnl CURSES_LIBS="-l$THIS_CURSES -ltermcap" -dnl AC_DEFINE(HAS_CURSES) +dnl AC_DEFINE(HAS_CURSES,1,[Found some version of curses that we're going to use]) dnl has_curses=true -dnl AC_DEFINE(USE_BSD_CURSES) +dnl AC_DEFINE(USE_BSD_CURSES,1,[Use old BSD curses - not used right now]) dnl AC_MSG_RESULT(Please note that some screen refreshs may fail) -dnl AC_WARN(Use of the bsdcurses extension has some) -dnl AC_WARN(display/input problems.) -dnl AC_WARN(Reconsider using xcurses) +dnl AC_MSG_WARN(Use of the bsdcurses extension has some) +dnl AC_MSG_WARN(display/input problems.) +dnl AC_MSG_WARN(Reconsider using xcurses) dnl) dnl -dnl Parameters: directory filename cureses_LIBS curses_INCLUDES nicename +dnl Parameters: directory filename cureses_LIBS curses_INCLUDEDIR nicename dnl -AC_DEFUN(AC_NCURSES, [ +AC_DEFUN([AC_NCURSES], [ if $search_ncurses then if test -f $1/$2 then AC_MSG_RESULT(Found ncurses on $1/$2) CURSES_LIBS="$3" - CURSES_INCLUDES="$4" + CURSES_INCLUDEDIR="$4" search_ncurses=false screen_manager=$5 - AC_DEFINE(HAS_CURSES) + AC_DEFINE(HAS_CURSES,1,[Found some version of curses that we're going to use]) has_curses=true - AC_DEFINE(USE_NCURSES) - use_ncurses=true + AC_DEFINE(USE_NCURSES,1,[Use Ncurses?]) fi fi ]) -AC_DEFUN(AC_SEARCH_NCURSES, [ +AC_DEFUN([AC_SEARCH_NCURSES], [ AC_CHECKING("location of ncurses.h file") AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include") @@ -255,11 +253,10 @@ AC_DEFUN(AC_SEARCH_NCURSES, [ USE_NCURSES #endif ],[ - CURSES_INCLUDES="$CURSES_INCLUDES -DRENAMED_NCURSES" - AC_DEFINE(HAS_CURSES) + CURSES_INCLUDEDIR="$CURSES_INCLUDEDIR -DRENAMED_NCURSES" + AC_DEFINE(HAS_CURSES,1,[Found some version of curses that we're going to use]) has_curses=true - AC_DEFINE(USE_NCURSES) - use_ncurses=true + AC_DEFINE(USE_NCURSES,1,[Use Ncurses?]) search_ncurses=false screen_manager="ncurses installed as curses" ]) @@ -291,7 +288,7 @@ cat > conftest.$ac_ext <&AC_FD_CC | + if (eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC | egrep "VERSION:" >conftest.out 2>&1; then changequote(,)dnl ncurses_version=`cat conftest.out|sed -e 's/^[^"]*"//' -e 's/".*//'` @@ -303,15 +300,19 @@ changequote([,])dnl changequote(,)dnl 4.[01]) changequote([,])dnl - AC_DEFINE(NCURSES_970530,2) + AC_DEFINE(NCURSES_970530,2,[Set to reflect version of ncurses]) ;; 1.9.9g) - AC_DEFINE(NCURSES_970530,1) + AC_DEFINE(NCURSES_970530,1,[Set to reflect version of ncurses]) ;; 1*) - AC_DEFINE(NCURSES_970530,0) + AC_DEFINE(NCURSES_970530,0,[Set to reflect version of ncurses]) ;; esac fi ]) + + + + diff --git a/depcomp b/depcomp new file mode 100644 index 0000000..e69de29 -- cgit v1.2.3