daily update

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

diff --git a/readline/configure.in b/readline/configure.in
index 773f79a56b3212b059300ac4ceb0cffa407c4cb4..33bc2c7a95546bf147909fa6807bf4509d8c21e9 100644 (file)
--- a/readline/configure.in
+++ b/readline/configure.in
@@ -32,9 +32,8 @@ fi
 
 dnl option parsing for optional features
 opt_static_libs=yes
-opt_shared_libs=yes
+opt_shared_libs=no
 
-AC_ARG_ENABLE(shared, AC_HELP_STRING([--enable-shared], [build shared libraries [[default=YES]]]), opt_shared_libs=$enableval)
 AC_ARG_ENABLE(static, AC_HELP_STRING([--enable-static], [build static libraries [[default=YES]]]), opt_static_libs=$enableval)
 
 echo ""
@@ -57,16 +56,22 @@ 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
        ;;
+   *-mingw32*) 
+       cross_cache=${srcdir}/cross-build/mingw.cache
+        ;;
     *)  echo "configure: cross-compiling for a non-cygwin target is not supported" >&2
        ;;
     esac
+
+    if test "x$cross_cache" != "x"; then
+       if test -r "${cross_cache}"; then
+           echo "loading cross-build cache file ${cross_cache}"
+           . ${cross_cache}
+       fi
+       unset cross_cache
+    fi
 fi
  
 if test "x$cross_compiling" = "xyes"; then
@@ -113,14 +118,16 @@ AC_CHECK_TYPE(ssize_t, int)
 AC_HEADER_STAT
 AC_HEADER_DIRENT
 
-AC_CHECK_FUNCS(lstat memmove putenv select setenv setlocale \
-               strcasecmp strpbrk tcgetattr vsnprintf isascii isxdigit)
+AC_CHECK_FUNCS(fcntl kill lstat memmove putenv select setenv setlocale \
+              strcasecmp strpbrk tcgetattr vsnprintf isascii isxdigit \
+               getpwname getpwent getpwuid)
 
 AC_FUNC_STRCOLL
 
 AC_CHECK_HEADERS(unistd.h stdlib.h varargs.h stdarg.h string.h strings.h \
                limits.h sys/ptem.h sys/pte.h sys/stream.h sys/select.h \
-               termcap.h termios.h termio.h sys/file.h locale.h memory.h )
+               termcap.h termios.h termio.h sys/file.h locale.h memory.h \
+                pwd.h)
 
 BASH_SYS_SIGNAL_VINTAGE
 BASH_SYS_REINSTALL_SIGHANDLERS