This commit was generated by cvs2svn to track changes on a CVS vendor

[deliverable/binutils-gdb.git] / readline / configure.in

diff --git a/readline/configure.in b/readline/configure.in
index f977feca3610fbceace6f635652c32bbf3824394..9afdaa70fcfa4a6b5aebc1cc9aa8d85f711dad9a 100644 (file)
--- a/readline/configure.in
+++ b/readline/configure.in
@@ -4,8 +4,8 @@ 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 4.1, version 2.22, from autoconf version] AC_ACVERSION)
-LIBVERSION=4.1
+AC_REVISION([for Readline 4.0, version 2.14, from autoconf version] AC_ACVERSION)
+LIBVERSION=4.0
 
 AC_INIT(readline.h)
 AC_CONFIG_HEADER(config.h)
@@ -13,7 +13,7 @@ AC_CONFIG_HEADER(config.h)
 dnl make sure we are using a recent autoconf version
 AC_PREREQ(2.10)
 
-AC_CONFIG_AUX_DIR(./support)
+dnl AC_CONFIG_AUX_DIR(./support)
 
 AC_CANONICAL_HOST
 
@@ -32,9 +32,46 @@ fi
 test -z "$CFLAGS" && CFLAGS=-g auto_cflags=1
 
 AC_PROG_CC
-dnl AC_AIX
 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
+       LOCAL_CFLAGS="$LOCAL_CFLAGS -I${srcdir}/../libtermcap"
+       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"
 
@@ -54,8 +91,7 @@ AC_RETSIGTYPE
 AC_HEADER_STAT
 AC_HEADER_DIRENT
 
-AC_CHECK_FUNCS(lstat memmove putenv select setenv setlocale \
-               strcasecmp tcgetattr)
+AC_CHECK_FUNCS(strcasecmp select setenv putenv tcgetattr setlocale lstat)
 
 AC_FUNC_STRCOLL
 
@@ -104,7 +140,7 @@ esac
 #
 if test -f ${srcdir}/support/shobj-conf; then
         AC_MSG_CHECKING(configuration for building shared libraries)
-        eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
+        eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C ${CC} -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
         AC_SUBST(SHOBJ_CC)
         AC_SUBST(SHOBJ_CFLAGS)
         AC_SUBST(SHOBJ_LD)
@@ -118,20 +154,9 @@ if test -f ${srcdir}/support/shobj-conf; then
        AC_SUBST(SHLIB_LIBVERSION)
        AC_SUBST(SHLIB_LIBS)
         AC_MSG_RESULT($SHLIB_STATUS)
-
-       # shared library versioning
-       # quoted for m4 so I can use character classes
-       SHLIB_MAJOR=[`expr "$LIBVERSION" : '\([0-9]\)\..*'`]
-       SHLIB_MINOR=[`expr "$LIBVERSION" : '[0-9]\.\([0-9]\).*'`]
-       AC_SUBST(SHLIB_MAJOR)
-       AC_SUBST(SHLIB_MINOR)
 fi
 
-case "$host_os" in
-msdosdjgpp*)   BUILD_DIR=`pwd.exe` ;;  # to prevent //d/path/file
-*)             BUILD_DIR=`pwd` ;;
-esac
-
+BUILD_DIR=`pwd`
 AC_SUBST(BUILD_DIR)
 
 AC_SUBST(CFLAGS)