diff -urN --exclude=configure --exclude=Makefile flash-0.9.5/Makefile.in flash-0.9.5-rs/Makefile.in --- flash-0.9.5/Makefile.in Sun Nov 11 11:05:28 2001 +++ flash-0.9.5-rs/Makefile.in Wed Nov 14 08:39:45 2001 @@ -32,7 +32,7 @@ CC = @CC@ DEBUG = -g CPPFLAGS = -DHAVE_CONFIG_H -DPREFIX=\"$(EXEC_PREFIX)\" -DDONT_HIGHLIGHT_WITH_REVERSE -CFLAGS = -O2 $(CPPFLAGS) $(DEBUG) -rdynamic +CFLAGS = -O2 $(CPPFLAGS) @NCURSES_INCLUDE@ $(DEBUG) -rdynamic # For Solaris users please use the next 2 lines instead. #CPPFLAGS = -DHAVE_CONFIG_H -DPREFIX=\"$(EXEC_PREFIX)\" -DDONT_HIGHLIGHT_WITH_REVERSE -DSOLARIS #CFLAGS = -O2 $(CPPFLAGS) $(DEBUG) @@ -40,7 +40,7 @@ # Comment out for Solaris LDFLAGS = -rdynamic -LIBRARIES = -lncurses -ldl +LIBRARIES = @NCURSES_LIBS@ -lncurses -ldl # For Solaris: #LIBRARIES = -lcurses -ldl diff -urN --exclude=configure --exclude=Makefile flash-0.9.5/configure.in flash-0.9.5-rs/configure.in --- flash-0.9.5/configure.in Sat Nov 3 19:09:21 2001 +++ flash-0.9.5-rs/configure.in Wed Nov 14 08:45:33 2001 @@ -10,6 +10,24 @@ dnl Checks for libraries. dnl Replace `main' with a function in -ldl: AC_CHECK_LIB(dl, main) + +dnl Check for alternative path to libncurses +AC_ARG_WITH(ncurses-path, + [ --with-ncurses-path Path to an alternative ncurses location.],, + [with_ncurses_path=''] +) + +AC_MSG_CHECKING(for system or alternative ncurses) +if test x$with_ncurses_path != x ; then + AC_MSG_RESULT(alternative) + AC_SUBST(NCURSES_INCLUDE) + NCURSES_INCLUDE="-I$with_ncurses_path/include" + AC_SUBST(NCURSES_LIBS) + NCURSES_LIBS="-L$with_ncurses_path/lib" +else + AC_MSG_RESULT(system) +fi + dnl Replace `main' with a function in -lncurses: AC_CHECK_LIB(ncurses, main) diff -urN --exclude=configure --exclude=Makefile flash-0.9.5/exec.c flash-0.9.5-rs/exec.c --- flash-0.9.5/exec.c Sun Nov 4 01:10:09 2001 +++ flash-0.9.5-rs/exec.c Wed Nov 14 08:58:24 2001 @@ -38,7 +38,6 @@ #include #include #include -#include #include "exec.h" #include "misc.h" diff -urN --exclude=configure --exclude=Makefile flash-0.9.5/install-sh flash-0.9.5-rs/install-sh --- flash-0.9.5/install-sh Thu Jan 1 01:00:00 1970 +++ flash-0.9.5-rs/install-sh Wed Nov 14 09:35:52 2001 @@ -0,0 +1 @@ +#!/bin/bash diff -urN --exclude=configure --exclude=Makefile flash-0.9.5/modules/Makefile.in flash-0.9.5-rs/modules/Makefile.in --- flash-0.9.5/modules/Makefile.in Sat Nov 3 19:09:21 2001 +++ flash-0.9.5-rs/modules/Makefile.in Wed Nov 14 08:49:20 2001 @@ -1,7 +1,7 @@ CC = gcc DEBUG = -g -CFLAGS = $(DEBUG) -O3 -fpic -shared -Wall -LDFLAGS = -shared +CFLAGS = $(DEBUG) @NCURSES_INCLUDE@ -O3 -fpic -shared -Wall +LDFLAGS = -shared @NCURSES_LIBS@ OBJECTS = countdown background alarms Binary files flash-0.9.5/modules/alarms and flash-0.9.5-rs/modules/alarms differ diff -urN --exclude=configure --exclude=Makefile flash-0.9.5/modules/alarms.c flash-0.9.5-rs/modules/alarms.c --- flash-0.9.5/modules/alarms.c Sat Nov 3 19:09:21 2001 +++ flash-0.9.5-rs/modules/alarms.c Wed Nov 14 08:58:01 2001 @@ -3,7 +3,6 @@ #include #include -#include #include #include #include Binary files flash-0.9.5/modules/background and flash-0.9.5-rs/modules/background differ Binary files flash-0.9.5/modules/countdown and flash-0.9.5-rs/modules/countdown differ diff -urN --exclude=configure --exclude=Makefile flash-0.9.5/screen.h flash-0.9.5-rs/screen.h --- flash-0.9.5/screen.h Sat Nov 3 19:09:21 2001 +++ flash-0.9.5-rs/screen.h Wed Nov 14 08:58:41 2001 @@ -2,7 +2,6 @@ # define _SCREEN_H #include "parse.h" -#include #include void init_scr(); Binary files flash-0.9.5/screens/nc_about.o and flash-0.9.5-rs/screens/nc_about.o differ diff -urN --exclude=configure --exclude=Makefile flash-0.9.5/screens/nc_init.c flash-0.9.5-rs/screens/nc_init.c --- flash-0.9.5/screens/nc_init.c Sat Nov 3 19:09:21 2001 +++ flash-0.9.5-rs/screens/nc_init.c Wed Nov 14 08:58:12 2001 @@ -34,7 +34,6 @@ #endif #include -#include #include #include #include Binary files flash-0.9.5/screens/nc_init.o and flash-0.9.5-rs/screens/nc_init.o differ Binary files flash-0.9.5/screens/nc_job.o and flash-0.9.5-rs/screens/nc_job.o differ Binary files flash-0.9.5/screens/nc_lock.o and flash-0.9.5-rs/screens/nc_lock.o differ Binary files flash-0.9.5/screens/nc_menus.o and flash-0.9.5-rs/screens/nc_menus.o differ Binary files flash-0.9.5/screens/nc_misc.o and flash-0.9.5-rs/screens/nc_misc.o differ Binary files flash-0.9.5/screens/nc_module.o and flash-0.9.5-rs/screens/nc_module.o differ diff -urN --exclude=configure --exclude=Makefile flash-0.9.5/string.h flash-0.9.5-rs/string.h --- flash-0.9.5/string.h Sat Nov 3 19:09:21 2001 +++ flash-0.9.5-rs/string.h Wed Nov 14 08:58:47 2001 @@ -2,7 +2,6 @@ # define __STRING_H #include -#include #define CR '\n' #define TAB '\t'