* config/i386/{i386sol2.mh, i386v4.mh, ncr3000.mh},

  config/m68k/m68kv4.mh, config/mips/{irix4.mh, irix5.mh,
  mipsv4.mh}, config/sparc/sun4so2.mh (INSTALL): Removed, figured
  out by autoconf.
* config/apollo68v.mh (RANLIB): Removed, figured out by autoconf.

* Makefile.in, configure.in: Converted to use autoconf
* aclocal.m4: New file, local autoconf macro definitions.
* configure: New file, generated with autoconf 2.3.

1 files changed, 139 insertions, 106 deletions

diff --git a/gdb/configure.in b/gdb/configure.in
index bb9d332..fe4fac1 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -1,14 +1,72 @@
-# This file is a shell script fragment that supplies the information
-# necessary to tailor a template configure script into the configure
-# script approriate for this directory.  For more information, check
-# any existing configure script.
+dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.3)dnl
+AC_INIT(main.c)
+
+CC=${CC-cc}
+AC_PROG_CC
+AC_AIX
+AC_MINIX
+AC_ISC_POSIX
+
+AC_PROG_INSTALL
+AC_PROG_RANLIB
+
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/..)
+AC_CANONICAL_SYSTEM
+AC_ARG_PROGRAM
+
+
+dnl Handle optional features that can be enabled.
+ENABLE_CFLAGS=
+ENABLE_CLIBS=
+ENABLE_OBS=
+
+AC_ARG_ENABLE(netrom,
+[  --enable-netrom ],
+[case "${enableval}" in
+yes)	enable_netrom=yes ;;
+no)	enable_netrom=no ;;
+*)	AC_MSG_ERROR(bad value ${enableval} given for netrom option) ;;
+esac])
+
+if test "${enable_netrom}" = "yes"; then
+	ENABLE_OBS="${ENABLE_OBS} remote-nrom.o" 
+fi
+
+# start-sanitize-gdbtk
+ENABLE_GDBTK=
+
+AC_ARG_ENABLE(gdbtk,
+[  --enable-gdbtk ],
+[case "${enableval}" in
+yes)	enable_gdbtk=yes ;;
+no)	enable_gdbtk=no  ;;
+*)	AC_MSG_ERROR(bad value ${enableval} given for gdbtk option) ;;
+esac])
+
+if test "${enable_gdbtk}" = "yes"; then
+	AC_PATH_X
+	AC_PATH_XTRA
+
+	CYGNUS_PATH_TK
+	CYGNUS_PATH_TCL
+
+	ENABLE_GDBTK=1
+	ENABLE_CLIBS="${ENABLE_CLIBS} $(TCL) $(TK) $(X11) -lm"
+	ENABLE_OBS="${ENABLE_OBS} gdbtk.o"
+fi
+AC_SUBST(ENABLE_GDBTK)
+# end-sanitize-gdbtk
+
+AC_SUBST(ENABLE_CFLAGS)
+AC_SUBST(ENABLE_CLIBS)
+AC_SUBST(ENABLE_OBS)
 
-srcname="GDB"
-srctrigger=main.c
 
 configdirs="doc testsuite"
 
-# per-host:
+dnl
+changequote(,)dnl
 
 # Map host cpu into the config cpu subdirectory name.
 # The default is $host_cpu.
@@ -145,16 +203,6 @@ w65-*-*)		gdb_host=w65 ;;
 esac
 
 
-if [ ! -f ${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh ]; then
-	echo '***' "Gdb does not support host ${host}" 1>&2
-	exit 1
-fi
-
-#  We really shouldn't depend on there being a space after XM_FILE= ...
-hostfile=`awk '$1 == "XM_FILE=" { print $2 }' <${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh`
-
-# per-target:
-
 # Map target cpu into the config cpu subdirectory name.
 # The default is $target_cpu.
 
@@ -172,7 +220,7 @@ powerpc*)		gdb_target_cpu=powerpc ;;
 pn)			gdb_target_cpu=gould ;;
 pyramid)		gdb_target_cpu=pyr ;;
 sparclite*)		gdb_target_cpu=sparc
