Tue Dec 29 18:11:28 1998 Elena Zannoni <ezannoni@kwikemart.cygnus.com>

	* configure.in: added tests for cross-build for Cygwin.

2 files changed, 151 insertions, 51 deletions

diff --git a/readline/ChangeLog b/readline/ChangeLog
index 3a1432c..15c1a27 100644
--- a/readline/ChangeLog
+++ b/readline/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 29 18:11:28 1998  Elena Zannoni  <ezannoni@kwikemart.cygnus.com>
+
+	* configure.in: added tests for cross-build for Cygwin.
+
 1998-12-24  Jason Molenda  (jsm@bugshack.cygnus.com)
 
 	* Makefile.in: Add CYGNUS LOCAL comment.
diff --git a/readline/configure.in b/readline/configure.in
index 981c78f..e9eb1db 100644
--- a/readline/configure.in
+++ b/readline/configure.in
@@ -1,55 +1,151 @@
-# This file is a shell script fragment that supplies the information
-# necessary to tailor a template configure script into the configure
-# script appropriate for this directory.  For more information, check
-# any existing configure script.
-
-configdirs=doc
-srctrigger=readline.c
-srcname="the readline library"
-
-# per-host:
-
-files=sysdep-norm.h
-links=sysdep.h
-
-case "${host}" in
-  *-*-irix*)		host_makefile_frag=config/mh-sysv; files=sysdep-irix.h;;
-  i[345]86-ncr-sysv4*)	host_makefile_frag=config/mh-ncr3000 ;;
-# Using sysdep-norm.h is harmful because termio.h defines VWERASE even though
-# c_cc is too small for it (VWERASE is for termios).
-# The problem with _POSIX_SOURCE is said not to be a problem after all.
-#  m88k-*-sysv4*)	host_makefile_frag=config/mh-sysv ;
-			# defining POSIX_SOURCE causes stack_t to be undefined
-			# even though it's used in <setjmp.h>
-#			files=sysdep-norm.h ;;
-  m88*-harris-cxux7*)	host_makefile_frag=config/mh-sysv4 ; files=sysdep-cxux7.h ;;
-  *-*-sysv4*)		host_makefile_frag=config/mh-sysv4 ; files=sysdep-sysv4.h ;;
-  *-*-solaris2*)	host_makefile_frag=config/mh-sysv4 ;;
-  i[345]86-*-sco3.2v[45]*)	host_makefile_frag=config/mh-sco4; files=sysdep-sco.h ;;
-  i[345]86-*-sco*)	host_makefile_frag=config/mh-sco; files=sysdep-sco.h ;;
-# Don't use this; ISC 4.0 only supports POSIX features if you link with
-# -lcposix.  No thanks.
-#  i[345]86-*-isc*)	host_makefile_frag=config/mh-isc ;;
-  i[345]86-*-isc*)	host_makefile_frag=config/mh-sysv ;;
-  *-*-go32)		host_makefile_frag=config/mh-go32 ;;
-  m68k-apollo-sysv*)	host_makefile_frag=config/mh-apollo68v ;;    
-  *-*-sysv*)		host_makefile_frag=config/mh-sysv ;;
-  *-*-m88kbcs*)		host_makefile_frag=config/mh-sysv ;;
-  i[345]86-*-linux*)	host_makefile_frag=config/mh-posix ;;
-  powerpc-ibm-aix*)	host_makefile_frag=config/mh-sysv; files=sysdep-aix.h ;;
-  rs6000-ibm-aix*)	host_makefile_frag=config/mh-sysv; files=sysdep-aix.h ;;
-  rs6000-bull-bosx*)	host_makefile_frag=config/mh-sysv; files=sysdep-aix.h ;;
-  *-ibm-aix*)		host_makefile_frag=config/mh-sysv ;;
-  m68k-sony-news*)					files=sysdep-obsd.h ;;
-  *-*-bsd*)						files=sysdep-obsd.h ;;
-  *-*-mach*)						files=sysdep-obsd.h ;;
-  *-*-sunos3*)						files=sysdep-obsd.h ;;
-# Using termios on SunOS is necessary to save and restore cs7 versus cs8.
-  *-*-sunos4.1*)	host_makefile_frag=config/mh-posix ;;
-  *-*-ultrix2*)						files=sysdep-obsd.h ;;
-  *-*-riscos*)		host_makefile_frag=config/mh-sysv ;;
+dnl
+dnl Configure script for readline library
+dnl
+dnl report bugs to chet@po.cwru.edu
+dnl
+dnl Process this file with autoconf to produce a configure script.
+AC_REVISION([for Readline 2.2, version 2.07, from autoconf version] AC_ACVERSION)
+LIBVERSION=2.2
+
+AC_INIT(readline.h)
+AC_CONFIG_HEADER(config.h)
+
+dnl make sure we are using a recent autoconf version
+AC_PREREQ(2.10)
+
+AC_CONFIG_AUX_DIR(./support)
+
+AC_CANONICAL_HOST
+
+dnl configure defaults
+opt_curses=no
+opt_shared=no
+
+dnl arguments to configure
+AC_ARG_WITH(curses, --with-curses               use the curses library instead of the termcap library,opt_curses=$withval)
+
+if test "$opt_curses" = "yes"; then
+	prefer_curses=yes
+fi
+
+# We want these before the checks, so the checks can modify their values.
+test -z "$CFLAGS" && CFLAGS=-g auto_cflags=1
+
+AC_PROG_CC
+AC_MINIX
+
+
+dnl BEGIN changes for CYGNUS cross-building for Cygwin
+ 
+dnl load up the cross-building cache file -- add more cases and cache
+dnl files as necessary
+if test "x$cross_compiling" = "xyes"; then
+    case "${host}" in
+    *-cygwin*)
+        cross_cache=${srcdir}/cross-build/cygwin.cache
+        if test -r "${cross_cache}"; then
+            echo "loading cross-build cache file ${cross_cache}"
+            . ${cross_cache}
+        fi
+        unset cross_cache
+        ;;
+    *)  echo "configure: cross-compiling for a non-cygwin target is not supported" >&
+2
+        ;;
+    esac
+fi
+ 
+if test "x$cross_compiling" = "xyes"; then
+  CROSS_COMPILING_FLAG=-DCROSS_COMPILING
+else
+  CROSS_COMPILING_FLAG=
+fi
+AC_SUBST(CROSS_COMPILING_FLAG)
+ 
+if test -z "$CC_FOR_BUILD"; then
+    if test "x$cross_compiling" = "xno"; then
+        CC_FOR_BUILD='$(CC)'
+    else
+        CC_FOR_BUILD=gcc
+    fi
+fi
+AC_SUBST(CC_FOR_BUILD)
+ 
+dnl END changes for CYGNUS cross-building for Cygwin
+
+
+
+# If we're using gcc and the user hasn't specified CFLAGS, add -O to CFLAGS.
+test -n "$GCC" && test -n "$auto_cflags" && CFLAGS="$CFLAGS -O"
+
+AC_PROG_GCC_TRADITIONAL
+AC_PROG_INSTALL
+AC_PROG_RANLIB
+
+AC_RETSIGTYPE
+
+AC_HEADER_STAT
+AC_HEADER_DIRENT
+
+AC_CHECK_FUNCS(strcasecmp select setenv putenv tcgetattr setlocale lstat)
+
+AC_FUNC_STRCOLL
+
+AC_CHECK_HEADERS(unistd.h stdlib.h varargs.h stdarg.h string.h \
+		sys/ptem.h sys/pte.h sys/stream.h sys/select.h \
+		termcap.h termios.h termio.h sys/file.h locale.h)
+
+BASH_SIGNAL_CHECK
+BASH_REINSTALL_SIGHANDLERS
+
+BASH_FUNC_POSIX_SETJMP
+BASH_FUNC_LSTAT
+BASH_CHECK_GETPW_FUNCS
+BASH_FUNC_STRCOLL
+
+BASH_TYPE_SIGHANDLER
+BASH_HAVE_TIOCGWINSZ
+BASH_HAVE_TIOCSTAT
+BASH_HAVE_FIONREAD
+BASH_MISC_SPEED_T
+BASH_STRUCT_WINSIZE
+BASH_STRUCT_DIRENT_D_INO
+BASH_STRUCT_DIRENT_D_FILENO
+
+dnl yuck
+case "$host_os" in
+aix*)   prefer_curses=yes ;;
 esac
+BASH_CHECK_LIB_TERMCAP
+if test "$TERMCAP_LIB" = "./lib/termcap/libtermcap.a"; then
+	TERMCAP_LIB=-ltermcap	#default
+fi
+
+case "$host_cpu" in
+*cray*)	LOCAL_CFLAGS=-DCRAY ;;
+esac
+
+case "$host_os" in
+isc*)	LOCAL_CFLAGS=-Disc386 ;;
+esac
+
+BUILD_DIR=`pwd`
+AC_SUBST(BUILD_DIR)
+
+AC_SUBST(CFLAGS)
+AC_SUBST(LOCAL_CFLAGS)
+AC_SUBST(LOCAL_LDFLAGS)
+AC_SUBST(LOCAL_DEFS)
+
+AC_SUBST(host_cpu)
+AC_SUBST(host_os)
 
-# per-target:
+AC_SUBST(LIBVERSION)
 
+AC_SUBST(TERMCAP_LIB)
 
+AC_OUTPUT([Makefile doc/Makefile examples/Makefile],
+[
+# Makefile uses this timestamp file to record whether config.h is up to date.
+echo > stamp-h
+])