--- newlib/acinclude.m4	21 Dec 2002 01:41:47 -0000	1.13
+++ newlib/acinclude.m4	4 Jan 2003 05:37:35 -0000
@@ -103,15 +103,15 @@
 
 AC_DEFUN(LIB_AC_PROG_CC,
 [AC_BEFORE([$0], [AC_PROG_CPP])dnl
+AC_LANG_PUSH(C)
 AC_CHECK_PROG(CC, gcc, gcc)
 if test -z "$CC"; then
   AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
   test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
 fi
-
-AC_PROG_CC_GNU
-
-if test $ac_cv_prog_gcc = yes; then
+_AC_COMPILER_OBJEXT
+_AC_LANG_COMPILER_GNU
+if test $ac_cv_c_compiler_gnu = yes; then
   GCC=yes
 dnl Check whether -g works, even if CFLAGS is set, in case the package
 dnl plays around with CFLAGS (such as to build both debugging and
@@ -119,7 +119,7 @@
   ac_test_CFLAGS="${CFLAGS+set}"
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
-  AC_PROG_CC_G
+  _AC_PROG_CC_G
   if test "$ac_test_CFLAGS" = set; then
     CFLAGS="$ac_save_CFLAGS"
   elif test $ac_cv_prog_cc_g = yes; then
@@ -131,6 +131,7 @@
   GCC=
   test "${CFLAGS+set}" = set || CFLAGS="-g"
 fi
+AC_LANG_POP(C)
 ])
 
 LIB_AC_PROG_CC
--- newlib/configure.in        22 Nov 2002 19:54:22 -0000      1.14
+++ newlib/configure.in        4 Jan 2003 01:29:58 -0000
@@ -134,14 +134,14 @@
 AC_SUBST(CC_FOR_BUILD)
 
 if test "${newlib_elix_level}" -gt "0"; then
-AC_DEFINE_UNQUOTED(_ELIX_LEVEL,${newlib_elix_level})
+AC_DEFINE_UNQUOTED(_ELIX_LEVEL,${newlib_elix_level},[EL/IX level])
 fi
 
 if test "${newlib_mb}" = "yes"; then
-AC_DEFINE_UNQUOTED(_MB_LEN_MAX,8)
+AC_DEFINE_UNQUOTED(_MB_LEN_MAX,8,[MB_LEN_MAX])
 fi
 
-AC_DEFINE_UNQUOTED(_NEWLIB_VERSION,"$VERSION")
+AC_DEFINE_UNQUOTED(_NEWLIB_VERSION,"$VERSION",[Newlib version])
 
 if test "${multilib}" = "yes"; then
   multilib_arg="--enable-multilib"
--- bfd/acinclude.m4	2002-12-04 12:16:19.000000000 -0500
+++ bfd/acinclude.m4	2002-12-04 23:18:08.000000000 -0500
@@ -108,16 +108,6 @@
  AC_MSG_RESULT($bfd_cv_have_sys_procfs_type_member_$1_$2)
 ])
 