-			configdirs="${configdirs} sparclite" ;;
+		configdirs="${configdirs} sparclite" ;;
 sparc*)			gdb_target_cpu=sparc ;;
 *)			gdb_target_cpu=$target_cpu ;;
 
@@ -232,7 +280,7 @@ i[345]86-*-netbsd*)	gdb_target=nbsd ;;
 i[345]86-*-os9k)	gdb_target=i386os9k ;;
 i[345]86-*-go32*)	gdb_target=i386aout ;;
 i[345]86-*-lynxos*)	gdb_target=i386lynx
-			configdirs="${configdirs} gdbserver" ;;
+		configdirs="${configdirs} gdbserver" ;;
 i[345]86-*-solaris*)	gdb_target=i386sol2 ;;
 i[345]86-*-sunos*)	gdb_target=sun386 ;;
 i[345]86-*-sysv4*)	gdb_target=i386v4 ;;
@@ -243,7 +291,7 @@ i[345]86-*-isc*)	gdb_target=i386v ;;
 i[345]86-*-mach3*)	gdb_target=i386m3 ;;
 i[345]86-*-mach*)	gdb_target=i386mach ;;
 i[345]86-*-netware*)	gdb_target=i386nw
-			configdirs="${configdirs} nlm" ;;
+		configdirs="${configdirs} nlm" ;;
 i[345]86-*-osf1mk*)	gdb_target=i386mk ;;
 
 i960-*-bout*)		gdb_target=vxworks960 ;;
@@ -277,7 +325,7 @@ m68*-*-aout*)		gdb_target=monitor ;;
 m68*-*-coff*)		gdb_target=monitor ;;
 m68*-*-elf*)		gdb_target=monitor ;;
 m68*-*-lynxos*)		gdb_target=m68klynx
-			configdirs="${configdirs} gdbserver" ;;
+		configdirs="${configdirs} gdbserver" ;;
 m68*-*-os68k*)		gdb_target=os68k ;;
 m68*-*-sunos3*)		gdb_target=sun3os3 ;;
 m68*-*-sunos4*)		gdb_target=sun3os4 ;;
@@ -339,7 +387,7 @@ sparc-*-aout*)		gdb_target=sparc-em ;;
 sparc-*-coff*)		gdb_target=sparc-em ;;
 sparc-*-elf*)		gdb_target=sparc-em ;;
 sparc-*-lynxos*)	gdb_target=sparclynx
-			configdirs="${configdirs} gdbserver" ;;
+		configdirs="${configdirs} gdbserver" ;;
 sparc-*-netbsd*)	gdb_target=nbsd ;;
 sparc-*-solaris2*)	gdb_target=sun4sol2 ;;
 sparc-*-sunos4*)	gdb_target=sun4os4 ;;
@@ -360,33 +408,48 @@ z8k-*-coff*)		gdb_target=z8ksim ;;
 
 esac
 
