From f240337a6fd6850c97d153749825fc22c2267b74 Mon Sep 17 00:00:00 2001
From: Jason Molenda <jmolenda@apple.com>
Date: Tue, 5 Jan 1999 00:17:07 +0000
Subject: [PATCH] 1999-01-04  Jason Molenda  (jsm@bugshack.cygnus.com)

        * configure.in: Require autoconf 2.12.1 or higher.
        * doc/configure.in: Ditto.
        * nlm/configure.in: Ditto.
        * rdi-share/configure.in: Ditto.
        * testsuite/configure.in: Ditto.
        * doc/Makefile.in: Don't hardcode $(SHELL).
        * nlm/Makefile.in: Ditto.
        * rdi-share/Makefile.in: Ditto.
        * testsuite/Makefile.in: Ditto.
---
 gdb/ChangeLog              | 12 ++++++++++++
 gdb/configure.in           |  4 ++--
 gdb/doc/Makefile.in        |  4 ++--
 gdb/doc/configure          | 14 ++++++++------
 gdb/doc/configure.in       |  2 +-
 gdb/nlm/Makefile.in        |  4 ++--
 gdb/nlm/configure          | 20 +++++++++++---------
 gdb/nlm/configure.in       |  2 +-
 gdb/rdi-share/Makefile.in  |  2 +-
 gdb/rdi-share/configure.in |  1 +
 gdb/testsuite/configure.in |  2 +-
 11 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bac34538273..27d47a533a7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+1999-01-04  Jason Molenda  (jsm@bugshack.cygnus.com)
+
+	* configure.in: Require autoconf 2.12.1 or higher.
+	* doc/configure.in: Ditto.
+	* nlm/configure.in: Ditto.
+	* rdi-share/configure.in: Ditto.
+	* testsuite/configure.in: Ditto.
+	* doc/Makefile.in: Don't hardcode $(SHELL).
+	* nlm/Makefile.in: Ditto.
+	* rdi-share/Makefile.in: Ditto.
+	* testsuite/Makefile.in: Ditto.
+
 Mon Jan  4 12:53:03 1999  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* remote-vx.c (init_vx_ops, init_vx_run_ops): Remove unneeded
diff --git a/gdb/configure.in b/gdb/configure.in
index 9f2a281305b..c1317623ed6 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -1,5 +1,5 @@
 dnl Autoconf configure script for GDB, the GNU debugger.
-dnl Copyright 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+dnl Copyright 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GDB.
 dnl 
@@ -19,7 +19,7 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.12.1)dnl
 AC_INIT(main.c)
 AC_CONFIG_HEADER(config.h:config.in)
 
diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
index 8d6e05f523c..ddcd0144b33 100644
--- a/gdb/doc/Makefile.in
+++ b/gdb/doc/Makefile.in
@@ -1,4 +1,4 @@
-##Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+##Copyright (C) 1991, 1992, 1999 Free Software Foundation, Inc.
 
 # Makefile for GDB documentation.
 # This file is part of GDB.
@@ -24,7 +24,7 @@ prefix = @prefix@
 
 infodir = @infodir@
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/gdb/doc/configure b/gdb/doc/configure
index 41ea0ffa952..8c5591ce05e 100755
--- a/gdb/doc/configure
+++ b/gdb/doc/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12.1 
+# Generated automatically using autoconf version 2.12.2 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -333,7 +333,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12.1"
+    echo "configure generated by autoconf version 2.12.2"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -503,9 +503,11 @@ ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+ac_exeext=
+ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -550,12 +552,12 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:554: checking for a BSD compatible install" >&5
+echo "configure:556: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
   for ac_dir in $PATH; do
     # Account for people who put trailing slashes in PATH elements.
     case "$ac_dir/" in
@@ -702,7 +704,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12.1"
+    echo "$CONFIG_STATUS generated by autoconf version 2.12.2"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
diff --git a/gdb/doc/configure.in b/gdb/doc/configure.in
index b357edb7b31..460efc2b466 100644
--- a/gdb/doc/configure.in
+++ b/gdb/doc/configure.in
@@ -1,4 +1,4 @@
-AC_PREREQ(2.5)
+AC_PREREQ(2.12.1)
 AC_INIT(refcard.tex)
 AC_PROG_INSTALL
 AC_OUTPUT(Makefile)
diff --git a/gdb/nlm/Makefile.in b/gdb/nlm/Makefile.in
index af1f7f8ef8a..54511387a00 100644
--- a/gdb/nlm/Makefile.in
+++ b/gdb/nlm/Makefile.in
@@ -1,4 +1,4 @@
-#Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+#Copyright 1989, 1990, 91, 92, 93, 94, 95, 1999 Free Software Foundation, Inc.
 
 # This file is part of GDB.
 
@@ -43,7 +43,7 @@ man9dir = $(mandir)/man9
 infodir = @infodir@
 includedir = @includedir@
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/gdb/nlm/configure b/gdb/nlm/configure
index 8ce9af7b81e..3918fee794c 100755
--- a/gdb/nlm/configure
+++ b/gdb/nlm/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12.1 
+# Generated automatically using autoconf version 2.12.2 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -333,7 +333,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12.1"
+    echo "configure generated by autoconf version 2.12.2"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -503,9 +503,11 @@ ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+ac_exeext=
+ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -567,7 +569,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:571: checking host system type" >&5
+echo "configure:573: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -588,7 +590,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:592: checking target system type" >&5
+echo "configure:594: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -606,7 +608,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:610: checking build system type" >&5
+echo "configure:612: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -660,12 +662,12 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:664: checking for a BSD compatible install" >&5
+echo "configure:666: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
   for ac_dir in $PATH; do
     # Account for people who put trailing slashes in PATH elements.
     case "$ac_dir/" in
@@ -850,7 +852,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12.1"
+    echo "$CONFIG_STATUS generated by autoconf version 2.12.2"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
diff --git a/gdb/nlm/configure.in b/gdb/nlm/configure.in
index f739c1bf4cd..845b486e524 100644
--- a/gdb/nlm/configure.in
+++ b/gdb/nlm/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.12.1)dnl
 AC_INIT(gdbserve.c)
 
 AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
diff --git a/gdb/rdi-share/Makefile.in b/gdb/rdi-share/Makefile.in
index a863a0b0c3c..11410058a67 100644
--- a/gdb/rdi-share/Makefile.in
+++ b/gdb/rdi-share/Makefile.in
@@ -116,7 +116,7 @@ all: Makefile $(LIBRARIES) $(HEADERS)
 
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINT@Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
diff --git a/gdb/rdi-share/configure.in b/gdb/rdi-share/configure.in
index aabe070c5b9..bbda5ccbad0 100644
--- a/gdb/rdi-share/configure.in
+++ b/gdb/rdi-share/configure.in
@@ -1,4 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.12.1)
 AC_INIT(adp.h)
 
 AM_INIT_AUTOMAKE(rdi-share, 1.0)
diff --git a/gdb/testsuite/configure.in b/gdb/testsuite/configure.in
index 9e8723775c7..0b37ea98ff8 100644
--- a/gdb/testsuite/configure.in
+++ b/gdb/testsuite/configure.in
@@ -4,7 +4,7 @@ dnl necessary to tailor a template configure script into the configure
 dnl script appropriate for this directory.  For more information, check
 dnl any existing configure script.
 
-AC_PREREQ(2.5)
+AC_PREREQ(2.12.1)
 AC_INIT(gdb.base)
 
 CC=${CC-cc}
-- 
2.30.2