-sinclude(../libtool.m4)
-dnl The lines below arrange for aclocal not to bring libtool.m4
-dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
-dnl to add a definition of LIBTOOL to Makefile.in.
-ifelse(yes,no,[
-AC_DEFUN([AM_PROG_LIBTOOL],)
-AC_DEFUN([AM_DISABLE_SHARED],)
-AC_SUBST(LIBTOOL)
-])
-
 sinclude(../gettext.m4)
 ifelse(yes,no,[
 AC_DEFUN([CY_WITH_NLS],)
--- bfd/configure.in	2002-12-04 12:16:20.000000000 -0500
+++ bfd/configure.in	2002-12-04 23:18:08.000000000 -0500
@@ -23,16 +23,16 @@
 AC_SUBST(bfd_version)
 AC_SUBST(bfd_version_string)
 
-dnl These must be called before AM_PROG_LIBTOOL, because it may want
+dnl These must be called before AC_PROG_LIBTOOL, because it may want
 dnl to call AC_CHECK_PROG.
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 dnl Default to a non shared library.  This may be overridden by the
 dnl configure option --enable-shared.
-AM_DISABLE_SHARED
+AC_DISABLE_SHARED
 
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
 AC_ARG_ENABLE(64-bit-bfd,
 [  --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)],
--- binutils/Makefile.am	2002-12-04 12:16:22.000000000 -0500
+++ binutils/Makefile.am	2002-12-04 23:18:08.000000000 -0500
@@ -15,6 +15,8 @@
 CC_FOR_BUILD = @CC_FOR_BUILD@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 
+YLWRAP = $(srcdir)/../ylwrap
+
 YACC = `if [ -f ../bison/bison ]; then echo ../bison/bison -y -L$(srcdir)/../bison/; else echo @YACC@; fi`
 YFLAGS = -d
 LEX = `if [ -f ../flex/flex ]; then echo ../flex/flex; else echo @LEX@; fi`
--- binutils/acinclude.m4	2002-12-04 12:16:23.000000000 -0500
+++ binutils/acinclude.m4	2002-12-04 23:18:08.000000000 -0500
@@ -1,14 +1,5 @@
 sinclude(../bfd/acinclude.m4)
 
-dnl sinclude(../libtool.m4) already included in bfd/acinclude.m4
-dnl The lines below arrange for aclocal not to bring libtool.m4
-dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
-dnl to add a definition of LIBTOOL to Makefile.in.
-ifelse(yes,no,[
-AC_DEFUN([AM_PROG_LIBTOOL],)
-AC_SUBST(LIBTOOL)
-])
-
 dnl sinclude(../gettext.m4) already included in bfd/acinclude.m4
 ifelse(yes,no,[
 AC_DEFUN([CY_WITH_NLS],)
--- binutils/configure.in	2002-12-04 12:16:23.000000000 -0500
+++ binutils/configure.in	2002-12-04 23:18:08.000000000 -0500
@@ -62,7 +62,7 @@
 AC_PROG_CC
 
 AC_PROG_YACC
-AM_PROG_LEX
+AC_PROG_LEX
 
 ALL_LINGUAS="fr tr ja es sv da"
 CY_GNU_GETTEXT
@@ -321,7 +321,7 @@
  [Define to 1 if user symbol names have a leading underscore, 0 if not.])
 
 # Emulation 
-for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'`
+for targ_alias in `echo $target $enable_targets | sed 's/,/ /g'`
 do
   # Canonicalize the secondary target names.
  result=`$ac_config_sub $targ_alias 2>/dev/null`
--- gas/Makefile.am 30 Dec 2002 19:25:05 -0000      1.70
+++ gas/Makefile.am 4 Jan 2003 01:36:35 -0000
@@ -623,7 +623,7 @@
 	   cp config/m68k-parse.y . >/dev/null 2>/dev/null; \
 	  f=m68k-parse.y; \
 	else true; fi; \
-	$(SHELL) $(YLWRAP) "$(YACC)" $$f y.tab.c m68k-parse.c --; \
+	$(SHELL) $(YLWRAP) $$f y.tab.c m68k-parse.c -- "$(YACC)"; \
 	if [ $$f = "m68k-parse.y" ]; then \
 	  rm -f m68k-parse.y; \
 	else true; fi
@@ -643,7 +643,7 @@
 itbl-ops.o: $(srcdir)/itbl-ops.c $(srcdir)/itbl-ops.h itbl-parse.h
 
 itbl-parse.c itbl-parse.h: $(srcdir)/itbl-parse.y
-	$(SHELL) $(YLWRAP) "$(YACC)" $(srcdir)/itbl-parse.y y.tab.c itbl-parse.c y.tab.h itbl-parse.h -- -d
+	$(SHELL) $(YLWRAP) $(srcdir)/itbl-parse.y y.tab.c itbl-parse.c y.tab.h itbl-parse.h -- "$(YACC)" -d
 
 # stand-alone itbl assembler & disassembler
 
--- gas/acinclude.m4	2002-12-04 12:16:34.000000000 -0500
+++ gas/acinclude.m4	2002-12-04 23:18:08.000000000 -0500
@@ -55,16 +55,6 @@
 $1=[$]_gas_uniq_newlist
 ])dnl
 
-sinclude(../libtool.m4)
-dnl The lines below arrange for aclocal not to bring libtool.m4
-dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
-dnl to add a definition of LIBTOOL to Makefile.in.
-ifelse(yes,no,[
-AC_DEFUN([AM_PROG_LIBTOOL],)
-AC_DEFUN([AC_CHECK_LIBM],)
-AC_SUBST(LIBTOOL)
-])
-
 sinclude(../gettext.m4)
 ifelse(yes,no,[
 AC_DEFUN([CY_WITH_NLS],)
--- gas/configure.in	2002-12-04 12:16:35.000000000 -0500
+++ gas/configure.in	2002-12-04 23:18:08.000000000 -0500
@@ -8,6 +8,8 @@
 AC_PREREQ(2.13)
 AC_INIT(as.h)
 
+AC_CONFIG_AUX_DIR(..)
+ac_aux_dir=`cd $srcdir;pwd`/..
 AC_CANONICAL_SYSTEM
 AC_ISC_POSIX
 
@@ -70,10 +70,14 @@
 
 # If we are on a DOS filesystem, we must use gdb.ini rather than
 # .gdbinit.
-GDBINIT=".gdbinit"
 case "${host}" in
   *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-windows*)
     GDBINIT="gdb.ini"
+    AC_CONFIG_FILES(gdb.ini:gdbinit.in)
+    ;;
+  *)
+    GDBINIT=".gdbinit"
+    AC_CONFIG_FILES(.gdbinit:gdbinit.in)
     ;;
 esac
 AC_SUBST(GDBINIT)
@@ -1005,7 +1009,9 @@
 dnl the old symlinks don't exist, so that a reconfigure in an existing
 dnl directory behaves reasonably.
 
-AC_OUTPUT(Makefile doc/Makefile ${GDBINIT}:gdbinit.in po/Makefile.in:po/Make-in,
+AC_CONFIG_FILES(Makefile doc/Makefile po/Makefile.in:po/Make-in)
+
+AC_CONFIG_COMMANDS([default],
 [rm -f targ-cpu.c targ-cpu.h obj-format.h obj-format.c targ-env.h atof-targ.c itbl-cpu.h
  echo '#include "tc-'"${target_cpu_type}"'.h"' > targ-cpu.h
  echo '#include "obj-'"${obj_format}"'.h"' > obj-format.h
@@ -1020,3 +1026,5 @@
  cgen_cpu_prefix=${cgen_cpu_prefix}
  obj_format=${obj_format}
  te_file=${te_file}])
+
+AC_OUTPUT
\ No newline at end of file
--- gdb/Makefile.in	2002-12-04 23:11:12.000000000 -0500
+++ gdb/Makefile.in	2002-12-04 23:18:08.000000000 -0500
@@ -1191,7 +1191,7 @@
 .PRECIOUS: c-exp.tab.c
 c-exp.tab.o: c-exp.tab.c
 c-exp.tab.c: c-exp.y
-	$(SHELL) $(YLWRAP) "$(YACC)" $(srcdir)/c-exp.y  y.tab.c c-exp.tmp -- $(YFLAGS) 
+	$(SHELL) $(YLWRAP) $(srcdir)/c-exp.y  y.tab.c c-exp.tmp -- "$(YACC)" $(YFLAGS) 
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
 	     -e '/extern.*free/d' \
@@ -1207,7 +1207,7 @@
 .PRECIOUS: objc-exp.tab.c
 objc-exp.tab.o: objc-exp.tab.c
 objc-exp.tab.c: objc-exp.y
-	$(SHELL) $(YLWRAP) "$(YACC)" $(srcdir)/objc-exp.y y.tab.c objc-exp.tmp -- $(YFLAGS) 
+	$(SHELL) $(YLWRAP) $(srcdir)/objc-exp.y y.tab.c objc-exp.tmp -- "$(YACC)" $(YFLAGS) 
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
 	     -e '/extern.*free/d' \
@@ -1223,7 +1223,7 @@
 .PRECIOUS: jv-exp.tab.c
 jv-exp.tab.o: jv-exp.tab.c
 jv-exp.tab.c: jv-exp.y
-	$(SHELL) $(YLWRAP) "$(YACC)" $(srcdir)/jv-exp.y  y.tab.c jv-exp.tmp -- $(YFLAGS) 
+	$(SHELL) $(YLWRAP) $(srcdir)/jv-exp.y  y.tab.c jv-exp.tmp -- "$(YACC)" $(YFLAGS) 
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
 	     -e '/extern.*free/d' \
@@ -1239,7 +1239,7 @@
 .PRECIOUS: f-exp.tab.c
 f-exp.tab.o: f-exp.tab.c
 f-exp.tab.c: f-exp.y
-	$(SHELL) $(YLWRAP) "$(YACC)" $(srcdir)/f-exp.y  y.tab.c f-exp.tmp -- $(YFLAGS) 
+	$(SHELL) $(YLWRAP) $(srcdir)/f-exp.y  y.tab.c f-exp.tmp -- "$(YACC)" $(YFLAGS) 
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
 	     -e '/extern.*free/d' \
@@ -1255,7 +1255,7 @@
 .PRECIOUS: m2-exp.tab.c
 m2-exp.tab.o: m2-exp.tab.c
 m2-exp.tab.c: m2-exp.y
-	$(SHELL) $(YLWRAP) "$(YACC)" $(srcdir)/m2-exp.y  y.tab.c m2-exp.tmp -- $(YFLAGS) 
+	$(SHELL) $(YLWRAP) $(srcdir)/m2-exp.y  y.tab.c m2-exp.tmp -- "$(YACC)" $(YFLAGS) 
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
 	     -e '/extern.*free/d' \
@@ -1271,7 +1271,7 @@
 .PRECIOUS: ada-exp.tab.c
 ada-exp.tab.o: ada-exp.tab.c
 ada-exp.tab.c: ada-exp.y 
-	$(YACC) $(YFLAGS) $(srcdir)/ada-exp.y
+	$(SHELL) $(YLWRAP) $(srcdir)/ada-exp.y  y.tab.c ada-exp.tmp -- "$(YACC)" $(YFLAGS) 
 	-sed -e '/extern.*malloc/d' \
 	-e '/extern.*realloc/d' \
 	-e '/extern.*free/d' \
@@ -1300,7 +1300,7 @@
 .PRECIOUS: p-exp.tab.c
 p-exp.tab.o: p-exp.tab.c
 p-exp.tab.c: p-exp.y
-	$(SHELL) $(YLWRAP) "$(YACC)" $(srcdir)/p-exp.y  y.tab.c p-exp.tmp -- $(YFLAGS)
+	$(SHELL) $(YLWRAP) $(srcdir)/p-exp.y  y.tab.c p-exp.tmp -- "$(YACC)" $(YFLAGS)
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
 	     -e '/extern.*free/d' \
--- gdb/configure.in	2002-12-04 12:16:47.000000000 -0500
+++ gdb/configure.in	2002-12-04 23:18:08.000000000 -0500
@@ -686,7 +686,7 @@
 ac_cv_c_long_double=yes, ac_cv_c_long_double=no)])
 AC_MSG_RESULT($ac_cv_c_long_double)
 if test $ac_cv_c_long_double = yes; then