-if [ ! -f ${srcdir}/config/${gdb_target_cpu}/${gdb_target}.mt ]; then
-	echo '***' "Gdb does not support target ${target}" 1>&2
-	exit 1
+dnl
+changequote([,])dnl
+
+
+host_makefile_frag=${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh
+if test ! -f ${host_makefile_frag}; then
+AC_MSG_ERROR("*** Gdb does not support host ${host}")
 fi
 
-if [ -z "${removing}" ] ; then
-	cat ${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh ${srcdir}/config/${gdb_target_cpu}/${gdb_target}.mt | awk '$1 == "#msg" {
-		print substr($0,6)}'
+target_makefile_frag=${srcdir}/config/${gdb_target_cpu}/${gdb_target}.mt
+if test ! -f ${target_makefile_frag}; then
+AC_MSG_ERROR("*** Gdb does not support target ${target}")
 fi
 
-#  We really shouldn't depend on there being a space after TM_FILE= ...
-targetfile=`awk '$1 == "TM_FILE=" { print $2 }' <${srcdir}/config/${gdb_target_cpu}/${gdb_target}.mt`
+dnl We have to assign the same value to other variables because autoconf
+dnl doesn't provide a mechanism to substitute a replacement keyword with
+dnl arbitrary data or pathnames.
+dnl
+host_makefile_frag_path=$host_makefile_frag
+target_makefile_frag_path=$target_makefile_frag
+AC_SUBST(host_makefile_frag_path)
+AC_SUBST(target_makefile_frag_path)
+AC_SUBST_FILE(host_makefile_frag)
+AC_SUBST_FILE(target_makefile_frag)
+
+
+#  We really shouldn't depend on there being a space after XM_FILE= ...
+hostfile=`awk '$1 == "XM_FILE=" { print $2 }' ${host_makefile_frag}`
 
+#  We really shouldn't depend on there being a space after TM_FILE= ...
+targetfile=`awk '$1 == "TM_FILE=" { print $2 }' ${target_makefile_frag}`
 
 # these really aren't orthogonal true/false values of the same condition,
 # but shells are slow enough that I like to reuse the test conditions
 # whenever possible
-#
-if [ "${target}" = "${host}" ] ; then
-	nativefile=`awk '$1 == "NAT_FILE=" { print $2 }' <${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh`
+if test "${target}" = "${host}"; then
+nativefile=`awk '$1 == "NAT_FILE=" { print $2 }' ${host_makefile_frag}`
 else
-	# GDBserver is only useful in a "native" enviroment
-	configdirs=`echo $configdirs | sed 's/gdbserver//'`
+# GDBserver is only useful in a "native" enviroment
+configdirs=`echo $configdirs | sed 's/gdbserver//'`
 fi
 
-host_makefile_frag=config/${gdb_host_cpu}/${gdb_host}.mh
-target_makefile_frag=config/${gdb_target_cpu}/${gdb_target}.mt
 
 # If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile
 # (NAT_FILE) is not set in config/*/*.m[ht] files, we don't make the
@@ -397,89 +460,59 @@ target_makefile_frag=config/${gdb_target_cpu}/${gdb_target}.mt
 files=
 links=
 rm -f xm.h
-if [ "${hostfile}" != "" ]; then
-	files="${files} config/${gdb_host_cpu}/${hostfile}"
-	links="${links} xm.h"
+if test "${hostfile}" != ""; then
+files="${files} config/${gdb_host_cpu}/${hostfile}"
+links="${links} xm.h"
 fi
 rm -f tm.h
-if [ "${targetfile}" != "" ]; then
-	files="${files} config/${gdb_target_cpu}/${targetfile}"
-	links="${links} tm.h"
+if test "${targetfile}" != ""; then
+files="${files} config/${gdb_target_cpu}/${targetfile}"
+links="${links} tm.h"
 fi
 rm -f nm.h
-if [ "${nativefile}" != "" ]; then
-	files="${files} config/${gdb_host_cpu}/${nativefile}"
-	links="${links} nm.h"
+if test "${nativefile}" != ""; then
+files="${files} config/${gdb_host_cpu}/${nativefile}"
+links="${links} nm.h"
 else
-	# A cross-only configuration.
-	files="${files} config/nm-empty.h"
-	links="${links} nm.h"
+# A cross-only configuration.
+files="${files} config/nm-empty.h"
+links="${links} nm.h"
 fi
-
 # start-sanitize-gdbtk
-# Make it possible to use the GUI without doing a full install
-if [ "${enable_gdbtk}" = "yes" -a ! -f gdbtk.tcl ] ; then
-	files="${files} gdbtk.tcl"
-	links="${links} gdbtk.tcl"
-fi
-# end-sanitize-gdbtk
-
-# post-target:
 
-case ${srcdir} in
-  .)
-    ;;
-  *)
-    grep "source ${srcdir}/.gdbinit" .gdbinit >/dev/null 2>/dev/null || \
-      echo "source ${srcdir}/.gdbinit" >> .gdbinit
-esac
-
-if [ "${nativefile}" = "" ] ; then
-	sed -e '/^NATDEPFILES= /s//# NATDEPFILES= /' \
-		< Makefile > Makefile.tem
-	mv -f Makefile.tem Makefile
-fi
-
-# start-sanitize-gdbtk
-if [ "${enable_gdbtk}" = "yes" ] ; then
-	if [ x"${other_options}" != x"" ]; then
-		for opt in $other_options; do
-			case "$opt" in
-				-x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-				| --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-					X11_INCLUDES=`echo "$opt" | sed 's/[-_a-zA-Z0-9]*=//'`
-					sed -e "s;^\\(X11_INCLUDES[	]*=\\).*\$;\\1 -I${X11_INCLUDES};" \
-						< Makefile > Makefile.tem
-					mv -f Makefile.tem Makefile;;
-
-				-x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-				| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-					X11_LIB_SWITCHES=`echo "$opt" | sed 's/[-_a-zA-Z0-9]*=//'`
-					sed -e "s;^\\(X11_LIB_SWITCHES[ 	]*=\\).*\$;\\1 -L${X11_LIB_SWITCHES};" \
-						< Makefile > Makefile.tem
-					mv -f Makefile.tem Makefile;;
-			esac
-		done
-	fi
-	sed -e '/# End of host and/i\
-\
-ENABLE_GDBTK = 1\
-ENABLE_DEPFILES = gdbtk.o\
-ENABLE_CLIBS = $(TCL) $(TK) $(X11_LIB_SWITCHES) $(X11_LIBS) -lm
-' < Makefile > Makefile.tem
-	mv -f Makefile.tem Makefile
+# Make it possible to use the GUI without doing a full install
+if test "${enable_gdbtk}" = "yes" -a ! -f gdbtk.tcl ; then
+files="${files} gdbtk.tcl"
+links="${links} gdbtk.tcl"
 fi
 # end-sanitize-gdbtk
 
