about summary refs log tree commit diff stats
path: root/configure.in
diff options
context:
space:
mode:
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in163
1 files changed, 88 insertions, 75 deletions
diff --git a/configure.in b/configure.in
index d2e54ee7..da041af3 100644
--- a/configure.in
+++ b/configure.in
@@ -7,10 +7,19 @@ AC_PREREQ(2.12.971222)
 rm -f config.cache
 
 AC_INIT(userdefs.h)
-AC_CONFIG_HEADER(lynx_cfg.h:config.hin)
+CONFIG_H=lynx_cfg.h
+AC_CONFIG_HEADER($CONFIG_H:config.hin)
 
 CF_CHECK_CACHE
 
+PACKAGE=lynx
+VERSION=2.8.3
+
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+AC_SUBST(DESTDIR)
+AC_SUBST(CONFIG_H)
+
 dnl Set of available languages (based on source distribution)
 test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
@@ -107,84 +116,12 @@ fi
 fi
 
 dnl --------------------------------------------------------------------------
-dnl --------------------------------------------------------------------------
-
-CF_HELP_MESSAGE(
-Basic Configuration Options:)
-
-dnl internationalization macros
-CF_BUNDLED_INTL(makefile)
-
-INTLDIR_CPPFLAGS="#"
-if test -z "$INTLDIR_MAKE" ; then
-	INTLDIR_CPPFLAGS=
-fi
-
-AC_SUBST(INTLDIR_CPPFLAGS)
-
-CF_WITH_PATH(nls-datadir,
-[  --with-nls-datadir=DIR  NLS data, parent of locale],
-NLS_DATADIR,
-[PREFIX/DATADIR],
-[$prefix/$DATADIRNAME])
-
-AC_MSG_CHECKING(if you want full utility pathnames)
-CF_ARG_DISABLE(full-paths,
-	[  --disable-full-paths    control whether full utility pathnames are used],
-	[with_full_paths=no],
-	[with_full_paths=yes])
-AC_MSG_RESULT($with_full_paths)
-test $with_full_paths = no && AC_DEFINE(USE_EXECVP)
-
-CF_DEFINE_PROG(system mailer, SYSTEM_MAIL,
-	/usr/mmdf/bin/submit \
-	/usr/sbin/sendmail \
-	/usr/lib/sendmail  \
-	)
-CF_SYSTEM_MAIL_FLAGS
-
-CF_PATH_PROG(CHMOD,	chmod)
-CF_PATH_PROG(COMPRESS,	compress)
-CF_PATH_PROG(COPY,	cp)
-CF_PATH_PROG(GZIP,	gzip)
-CF_PATH_PROG(MKDIR,	mkdir)
-CF_PATH_PROG(MV,	mv)
-CF_PATH_PROG(RM,	rm)
-CF_PATH_PROG(TAR,	tar)
-CF_PATH_PROG(TOUCH,	touch)
-CF_PATH_PROG(UNCOMPRESS,gunzip)
-CF_PATH_PROG(UNZIP,	unzip)
-CF_PATH_PROG(BZIP2,	bzip2)
-CF_PATH_PROG(UUDECODE,	uudecode)
-CF_PATH_PROG(ZCAT,	zcat)
-CF_PATH_PROG(ZIP,	zip)
-CF_PATH_PROG(TELNET,	telnet)
-CF_PATH_PROG(TN3270,	tn3270)
-CF_PATH_PROG(RLOGIN,	rlogin)
-
-dnl 'INSTALL' is a special case, since the configure script has to find a
-dnl BSD-compatible one so the build/install works properly.
-case "$INSTALL" in
-$srcdir*) # (vi
-	AC_DEFINE_UNQUOTED(INSTALL_PATH,"install")
-	;;
-*) # (vi
-	cf_save_INSTALL="$INSTALL"
-	CF_PATH_PROG(INSTALL,	install)
-	INSTALL="$cf_save_INSTALL"
-	;;
-esac
-
-dnl --------------------------------------------------------------------------
 dnl Checks for compiler & standard-library characteristics
 dnl --------------------------------------------------------------------------
 
 dnl If we're able to run this script, this is true!
 AC_DEFINE(UNIX)
 
-if test -z "$GCC" ; then
-	CF_ANSI_CC_CHECK
-fi
 AC_C_CONST
 
 dnl Only add to this case statement things that we cannot design tests for.
@@ -250,6 +187,9 @@ os2*)
 	LDFLAGS=`echo "$LDFLAGS -Zmt -Zcrtdll" | sed "s/-Zexe//g"`
 	PROG_EXT=".exe"
 	;;