-  AC_DEFINE(HAVE_LONG_DOUBLE)
+  AC_DEFINE([HAVE_LONG_DOUBLE], [], [Define if the `long double' type works])
 fi
 
 dnl See if the compiler and runtime support printing long doubles
--- gdb/testsuite/gdb.hp/gdb.objdbg/configure.in	2002-12-04 12:17:00.000000000 -0500
+++ gdb/testsuite/gdb.hp/gdb.objdbg/configure.in	2002-12-04 23:18:08.000000000 -0500
@@ -11,6 +11,5 @@
 AC_SUBST(CC)
 AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../../../..)
 AC_CANONICAL_SYSTEM
-AC_CONFIG_SUBDIRS(objdbg01 objdbg02 objdbg03 objdbg04)
 
 AC_OUTPUT(Makefile)
--- gprof/acinclude.m4	2002-12-04 12:17:02.000000000 -0500
+++ gprof/acinclude.m4	2002-12-04 23:18:08.000000000 -0500
@@ -1,12 +1,3 @@
-sinclude(../libtool.m4)
-dnl The lines below arrange for aclocal not to bring libtool.m4
-dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
-dnl to add a definition of LIBTOOL to Makefile.in.
-ifelse(yes,no,[
-AC_DEFUN([AM_PROG_LIBTOOL],)
-AC_SUBST(LIBTOOL)
-])
-
 sinclude(../gettext.m4)
 ifelse(yes,no,[
 AC_DEFUN([CY_WITH_NLS],)
--- ld/Makefile.am	2002-12-04 12:17:11.000000000 -0500
+++ ld/Makefile.am	2002-12-04 23:18:08.000000000 -0500
@@ -9,6 +9,8 @@
 
 tooldir = $(exec_prefix)/$(target_alias)
 
+YLWRAP = $(srcdir)/../ylwrap
+
 YACC = `if [ -f ../bison/bison ]; then echo ../bison/bison -y -L$(srcdir)/../bison/; else echo @YACC@; fi`
 YFLAGS = -d
 LEX = `if [ -f ../flex/flex ]; then echo ../flex/flex; else echo @LEX@; fi`
--- ld/acinclude.m4	2002-12-04 12:17:11.000000000 -0500
+++ ld/acinclude.m4	2002-12-04 23:18:08.000000000 -0500
@@ -1,14 +1,5 @@
 sinclude(../bfd/acinclude.m4)
 
-dnl sinclude(../libtool.m4) already included in bfd/acinclude.m4
-dnl The lines below arrange for aclocal not to bring libtool.m4
-dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
-dnl to add a definition of LIBTOOL to Makefile.in.
-ifelse(yes,no,[
-AC_DEFUN([AM_PROG_LIBTOOL],)
-AC_SUBST(LIBTOOL)
-])
-
 dnl sinclude(../gettext.m4) already included in bfd/acinclude.m4
 ifelse(yes,no,[
 AC_DEFUN([CY_WITH_NLS],)
--- opcodes/acinclude.m4	2002-12-04 12:17:45.000000000 -0500
+++ opcodes/acinclude.m4	2002-12-04 23:18:08.000000000 -0500
@@ -1,15 +1,5 @@
 sinclude(../bfd/acinclude.m4)
 
-dnl sinclude(../libtool.m4) already included in bfd/acinclude.m4
-dnl The lines below arrange for aclocal not to bring libtool.m4
-dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
-dnl to add a definition of LIBTOOL to Makefile.in.
-ifelse(yes,no,[
-AC_DEFUN([AM_PROG_LIBTOOL],)
-AC_DEFUN([AM_DISABLE_SHARED],)
-AC_SUBST(LIBTOOL)
-])
-
 dnl sinclude(../gettext.m4) already included in bfd/acinclude.m4
 ifelse(yes,no,[
 AC_DEFUN([CY_WITH_NLS],)
--- rda/configure.in	2002-12-04 12:17:46.000000000 -0500
+++ rda/configure.in	2002-12-04 23:18:08.000000000 -0500
@@ -7,7 +7,7 @@
 dnl automake support
 AM_MAINTAINER_MODE
 dnl AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 AC_EXEEXT
 AC_LANG_C
 
--- rda/lib/Makefile.am	2002-12-04 12:17:46.000000000 -0500
+++ rda/lib/Makefile.am	2002-12-04 23:18:08.000000000 -0500
@@ -9,7 +9,6 @@
 # Create a libtool convenience archive
 # ... and a plain library archive for non-libtool clients
 noinst_LTLIBRARIES = librda.la
-noinst_LIBRARIES = librda.a
 
 INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
 	-I$(srcdir)/../../include
@@ -17,4 +16,3 @@
 THESOURCES=gdbserv-input.c gdbserv-output.c gdbserv-state.c gdbserv-utils.c gdbsocket.c gdblog.c stdio-log.c gdbserv-log.c gdbloop.c gdbsched.c gdbserv-target.c
 
 librda_la_SOURCES = $(THESOURCES)
-librda_a_SOURCES = $(THESOURCES)
--- rda/unix/configure.in	2002-12-04 12:17:47.000000000 -0500
+++ rda/unix/configure.in	2002-12-04 23:18:08.000000000 -0500
@@ -9,7 +9,7 @@
 
 dnl automake support
 AM_MAINTAINER_MODE
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 AC_EXEEXT
 AC_LANG_C
 
@@ -32,43 +32,43 @@
 case "$target" in
   mips64*linux*)
     TARGET_MODULES="linux-target.o no-threads.o ptrace-target.o" 
-    AC_DEFINE(LINUX_TARGET)
-    AC_DEFINE(GREGSET_T,  prgregset_t)
-    AC_DEFINE(FPREGSET_T, prfpregset_t)
-    AC_DEFINE(HAVE_LWPID_T)
-    AC_DEFINE(HAVE_PSADDR_T)
-    AC_DEFINE(HAVE_PRGREGSET_T)
-    AC_DEFINE(HAVE_PRFPREGSET_T)
+    AC_DEFINE(LINUX_TARGET, [], [Define if target is any Linux])
+    AC_DEFINE(GREGSET_T, prgregset_t, [Define the type name of a gregset])
+    AC_DEFINE(FPREGSET_T, prfpregset_t, [Define the type name of an fpregset])
+    AC_DEFINE(HAVE_LWPID_T, [], [Define if system headers will define lwpid_t])
+    AC_DEFINE(HAVE_PSADDR_T, [], [Define if system headers will define psaddr_t])
+    AC_DEFINE(HAVE_PRGREGSET_T, [], [Define if system headers will define prgregset_t])
+    AC_DEFINE(HAVE_PRFPREGSET_T, [], [Define if system headers will define prfpregset_t])
     ;;
   i?86*linux* | \
   powerpc*linux* | \
   arm*linux* | \
   mips*linux*)
     TARGET_MODULES="linux-target.o thread-db.o ptrace-target.o" 
-    AC_DEFINE(LINUX_TARGET)
-    AC_DEFINE(GREGSET_T,  prgregset_t)
-    AC_DEFINE(FPREGSET_T, prfpregset_t)
-    AC_DEFINE(HAVE_LWPID_T)
-    AC_DEFINE(HAVE_PSADDR_T)
-    AC_DEFINE(HAVE_PRGREGSET_T)
-    AC_DEFINE(HAVE_PRFPREGSET_T)
+    AC_DEFINE(LINUX_TARGET, [], [Define if target is any Linux])
+    AC_DEFINE(GREGSET_T, prgregset_t, [Define the type name of a gregset])
+    AC_DEFINE(FPREGSET_T, prfpregset_t, [Define the type name of an fpregset])
+    AC_DEFINE(HAVE_LWPID_T, [], [Define if system headers will define lwpid_t])
+    AC_DEFINE(HAVE_PSADDR_T, [], [Define if system headers will define psaddr_t])
+    AC_DEFINE(HAVE_PRGREGSET_T, [], [Define if system headers will define prgregset_t])
+    AC_DEFINE(HAVE_PRFPREGSET_T, [], [Define if system headers will define prfpregset_t])
     ;;
   *linux*)
     TARGET_MODULES="linux-target.o no-threads.o ptrace-target.o" 
-    AC_DEFINE(LINUX_TARGET)
-    AC_DEFINE(GREGSET_T,  prgregset_t)
-    AC_DEFINE(FPREGSET_T, prfpregset_t)
-    AC_DEFINE(HAVE_LWPID_T)
-    AC_DEFINE(HAVE_PSADDR_T)
-    AC_DEFINE(HAVE_PRGREGSET_T)
-    AC_DEFINE(HAVE_PRFPREGSET_T)
+    AC_DEFINE(LINUX_TARGET, [], [Define if target is any Linux])
+    AC_DEFINE(GREGSET_T, prgregset_t, [Define the type name of a gregset])
+    AC_DEFINE(FPREGSET_T, prfpregset_t, [Define the type name of an fpregset])
+    AC_DEFINE(HAVE_LWPID_T, [], [Define if system headers will define lwpid_t])
+    AC_DEFINE(HAVE_PSADDR_T, [], [Define if system headers will define psaddr_t])
+    AC_DEFINE(HAVE_PRGREGSET_T, [], [Define if system headers will define prgregset_t])
+    AC_DEFINE(HAVE_PRFPREGSET_T, [], [Define if system headers will define prfpregset_t])
     ;;
   *solaris*)
     TARGET_MODULES="solaris-target.o dummy-target.o" 
-    AC_DEFINE(SOLARIS_TARGET)
-# Place-holders -- not necessarily correct...
-    AC_DEFINE(GREGSET_T,  gregset_t)
-    AC_DEFINE(FPREGSET_T, fpregset_t)
+    AC_DEFINE(SOLARIS_TARGET, [], [Define if target is any Solaris])
+    # Place-holders -- not necessarily correct...
+    AC_DEFINE(HAVE_PRGREGSET_T, [], [Define if system headers will define prgregset_t])
+    AC_DEFINE(HAVE_PRFPREGSET_T, [], [Define if system headers will define prfpregset_t])
     ;;
 esac
 
@@ -77,116 +77,116 @@
 case "$target" in
   *solaris*)
     dnl FIXME: differentiate between flavors of Solaris!
-    AC_DEFINE(SPARC32_SOLARIS_TARGET)
-    AC_DEFINE(PTRACE_XFER_SIZE, 4)
-    AC_DEFINE(PTRACE_XFER_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG1_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG2_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG3_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG4_TYPE_LONG)
+    AC_DEFINE(SPARC32_SOLARIS_TARGET, [], [Define is target is Sparc32])
+    AC_DEFINE(PTRACE_XFER_SIZE, 4, [Define for ptrace systems, to the size of a ptrace word.])
+    AC_DEFINE(PTRACE_XFER_TYPE_LONG, [], [Define if ptrace transfer type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG1_TYPE_LONG, [], [Define if ptrace arg1 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG2_TYPE_LONG, [], [Define if ptrace arg2 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG3_TYPE_LONG, [], [Define if ptrace arg3 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG4_TYPE_LONG, [], [Define if ptrace arg4 type is long or unsigned long.])
     ;;
   sh*linux*)
-    AC_DEFINE(SH_LINUX_TARGET)
-    AC_DEFINE(PTRACE_XFER_SIZE, 4)
-    AC_DEFINE(PTRACE_XFER_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG1_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG2_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG3_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG4_TYPE_LONG)
+    AC_DEFINE(SH_LINUX_TARGET, [], [Define if target is SH (3? 4?) Linux])
+    AC_DEFINE(PTRACE_XFER_SIZE, 4, [Define for ptrace systems, to the size of a ptrace word.])
+    AC_DEFINE(PTRACE_XFER_TYPE_LONG, [], [Define if ptrace transfer type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG1_TYPE_LONG, [], [Define if ptrace arg1 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG2_TYPE_LONG, [], [Define if ptrace arg2 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG3_TYPE_LONG, [], [Define if ptrace arg3 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG4_TYPE_LONG, [], [Define if ptrace arg4 type is long or unsigned long.])
     ;;
   mips64*linux*n64)
-    AC_DEFINE(MIPS64_LINUX_TARGET)
-    AC_DEFINE(MIPS_ABI_N64)
-    AC_DEFINE(PTRACE_XFER_SIZE, 8)
-    AC_DEFINE(PTRACE_XFER_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG1_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG2_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG3_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG4_TYPE_LONG)
+    AC_DEFINE(MIPS64_LINUX_TARGET, [], [Define if target is 64-bit MIPS Linux])
+    AC_DEFINE(MIPS_ABI_N64, [], [Define if target uses MIPS n64 ABI])
+    AC_DEFINE(PTRACE_XFER_SIZE, 8, [Define for ptrace systems, to the size of a ptrace word.])
+    AC_DEFINE(PTRACE_XFER_TYPE_LONG_LONG, [], [Define if ptrace transfer type is long long or unsigned long long.])
+    AC_DEFINE(PTRACE_ARG1_TYPE_LONG_LONG, [], [Define if ptrace arg1 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG2_TYPE_LONG_LONG, [], [Define if ptrace arg2 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG3_TYPE_LONG_LONG, [], [Define if ptrace arg3 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG4_TYPE_LONG_LONG, [], [Define if ptrace arg4 type is long or unsigned long.])
     ;;
   mips64*linux*n32)
-    AC_DEFINE(MIPS64_LINUX_TARGET)
-    AC_DEFINE(MIPS_ABI_N32)
-    AC_DEFINE(PTRACE_XFER_SIZE, 8)
-    AC_DEFINE(PTRACE_XFER_TYPE_LONG_LONG)
-    AC_DEFINE(PTRACE_ARG1_TYPE_LONG_LONG)
-    AC_DEFINE(PTRACE_ARG2_TYPE_LONG_LONG)
-    AC_DEFINE(PTRACE_ARG3_TYPE_LONG_LONG)
-    AC_DEFINE(PTRACE_ARG4_TYPE_LONG_LONG)
+    AC_DEFINE(MIPS64_LINUX_TARGET, [], [Define if target is 64-bit MIPS Linux])
+    AC_DEFINE(MIPS_ABI_N32, [], [Define if target uses MIPS n32 ABI])
+    AC_DEFINE(PTRACE_XFER_SIZE, 8, [Define for ptrace systems, to the size of a ptrace word.])
+    AC_DEFINE(PTRACE_XFER_TYPE_LONG_LONG, [], [Define if ptrace transfer type is long long or unsigned long long.])
+    AC_DEFINE(PTRACE_ARG1_TYPE_LONG_LONG, [], [Define if ptrace arg1 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG2_TYPE_LONG_LONG, [], [Define if ptrace arg2 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG3_TYPE_LONG_LONG, [], [Define if ptrace arg3 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG4_TYPE_LONG_LONG, [], [Define if ptrace arg4 type is long or unsigned long.])
     ;;
   mips64*linux*o32)
-    AC_DEFINE(MIPS64_LINUX_TARGET)
-    AC_DEFINE(MIPS_ABI_O32)
-    AC_DEFINE(PTRACE_XFER_SIZE, 4)
-    AC_DEFINE(PTRACE_XFER_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG1_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG2_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG3_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG4_TYPE_LONG)
+    AC_DEFINE(MIPS64_LINUX_TARGET, [], [Define if target is 64-bit MIPS Linux])
+    AC_DEFINE(MIPS_ABI_O32, [], [Define if target uses MIPS o32 ABI])
+    AC_DEFINE(PTRACE_XFER_SIZE, 4, [Define for ptrace systems, to the size of a ptrace word.])
+    AC_DEFINE(PTRACE_XFER_TYPE_LONG, [], [Define if ptrace transfer type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG1_TYPE_LONG, [], [Define if ptrace arg1 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG2_TYPE_LONG, [], [Define if ptrace arg2 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG3_TYPE_LONG, [], [Define if ptrace arg3 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG4_TYPE_LONG, [], [Define if ptrace arg4 type is long or unsigned long.])
     ;;
   mips*linux*)
-    AC_DEFINE(MIPS_LINUX_TARGET)
-    AC_DEFINE(MIPS_ABI_O32)
-    AC_DEFINE(PTRACE_XFER_SIZE, 4)
-    AC_DEFINE(PTRACE_XFER_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG1_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG2_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG3_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG4_TYPE_LONG)
+    AC_DEFINE(MIPS_LINUX_TARGET, [], [Define if target is (32-bit) MIPS Linux])
+    AC_DEFINE(MIPS_ABI_O32, [], [Define if target uses MIPS o32 ABI])
+    AC_DEFINE(PTRACE_XFER_SIZE, 4, [Define for ptrace systems, to the size of a ptrace word.])
+    AC_DEFINE(PTRACE_XFER_TYPE_LONG, [], [Define if ptrace transfer type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG1_TYPE_LONG, [], [Define if ptrace arg1 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG2_TYPE_LONG, [], [Define if ptrace arg2 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG3_TYPE_LONG, [], [Define if ptrace arg3 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG4_TYPE_LONG, [], [Define if ptrace arg4 type is long or unsigned long.])
     ;;
   i?86*linux*)
-    AC_DEFINE(X86_LINUX_TARGET)
-    AC_DEFINE(PTRACE_XFER_SIZE, 4)
-    AC_DEFINE(PTRACE_XFER_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG1_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG2_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG3_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG4_TYPE_LONG)
+    AC_DEFINE(X86_LINUX_TARGET, [], [Define if target is x86 Linux])
+    AC_DEFINE(PTRACE_XFER_SIZE, 4, [Define for ptrace systems, to the size of a ptrace word.])
+    AC_DEFINE(PTRACE_XFER_TYPE_LONG, [], [Define if ptrace transfer type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG1_TYPE_LONG, [], [Define if ptrace arg1 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG2_TYPE_LONG, [], [Define if ptrace arg2 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG3_TYPE_LONG, [], [Define if ptrace arg3 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG4_TYPE_LONG, [], [Define if ptrace arg4 type is long or unsigned long.])
     ;;
   powerpc*linux*)
-    AC_DEFINE(PPC_LINUX_TARGET)
-    AC_DEFINE(PTRACE_XFER_SIZE, 4)
-    AC_DEFINE(PTRACE_XFER_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG1_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG2_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG3_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG4_TYPE_LONG)
+    AC_DEFINE(PPC_LINUX_TARGET, [], [Define if target is powerpc Linux])
+    AC_DEFINE(PTRACE_XFER_SIZE, 4, [Define for ptrace systems, to the size of a ptrace word.])
+    AC_DEFINE(PTRACE_XFER_TYPE_LONG, [], [Define if ptrace transfer type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG1_TYPE_LONG, [], [Define if ptrace arg1 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG2_TYPE_LONG, [], [Define if ptrace arg2 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG3_TYPE_LONG, [], [Define if ptrace arg3 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG4_TYPE_LONG, [], [Define if ptrace arg4 type is long or unsigned long.])
     ;;
   m68k*linux*)
-    AC_DEFINE(M68K_LINUX_TARGET)
-    AC_DEFINE(PTRACE_XFER_SIZE, 4)
-    AC_DEFINE(PTRACE_XFER_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG1_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG2_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG3_TYPE_LONG)
-    AC_DEFINE(PTRACE_ARG4_TYPE_LONG)
+    AC_DEFINE(M68K_LINUX_TARGET, [], [Define if target is m68k Linux])
+    AC_DEFINE(PTRACE_XFER_SIZE, 4, [Define for ptrace systems, to the size of a ptrace word.])
+    AC_DEFINE(PTRACE_XFER_TYPE_LONG, [], [Define if ptrace transfer type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG1_TYPE_LONG, [], [Define if ptrace arg1 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG2_TYPE_LONG, [], [Define if ptrace arg2 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG3_TYPE_LONG, [], [Define if ptrace arg3 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG4_TYPE_LONG, [], [Define if ptrace arg4 type is long or unsigned long.])
     ;;
   alpha*linux*)
-    AC_DEFINE(ALPHA_LINUX_TARGET)
-    AC_DEFINE(PTRACE_XFER_SIZE, 8)
-    AC_DEFINE(PTRACE_XFER_TYPE_LONG_LONG)
-    AC_DEFINE(PTRACE_ARG1_TYPE_LONG_LONG)
-    AC_DEFINE(PTRACE_ARG2_TYPE_LONG_LONG)
-    AC_DEFINE(PTRACE_ARG3_TYPE_LONG_LONG)
-    AC_DEFINE(PTRACE_ARG4_TYPE_LONG_LONG)
+    AC_DEFINE(ALPHA_LINUX_TARGET, [], [Define if target is alpha Linux])
+    AC_DEFINE(PTRACE_XFER_SIZE, 8, [Define for ptrace systems, to the size of a ptrace word.])
+    AC_DEFINE(PTRACE_XFER_TYPE_LONG_LONG, [], [Define if ptrace transfer type is long long or unsigned long long.])
+    AC_DEFINE(PTRACE_ARG1_TYPE_LONG_LONG, [], [Define if ptrace arg1 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG2_TYPE_LONG_LONG, [], [Define if ptrace arg2 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG3_TYPE_LONG_LONG, [], [Define if ptrace arg3 type is long or unsigned long.])
+    AC_DEFINE(PTRACE_ARG4_TYPE_LONG_LONG, [], [Define if ptrace arg4 type is long or unsigned long.])
     ;;
   arm*linux*)
 	if test "$arm32" = "yes"; then
-	    AC_DEFINE(ARM_LINUX_TARGET)
-    	    AC_DEFINE(PTRACE_XFER_SIZE, 4)
-    	    AC_DEFINE(PTRACE_XFER_TYPE_LONG)
-    	    AC_DEFINE(PTRACE_ARG1_TYPE_LONG)
-      	    AC_DEFINE(PTRACE_ARG2_TYPE_LONG)
-    	    AC_DEFINE(PTRACE_ARG3_TYPE_LONG)
-    	    AC_DEFINE(PTRACE_ARG4_TYPE_LONG)
+	    AC_DEFINE(ARM_LINUX_TARGET, [], [Define if target is arm Linux])
+	    AC_DEFINE(PTRACE_XFER_SIZE, 4, [Define for ptrace systems, to the size of a ptrace word.])
+	    AC_DEFINE(PTRACE_XFER_TYPE_LONG, [], [Define if ptrace transfer type is long or unsigned long.])
+	    AC_DEFINE(PTRACE_ARG1_TYPE_LONG, [], [Define if ptrace arg1 type is long or unsigned long.])
+	    AC_DEFINE(PTRACE_ARG2_TYPE_LONG, [], [Define if ptrace arg2 type is long or unsigned long.])
+	    AC_DEFINE(PTRACE_ARG3_TYPE_LONG, [], [Define if ptrace arg3 type is long or unsigned long.])
+	    AC_DEFINE(PTRACE_ARG4_TYPE_LONG, [], [Define if ptrace arg4 type is long or unsigned long.])
 	else
-    	    AC_DEFINE(ARM_LINUX_TARGET)
-    	    AC_DEFINE(PTRACE_XFER_SIZE, 8)
-    	    AC_DEFINE(PTRACE_XFER_TYPE_LONG_LONG)
-    	    AC_DEFINE(PTRACE_ARG1_TYPE_LONG_LONG)
-    	    AC_DEFINE(PTRACE_ARG2_TYPE_LONG_LONG)
-    	    AC_DEFINE(PTRACE_ARG3_TYPE_LONG_LONG)
-    	    AC_DEFINE(PTRACE_ARG4_TYPE_LONG_LONG)
+    	    AC_DEFINE(ARM_LINUX_TARGET, [], [Define if target is arm Linux])
+    	    AC_DEFINE(PTRACE_XFER_SIZE, 8, [Define for ptrace systems, to the size of a ptrace word.])
+	    AC_DEFINE(PTRACE_XFER_TYPE_LONG_LONG, [], [Define if ptrace transfer type is long long or unsigned long long.])
+	    AC_DEFINE(PTRACE_ARG1_TYPE_LONG_LONG, [], [Define if ptrace arg1 type is long or unsigned long.])
+	    AC_DEFINE(PTRACE_ARG2_TYPE_LONG_LONG, [], [Define if ptrace arg2 type is long or unsigned long.])
+	    AC_DEFINE(PTRACE_ARG3_TYPE_LONG_LONG, [], [Define if ptrace arg3 type is long or unsigned long.])
+	    AC_DEFINE(PTRACE_ARG4_TYPE_LONG_LONG, [], [Define if ptrace arg4 type is long or unsigned long.])
 	fi
 	;;
 esac
--- rda/win32/configure.in	2002-12-04 12:17:47.000000000 -0500
+++ rda/win32/configure.in	2002-12-04 23:18:08.000000000 -0500
@@ -24,14 +24,10 @@
 case "$target" in
   *cygwin*)
     dnl FIXME: differentiate between flavors of Solaris!
-    AC_DEFINE(WIN32_TARGET)
+    AC_DEFINE(WIN32_TARGET, [], [Define if target is Win32])
     ;;
 esac
 
-if test -f /usr/include/foo.h; then
-  AC_DEFINE(HAVE_AC_DEFINE, 1, [define if have AC_DEFINE])
-fi
-
 dnl Outputs
 AC_OUTPUT(Makefile)
 
--- utils/configure.in        23 Nov 2002 04:01:30 -0000      1.4
+++ utils/configure.in        30 Dec 2002 00:01:57 -0000
@@ -2,6 +2,7 @@
 
 AC_PROG_INSTALL
 AC_CANONICAL_SYSTEM
+AC_PROG_CC
 
 if test -d ${srcdir}/spu ; then
   configdirs="spu"
--- sim/common/Make-common.in	6 Nov 2002 18:40:25 -0000	1.10
+++ sim/common/Make-common.in	3 Jan 2003 07:24:40 -0000
@@ -636,19 +636,17 @@
 # Dummy target to force execution of dependent targets.
 force:
 
-Makefile: Makefile.in $(srccom)/Make-common.in config.status
-	CONFIG_HEADERS= $(SHELL) ./config.status
-
 config.status: configure
 	$(SHELL) ./config.status --recheck
 
-config.h: stamp-h ; @true
-stamp-h: config.in config.status
-	CONFIG_FILES= CONFIG_HEADERS=config.h:config.in $(SHELL) ./config.status
+Makefile: config.status Makefile.in $(srccom)/Make-common.in
+	$(SHELL) ./config.status
 
-.gdbinit: # config.status $(srccom)/gdbinit.in
-	CONFIG_FILES=$@:../common/gdbinit.in CONFIG_HEADERS= $(SHELL) ./config.status
+config.h: config.status config.in
+	$(SHELL) ./config.status config.h
 
+.gdbinit: config.status $(srccom)/gdbinit.in
+	$(SHELL) ./config.status .gdbinit
 
 # CGEN support
 
--- sim/common/aclocal.m4	16 Jun 2002 16:33:12 -0000	1.5
+++ sim/common/aclocal.m4	3 Jan 2003 07:24:43 -0000
@@ -23,7 +23,6 @@
 # autoconf.info says this should be called right after AC_INIT.
 AC_CONFIG_HEADER(ifelse([$1],,config.h,[$1]):config.in)
 
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM
 AC_PROG_CC
@@ -861,21 +860,18 @@
 AC_DEFUN(SIM_AC_OUTPUT,
 [
 AC_LINK_FILES($sim_link_files, $sim_link_links)
-AC_OUTPUT(Makefile.sim:Makefile.in Make-common.sim:../common/Make-common.in .gdbinit:../common/gdbinit.in,
-[case "x$CONFIG_FILES" in
- xMakefile*)
-   echo "Merging Makefile.sim+Make-common.sim into Makefile ..."
-   rm -f Makesim1.tmp Makesim2.tmp Makefile
-   sed -n -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ p' <Make-common.sim >Makesim1.tmp
-   sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >Makesim2.tmp
-   sed -e '/^## COMMON_PRE_/ r Makesim1.tmp' \
-	-e '/^## COMMON_POST_/ r Makesim2.tmp' \
-	<Makefile.sim >Makefile
-   rm -f Makefile.sim Make-common.sim Makesim1.tmp Makesim2.tmp
-   ;;
- esac
- case "x$CONFIG_HEADERS" in xconfig.h:config.in) echo > stamp-h ;; esac
+AC_CONFIG_FILES(Makefile.sim:Makefile.in Make-common.sim:../common/Make-common.in .gdbinit:../common/gdbinit.in)
+AC_CONFIG_COMMANDS([Makefile],
+  [ echo "Merging Makefile.sim and Make-common.sim into Makefile ..."
+    rm -f Makesim1.tmp Makesim2.tmp Makefile
+    sed -n -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ p' <Make-common.sim >Makesim1.tmp
+    sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >Makesim2.tmp
+    sed -e '/^## COMMON_PRE_/ r Makesim1.tmp' \
+      -e '/^## COMMON_POST_/ r Makesim2.tmp' \
+      <Makefile.sim >Makefile
+    rm -f Makefile.sim Make-common.sim Makesim1.tmp Makesim2.tmp
 ])
+AC_OUTPUT
 ])
 
 # This file is derived from `gettext.m4'.  The difference is that the
@@ -904,7 +900,7 @@
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS)
+      AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested])
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
         [  --with-included-gettext use the GNU gettext library included here],