-if [ "${enable_netrom}" = "yes" ] ; then
-	sed -e '/# End of host and/i\
-\
-NETROM_OBS = remote-nrom.o\
-' < Makefile > Makefile.tem
-	mv -f Makefile.tem Makefile
+AC_LINK_FILES($files, $links)
+
+AC_CONFIG_SUBDIRS($configdirs)
+AC_OUTPUT(Makefile, 
+[
+dnl Autoconf doesn't provide a mechanism for modifying definitions 
+dnl provided by makefile fragments.
+dnl
+if test "${nativefile}" = ""; then
+sed -e '/^NATDEPFILES= /s//# NATDEPFILES= /' \
+	< Makefile > Makefile.tem
+mv -f Makefile.tem Makefile
 fi
 
+changequote(,)dnl
 sed -e '/^TM_FILE[ 	]*=/s,^TM_FILE[ 	]*=[ 	]*,&config/'"${gdb_target_cpu}"'/,
 /^XM_FILE[ 	]*=/s,^XM_FILE[ 	]*=[ 	]*,&config/'"${gdb_host_cpu}"'/,
 /^NAT_FILE[ 	]*=/s,^NAT_FILE[ 	]*=[ 	]*,&config/'"${gdb_host_cpu}"'/,' <Makefile >Makefile.tmp
 mv -f Makefile.tmp Makefile
+changequote([,])dnl
+
+case ${srcdir} in
+.)
+;;
+*)
+grep "source ${srcdir}/.gdbinit" .gdbinit >/dev/null 2>/dev/null || \
+echo "source ${srcdir}/.gdbinit" >> .gdbinit
+esac
+])