X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=readline%2Fconfigure.in;h=1ed154e9cf6d98694a53a18ecac4c6b319820515;hb=f3a55c17ebafc898ec87d9473b7a738b25d1011a;hp=931e1b4fcf26ab81359ad3b87a1c63bf15fcc97f;hpb=18ee5bf817e5865cf88144153b7eb3dbdf5ec8ef;p=deliverable%2Fbinutils-gdb.git

diff --git a/readline/configure.in b/readline/configure.in
index 931e1b4fcf..1ed154e9cf 100644
--- 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 2.2, version 2.07, from autoconf version] AC_ACVERSION)
-LIBVERSION=2.2
+AC_REVISION([for Readline 4.1, version 2.22, from autoconf version] AC_ACVERSION)
+LIBVERSION=4.1
 
 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,9 @@ 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
@@ -47,6 +47,7 @@ if test "x$cross_compiling" = "xyes"; 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
@@ -72,21 +73,27 @@ 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_CHECK_PROG(AR, ar, ar)
+dnl Set default for ARFLAGS, since autoconf does not have a macro for it.
+dnl This allows people to set it when running configure or make
+test -n "$ARFLAGS" || ARFLAGS="cr"
 AC_PROG_RANLIB
 
+MAKE_SHELL=/bin/sh
+AC_SUBST(MAKE_SHELL)
+
 AC_RETSIGTYPE
 
 AC_HEADER_STAT
 AC_HEADER_DIRENT
 
-AC_CHECK_FUNCS(strcasecmp select setenv putenv tcgetattr setlocale lstat)
+AC_CHECK_FUNCS(lstat memmove putenv select setenv setlocale \
+		strcasecmp tcgetattr)
 
 AC_FUNC_STRCOLL
 
@@ -122,13 +129,48 @@ fi
 
 case "$host_cpu" in
 *cray*)	LOCAL_CFLAGS=-DCRAY ;;
+*s390*)	LOCAL_CFLAGS=-fsigned-char ;;
 esac
 
 case "$host_os" in
 isc*)	LOCAL_CFLAGS=-Disc386 ;;
 esac
 
-BUILD_DIR=`pwd`
+# shared library configuration section
+#
+# Shared object configuration section.  These values are generated by
+# ${srcdir}/support/shobj-conf
+#
+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}`
+        AC_SUBST(SHOBJ_CC)
+        AC_SUBST(SHOBJ_CFLAGS)
+        AC_SUBST(SHOBJ_LD)
+        AC_SUBST(SHOBJ_LDFLAGS)
+	AC_SUBST(SHOBJ_XLDFLAGS)
+        AC_SUBST(SHOBJ_LIBS)
+        AC_SUBST(SHOBJ_STATUS)
+	AC_SUBST(SHLIB_STATUS)
+	AC_SUBST(SHLIB_XLDFLAGS)
+	AC_SUBST(SHLIB_LIBSUFF)
+	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
+
 AC_SUBST(BUILD_DIR)
 
 AC_SUBST(CFLAGS)
@@ -136,6 +178,9 @@ AC_SUBST(LOCAL_CFLAGS)
 AC_SUBST(LOCAL_LDFLAGS)
 AC_SUBST(LOCAL_DEFS)
 
+AC_SUBST(AR)
+AC_SUBST(ARFLAGS)
+
 AC_SUBST(host_cpu)
 AC_SUBST(host_os)
 
@@ -143,7 +188,7 @@ AC_SUBST(LIBVERSION)
 
 AC_SUBST(TERMCAP_LIB)
 
-AC_OUTPUT([Makefile doc/Makefile examples/Makefile],
+AC_OUTPUT([Makefile doc/Makefile examples/Makefile shlib/Makefile],
 [
 # Makefile uses this timestamp file to record whether config.h is up to date.
 echo > stamp-h