@@ -938,7 +934,8 @@
 
 	   if test "$gt_cv_func_gettext_libc" = "yes" \
 	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      AC_DEFINE(HAVE_GETTEXT)
+	      AC_DEFINE(HAVE_GETTEXT, 1,
+			[Define as 1 if you have gettext and don't want to use GNU gettext.])
 	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
 		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
 	      if test "$MSGFMT" != "no"; then
@@ -1217,7 +1214,8 @@
       [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
        am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
     if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES)
+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
+		[Define if your locale.h file contains LC_MESSAGES.])
     fi
   fi])
 
--- sim/common/configure.in	20 Mar 2001 17:13:39 -0000	1.2
+++ sim/common/configure.in	3 Jan 2003 07:25:01 -0000
@@ -1,6 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 # This is intended for use by the target specific directories, and by us.
 SIM_AC_COMMON(cconfig.h)
--- sim/arm/configure.in	30 May 2000 17:13:37 -0000	1.2
+++ sim/arm/configure.in	3 Jan 2003 07:24:36 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
--- sim/d10v/configure.in	16 Apr 1999 01:34:59 -0000	1.1.1.1
+++ sim/d10v/configure.in	3 Jan 2003 07:24:36 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
--- sim/d30v/configure.in	16 Apr 1999 01:35:00 -0000	1.1.1.1
+++ sim/d30v/configure.in	3 Jan 2003 07:24:36 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
--- sim/erc32/configure.in	26 Apr 1999 18:31:58 -0000	1.1.1.2
+++ sim/erc32/configure.in	3 Jan 2003 07:24:36 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
--- sim/fr30/configure.in	16 Jul 2002 14:30:13 -0000	1.2
+++ sim/fr30/configure.in	3 Jan 2003 07:24:36 -0000
@@ -2,6 +2,7 @@
 dnl OBSOLETE sinclude(../common/aclocal.m4)
 dnl OBSOLETE AC_PREREQ(2.5)dnl
 dnl OBSOLETE AC_INIT(Makefile.in)