+os390)	: ${CFLAGS="-D_ALL_SOURCE -Wl,EDIT=NO"}
+	: ${CC=c89}
+	;;
 osf4*)
 	# The -Olimit flag (see below) is no longer available with
 	# Digital C 5.2, which is bundled with Digital UNIX 4.0.
@@ -305,6 +245,79 @@ ultrix*)
 esac
 AC_SUBST(PROG_EXT)
 
+if test -z "$GCC" ; then
+	CF_ANSI_CC_CHECK
+fi
+
+dnl --------------------------------------------------------------------------
+dnl --------------------------------------------------------------------------
+
+CF_HELP_MESSAGE(
+Basic Configuration Options:)
+
+dnl internationalization macros
+CF_BUNDLED_INTL(makefile)
+
+INTLDIR_CPPFLAGS="#"
+if test -z "$INTLDIR_MAKE" ; then
+	INTLDIR_CPPFLAGS=
+fi
+
+AC_SUBST(INTLDIR_CPPFLAGS)
+
+CF_WITH_PATH(nls-datadir,
+[  --with-nls-datadir=DIR  NLS data, parent of locale],
+NLS_DATADIR,
+[PREFIX/DATADIR],
+[$prefix/$DATADIRNAME])
+
+AC_MSG_CHECKING(if you want full utility pathnames)
+CF_ARG_DISABLE(full-paths,
+	[  --disable-full-paths    control whether full utility pathnames are used],
+	[with_full_paths=no],
+	[with_full_paths=yes])
+AC_MSG_RESULT($with_full_paths)
+test $with_full_paths = no && AC_DEFINE(USE_EXECVP)
+
+CF_DEFINE_PROG(system mailer, SYSTEM_MAIL,
+	/usr/mmdf/bin/submit \
+	/usr/sbin/sendmail \
+	/usr/lib/sendmail  \
+	)
+CF_SYSTEM_MAIL_FLAGS
+
+CF_PATH_PROG(CHMOD,	chmod)
+CF_PATH_PROG(COMPRESS,	compress)
+CF_PATH_PROG(COPY,	cp)
+CF_PATH_PROG(GZIP,	gzip)
+CF_PATH_PROG(MKDIR,	mkdir)
+CF_PATH_PROG(MV,	mv)
+CF_PATH_PROG(RM,	rm)
+CF_PATH_PROG(TAR,	tar)
+CF_PATH_PROG(TOUCH,	touch)
+CF_PATH_PROG(UNCOMPRESS,gunzip)
+CF_PATH_PROG(UNZIP,	unzip)
+CF_PATH_PROG(BZIP2,	bzip2)
+CF_PATH_PROG(UUDECODE,	uudecode)
+CF_PATH_PROG(ZCAT,	zcat)
+CF_PATH_PROG(ZIP,	zip)
+CF_PATH_PROG(TELNET,	telnet)
+CF_PATH_PROG(TN3270,	tn3270)
+CF_PATH_PROG(RLOGIN,	rlogin)
+
+dnl 'INSTALL' is a special case, since the configure script has to find a
+dnl BSD-compatible one so the build/install works properly.
+case "$INSTALL" in
+$srcdir*) # (vi
+	AC_DEFINE_UNQUOTED(INSTALL_PATH,"install")
+	;;
+*) # (vi
+	cf_save_INSTALL="$INSTALL"
+	CF_PATH_PROG(INSTALL,	install)
+	INSTALL="$cf_save_INSTALL"
+	;;
+esac
+
 CF_GNU_SOURCE
 
 dnl Collect tests for compiler options into one place
@@ -376,12 +389,13 @@ esac
 
 case $cf_cv_screen in
 curses)
+	CF_NCURSES_VERSION
 	CF_CURSES_LIBS
 	CF_CURS_PERFORMANCE
 	;;
 ncurses)
-	CF_NCURSES_CPPFLAGS
 	CF_NCURSES_LIBS
+	CF_NCURSES_VERSION
 	;;
 pdcurses)
 	# do this last, since it changes definition of main: CF_PDCURSES_X11
@@ -545,7 +559,6 @@ CF_EBCDIC
 if test $cf_cv_screen != slang ; then
 	CF_ALT_CHAR_SET
 	CF_FANCY_CURSES
-	CF_NCURSES_VERSION
 	CF_NCURSES_BROKEN
 	CF_COLOR_CURSES
 	CF_SIZECHANGE