+dnl OBSOLETE AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 dnl OBSOLETE 
 dnl OBSOLETE SIM_AC_COMMON
 dnl OBSOLETE 
--- sim/h8300/configure.in	16 Apr 1999 01:35:02 -0000	1.1.1.1
+++ sim/h8300/configure.in	3 Jan 2003 07:24:36 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
--- sim/h8500/configure.in	16 Apr 1999 01:35:02 -0000	1.1.1.1
+++ sim/h8500/configure.in	3 Jan 2003 07:24:36 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
--- sim/i960/configure.in	16 Apr 1999 01:35:03 -0000	1.1.1.1
+++ sim/i960/configure.in	3 Jan 2003 07:24:36 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
--- sim/igen/configure.in	16 Apr 1999 01:35:04 -0000	1.1.1.1
+++ sim/igen/configure.in	3 Jan 2003 07:24:36 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(table.h)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 AC_PROG_INSTALL
 AC_PROG_CC
--- sim/m32r/configure.in	16 Apr 1999 01:35:05 -0000	1.1.1.1
+++ sim/m32r/configure.in	3 Jan 2003 07:24:36 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
--- sim/m68hc11/configure.in	27 Jul 2000 11:23:39 -0000	1.1
+++ sim/m68hc11/configure.in	3 Jan 2003 07:24:36 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.12.1)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
--- sim/mcore/configure.in	27 Apr 1999 01:33:01 -0000	1.1.1.1
+++ sim/mcore/configure.in	3 Jan 2003 07:24:37 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
--- sim/mips/configure.in	14 Jun 2002 18:49:09 -0000	1.4
+++ sim/mips/configure.in	3 Jan 2003 07:24:37 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
--- sim/mn10200/configure.in	16 Apr 1999 01:35:07 -0000	1.1.1.1
+++ sim/mn10200/configure.in	3 Jan 2003 07:24:37 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
--- sim/mn10300/configure.in	16 Apr 1999 01:35:07 -0000	1.1.1.1
+++ sim/mn10300/configure.in	3 Jan 2003 07:24:37 -0000
@@ -3,6 +3,7 @@
 dnl 2.12 botches SHELL substitution
 AC_PREREQ(2.12.1)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
--- sim/ppc/configure.in	16 Dec 2001 21:00:08 -0000	1.3
+++ sim/ppc/configure.in	3 Jan 2003 07:24:39 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 AC_PROG_INSTALL
 AC_PROG_CC
--- sim/sh/configure.in	16 Apr 1999 01:35:12 -0000	1.1.1.1
+++ sim/sh/configure.in	3 Jan 2003 07:24:39 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
--- sim/sh64/configure.in	1 Feb 2002 11:44:26 -0000	1.1
+++ sim/sh64/configure.in	3 Jan 2003 07:24:39 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
--- sim/testsuite/configure.in	16 Apr 1999 01:35:14 -0000	1.1.1.1
+++ sim/testsuite/configure.in	3 Jan 2003 07:24:39 -0000
@@ -6,10 +6,10 @@
 
 AC_PREREQ(2.5)
 AC_INIT(common/bits-tst.c)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 CC=${CC-cc}
 AC_SUBST(CC)
-AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 AC_CANONICAL_SYSTEM
 
 # Directories to use in all configurations.
--- sim/v850/configure.in	16 Apr 1999 01:35:12 -0000	1.1.1.1
+++ sim/v850/configure.in	3 Jan 2003 07:24:39 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
--- sim/z8k/configure.in	16 Apr 1999 01:35:14 -0000	1.1.1.1
+++ sim/z8k/configure.in	3 Jan 2003 07:24:39 -0000
@@ -2,6 +2,7 @@
 sinclude(../common/aclocal.m4)
 AC_PREREQ(2.5)dnl
 AC_INIT(Makefile.in)
+AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/../..)
 
 SIM_AC_COMMON
 
