* Makefile.in (prefix, exec_prefix): Use @-subtitutions.

* aclocal.m4 (AC_OUTPUT_LINKS): Deleted redefinition, since autoconf 1.109 has
this fixed.
* configure.in: Don't change quote characters around AC_MSG_ERROR invocation.
Don't use AC_HEADER_STDC, since it requires running a program.  Cache
NEED_*_DECLARATION values.
* configure, conf.in: Regenerated with a modified autoconf 1.109.

5 files changed, 153 insertions, 234 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index e060c2e..15f505f 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,14 @@
+Wed Aug 31 17:43:06 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
+
+	* Makefile.in (prefix, exec_prefix): Use @-subtitutions.
+
+	* aclocal.m4 (AC_OUTPUT_LINKS): Deleted redefinition, since
+	autoconf 1.109 has this fixed.
+	* configure.in: Don't change quote characters around AC_MSG_ERROR
+	invocation.  Don't use AC_HEADER_STDC, since it requires running a
+	program.  Cache NEED_*_DECLARATION values.
+	* configure, conf.in: Regenerated with a modified autoconf 1.109.
+
 Wed Aug 31 11:20:48 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
 
 	* config/obj-coff.h (S_IS_DEFINED): Absolute symbols are defined
diff --git a/gas/aclocal.m4 b/gas/aclocal.m4
index 7d614bd..bc7455d 100644
--- a/gas/aclocal.m4
+++ b/gas/aclocal.m4
@@ -1,36 +1,4 @@
 dnl
-dnl The autoconf 1.107 version of this doesn't substitute variables
-dnl in the names of the links or their targets.  This is a problem...
-dnl
-undefine([AC_OUTPUT_LINKS])dnl
-define(AC_OUTPUT_LINKS,
-[EOF
-
-cat >> ${CONFIG_STATUS} <<EOF
-ac_links="$1"
-ac_files="$2"
-EOF
-
-cat >> ${CONFIG_STATUS} <<\EOF
-while test -n "${ac_files}"; do
-  set ${ac_links}; ac_link=[$]1; shift; ac_links=[$]*
-  set ${ac_files}; ac_file=[$]1; shift; ac_files=[$]*
-
-  echo "linking ${ac_link} to ${srcdir}/${ac_file}"
-
-  if test ! -r ${srcdir}/${ac_file}; then
-    AC_MSG_ERROR(${srcdir}/${ac_file}: File not found)
-  fi
-  rm -f ${ac_link}
-  # Make a symlink if possible; otherwise try a hard link.
-  if ln -s ${srcdir}/${ac_file} ${ac_link} 2>/dev/null ||
-    ln ${srcdir}/${ac_file} ${ac_link}; then :
-  else
-    AC_MSG_ERROR(can not link ${ac_link} to ${srcdir}/${ac_file})
-  fi
-done
-])dnl
-dnl
 dnl This ugly hack is needed because the Cygnus configure script won't
 dnl tell us what CC is going to be, and "cc" isn't always right.  (The
 dnl top-level Makefile will always override anything we choose here, so
diff --git a/gas/conf.in b/gas/conf.in
index 2782619..93900df 100644
--- a/gas/conf.in
+++ b/gas/conf.in
@@ -22,9 +22,6 @@
  */
 #undef STACK_DIRECTION
 
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
 /* Should gas use high-level BFD interfaces?  */
 #undef BFD_ASSEMBLER
 
diff --git a/gas/configure b/gas/configure
index 0886ea1..6fb03dd 100755
--- a/gas/configure
+++ b/gas/configure
@@ -1,6 +1,7 @@
 #!/bin/sh
+
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 1.107 
+# Generated automatically using autoconf version 1.109 
 # Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
 #
 # This configure script is free software; you can redistribute it and/or
@@ -219,7 +220,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 1.107"
+    echo "configure generated by autoconf version 1.109"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -419,6 +420,18 @@ ac_config_sub=${ac_aux_dir}/config.sub
 ac_configure=${ac_aux_dir}/configure # This should be Cygnus configure.
 ac_install_sh="${ac_aux_dir}/install.sh -c"
 
+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
+    ac_n= ac_c='
+' ac_t='	'
+  else
+    ac_n=-n ac_c= ac_t=
+  fi
+else
+  ac_n= ac_c='\c' ac_t=
+fi
+
 # Do some error checking and defaulting for the host and target type.
 # The inputs are:
 #    configure --host=HOST --target=TARGET --build=BUILD NONOPT
@@ -445,17 +458,6 @@ if ${ac_config_sub} sun4 >/dev/null 2>&1; then :
 else { echo "configure: can not run ${ac_config_sub}" 1>&2; exit 1; }
 fi
 
-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
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
 echo $ac_n "checking host system type""... $ac_c" 1>&4
 
 host_alias=$host
@@ -679,16 +681,14 @@ case "${obj_format}" in
 esac
 
 
-
-if [ ! -r ${srcdir}/config/tc-${cpu_type}.c ]; then
+if test ! -r ${srcdir}/config/tc-${cpu_type}.c; then
   { echo "configure: GAS does not support target CPU ${cpu_type}" 1>&2; exit 1; }
 fi
 
-if [ ! -r ${srcdir}/config/obj-${obj_format}.c ]; then
+if test ! -r ${srcdir}/config/obj-${obj_format}.c; then
   { echo "configure: GAS does not have support for object file format ${obj_format}" 1>&2; exit 1; }
 fi
 
-
 # and target makefile frag
 
 target_frag=${srcdir}/config/${gas_target}.mt
@@ -881,17 +881,16 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.${ac_ext} <<EOF
-#line 884 "configure"
+#line 885 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 Syntax Error
 EOF
-# Some shells (Coherent) do redirections in the wrong order, so need
-# the parens.
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_err=`eval "$ac_cpp conftest.${ac_ext} >/dev/null" 2>&1`
 if test -z "$ac_err"; then
   :
 else
+  echo "$ac_err" >&5
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.${ac_ext} <<EOF
@@ -900,12 +899,11 @@ else
 #include <stdio.h>
 Syntax Error
 EOF
-# Some shells (Coherent) do redirections in the wrong order, so need
-# the parens.
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_err=`eval "$ac_cpp conftest.${ac_ext} >/dev/null" 2>&1`
 if test -z "$ac_err"; then
   :
 else
+  echo "$ac_err" >&5
   rm -rf conftest*
   CPP=/lib/cpp
 fi
@@ -917,68 +915,43 @@ fi
 fi
 CPP="$ac_cv_prog_CPP"
 echo "$ac_t""$CPP" 1>&4
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_header_stdc'+set}'`\" = set"; then
+
+for ac_hdr in string.h stdlib.h memory.h strings.h unistd.h stdarg.h varargs.h errno.h sys/types.h
+do
+ac_safe=`echo "${ac_hdr}" | tr './' '__'`
+echo $ac_n "checking for ${ac_hdr}""... $ac_c" 1>&4
+if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.${ac_ext} <<EOF
-#line 925 "configure"
+#line 928 "configure"
 #include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
+#include <${ac_hdr}>
 EOF
-# Some shells (Coherent) do redirections in the wrong order, so need
-# the parens.
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
+ac_err=`eval "$ac_cpp conftest.${ac_ext} >/dev/null" 2>&1`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  ac_cv_header_stdc=yes
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.${ac_ext} <<EOF
-#line 947 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "memchr" conftest.out >/dev/null 2>&1; then
-  :
+  eval "ac_cv_header_$ac_safe=yes"
 else
+  echo "$ac_err" >&5
   rm -rf conftest*
-  ac_cv_header_stdc=no
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-
 fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.${ac_ext} <<EOF
-#line 965 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&4
+    ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'`
+  cat >> confdefs.h <<EOF
+#define ${ac_tr_hdr} 1
 EOF
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "free" conftest.out >/dev/null 2>&1; then
-  :
+ 
 else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
+  echo "$ac_t""no" 1>&4
 fi
-rm -f conftest*
+done
 
-fi
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 # If we cannot run a trivial program, we must be cross compiling.
 echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&4
 if eval "test \"`echo '${'ac_cv_c_cross'+set}'`\" = set"; then
@@ -988,7 +961,7 @@ else
   { echo "configure: can not run test program while cross compiling" 1>&2; exit 1; }
 else
 cat > conftest.${ac_ext} <<EOF
-#line 991 "configure"
+#line 965 "configure"
 #include "confdefs.h"
 main(){exit(0);}
 EOF
@@ -1003,75 +976,6 @@ rm -fr conftest*
 fi
 cross_compiling=$ac_cv_c_cross
 echo "$ac_t""$ac_cv_c_cross" 1>&4
-if test "$cross_compiling" = yes; then
-  { echo "configure: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-cat > conftest.${ac_ext} <<EOF
-#line 1010 "configure"
-#include "confdefs.h"
-#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
-
-EOF
-eval $ac_compile
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
-  :
-else
-  ac_stdc_headers=no
-fi
-fi
-rm -fr conftest*
-fi
-fi
-echo "$ac_t""$ac_cv_header_stdc" 1>&4
-if test $ac_cv_header_stdc = yes; then
-  cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
-EOF
-
-fi
-
-for ac_hdr in string.h stdlib.h memory.h strings.h unistd.h stdarg.h varargs.h errno.h sys/types.h
-do
-ac_safe=`echo "${ac_hdr}" | tr './' '__'`
-echo $ac_n "checking for ${ac_hdr}""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&4
-else
-  cat > conftest.${ac_ext} <<EOF
-#line 1047 "configure"
-#include "confdefs.h"
-#include <${ac_hdr}>
-EOF
-# Some shells (Coherent) do redirections in the wrong order, so need
-# the parens.
-ac_err=`eval "($ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&4
-    ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'`
-  cat >> confdefs.h <<EOF
-#define ${ac_tr_hdr} 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&4
-fi
-done
-
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
@@ -1080,7 +984,7 @@ if eval "test \"`echo '${'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.${ac_ext} <<EOF
-#line 1083 "configure"
+#line 988 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() { return 0; }
@@ -1111,7 +1015,7 @@ if eval "test \"`echo '${'ac_cv_func_alloca'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.${ac_ext} <<EOF
-#line 1114 "configure"
+#line 1019 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1169,7 +1073,7 @@ if eval "test \"`echo '${'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.${ac_ext} <<EOF
-#line 1172 "configure"
+#line 1077 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1178,8 +1082,8 @@ wenotbecray
 #endif
 
 EOF
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "webecray" conftest.out >/dev/null 2>&1; then
+if eval "$ac_cpp conftest.${ac_ext}" 2>&5 |
+  egrep "webecray" >/dev/null 2>&1; then
   rm -rf conftest*
   ac_cv_os_cray=yes
 else
@@ -1196,7 +1100,7 @@ if eval "test \"`echo '${'ac_cv_func__getb67'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.${ac_ext} <<EOF
-#line 1199 "configure"
+#line 1104 "configure"
 #include "confdefs.h"
 #include <ctype.h> /* Arbitrary system header to define __stub macros. */
 int main() { return 0; }
@@ -1237,7 +1141,7 @@ if eval "test \"`echo '${'ac_cv_func_GETB67'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.${ac_ext} <<EOF
-#line 1240 "configure"
+#line 1145 "configure"
 #include "confdefs.h"
 #include <ctype.h> /* Arbitrary system header to define __stub macros. */
 int main() { return 0; }
@@ -1278,7 +1182,7 @@ if eval "test \"`echo '${'ac_cv_func_getb67'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&4
 else
   cat > conftest.${ac_ext} <<EOF
-#line 1281 "configure"
+#line 1186 "configure"
 #include "confdefs.h"
 #include <ctype.h> /* Arbitrary system header to define __stub macros. */
 int main() { return 0; }
@@ -1332,7 +1236,7 @@ ac_cv_c_stack_direction=0
 
 else
 cat > conftest.${ac_ext} <<EOF
-#line 1335 "configure"
+#line 1240 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -1373,7 +1277,7 @@ if eval "test \"`echo '${'ac_cv_c_inline'+set}'`\" = set"; then
 else
   if test "$GCC" = yes; then
 cat > conftest.${ac_ext} <<EOF
-#line 1376 "configure"
+#line 1281 "configure"
 #include "confdefs.h"
 
 int main() { return 0; }
@@ -1406,9 +1310,12 @@ fi
 # Some non-ANSI preprocessors botch requoting inside strings.  That's bad
 # enough, but on some of those systems, the assert macro relies on requoting
 # working properly!
-echo "checking for working assert macro" 1>&4
-cat > conftest.${ac_ext} <<EOF
-#line 1411 "configure"
+echo $ac_n "checking for working assert macro""... $ac_c" 1>&4
+if eval "test \"`echo '${'gas_cv_assert_ok'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&4
+else
+  cat > conftest.${ac_ext} <<EOF
+#line 1319 "configure"
 #include "confdefs.h"
 #include <assert.h>
 #include <stdio.h>
@@ -1426,23 +1333,30 @@ assert (a == b
 ; return 0; }
 EOF
 if eval $ac_compile; then
-  :
+  rm -rf conftest*
+  gas_cv_assert_ok=yes
 else
   rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define BROKEN_ASSERT 1
-EOF
-
+  gas_cv_assert_ok=no
 fi
 rm -f conftest*
 
+fi
+echo "$ac_t""$gas_cv_assert_ok" 1>&4
+test $gas_cv_assert_ok = yes || cat >> confdefs.h <<\EOF
+#define BROKEN_ASSERT 1
+EOF
+
 
 # On some systems, the system header files may not declare malloc, realloc,
 # and free.  There are places where gas needs these functions to have been
 # declared -- such as when taking their addresses.
-echo "checking whether malloc declaration is required" 1>&4
-cat > conftest.${ac_ext} <<EOF
-#line 1445 "configure"
+echo $ac_n "checking whether a malloc declaration is required""... $ac_c" 1>&4
+if eval "test \"`echo '${'gas_cv_malloc_decl_needed'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&4
+else
+  cat > conftest.${ac_ext} <<EOF
+#line 1360 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_MEMORY_H
@@ -1467,19 +1381,27 @@ f = (char *(*)()) malloc;
 ; return 0; }
 EOF
 if eval $ac_compile; then
-  :
+  rm -rf conftest*
+  gas_cv_malloc_decl_needed=no
 else
   rm -rf conftest*
-  cat >> confdefs.h <<\EOF
+  gas_cv_malloc_decl_needed=yes
+fi
+rm -f conftest*
+
+fi
+echo "$ac_t""$gas_cv_malloc_decl_needed" 1>&4
+test $gas_cv_malloc_decl_needed = no || cat >> confdefs.h <<\EOF
 #define NEED_MALLOC_DECLARATION 1
 EOF
 
-fi
-rm -f conftest*
 
-echo "checking free declaration required" 1>&4
-cat > conftest.${ac_ext} <<EOF
-#line 1482 "configure"
+echo $ac_n "checking whether a free declaration is required""... $ac_c" 1>&4
+if eval "test \"`echo '${'gas_cv_free_decl_needed'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&4
+else
+  cat > conftest.${ac_ext} <<EOF
+#line 1405 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_MEMORY_H
@@ -1504,22 +1426,30 @@ f = (int (*)()) free;
 ; return 0; }
 EOF
 if eval $ac_compile; then
-  :
+  rm -rf conftest*
+  gas_cv_free_decl_needed=no
 else
   rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define NEED_FREE_DECLARATION 1
-EOF
-
+  gas_cv_free_decl_needed=yes
 fi
 rm -f conftest*
 
+fi
+
+echo "$ac_t""$gas_cv_free_decl_needed" 1>&4
+test $gas_cv_free_decl_needed = no || cat >> confdefs.h <<\EOF
+#define NEED_FREE_DECLARATION 1
+EOF
+
 
 # Does errno.h declare errno, or do we have to add a separate declaration
 # for it?
-echo "checking errno declaration required" 1>&4
-cat > conftest.${ac_ext} <<EOF
-#line 1522 "configure"
+echo $ac_n "checking whether an errno declaration is required""... $ac_c" 1>&4
+if eval "test \"`echo '${'gas_cv_errno_decl_needed'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&4
+else
+  cat > conftest.${ac_ext} <<EOF
+#line 1453 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_ERRNO_H
@@ -1535,16 +1465,21 @@ x = errno;
 ; return 0; }
 EOF
 if eval $ac_compile; then
-  :
+  rm -rf conftest*
+  gas_cv_errno_decl_needed=no
 else
   rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define NEED_ERRNO_DECLARATION 1
-EOF
-
+  gas_cv_errno_decl_needed=yes
 fi
 rm -f conftest*
 
+fi
+
+echo "$ac_t""$gas_cv_errno_decl_needed" 1>&4
+test $gas_cv_errno_decl_needed = no || cat >> confdefs.h <<\EOF
+#define NEED_ERRNO_DECLARATION 1
+EOF
+
 
 subdirs="testsuite"
 
@@ -1613,7 +1548,7 @@ do
     echo running \${CONFIG_SHELL-/bin/sh} $0 $configure_args --no-create --norecursion
     exec \${CONFIG_SHELL-/bin/sh} $0 $configure_args --no-create --norecursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "${CONFIG_STATUS} generated by autoconf version 1.107"
+    echo "${CONFIG_STATUS} generated by autoconf version 1.109"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -1777,12 +1712,12 @@ for ac_file in .. ${CONFIG_HEADERS}; do if test "x$ac_file" != x..; then
 EOF
 
 # Transform confdefs.h into a sed script conftest.vals that substitutes
-# the proper values into config.h.in to produce config.h.
+# the proper values into config.h.in to produce config.h.  And first:
+# Protect against being on the right side of a sed subst in config.status. 
+# Protect against being in an unquoted here document in config.status.
 rm -f conftest.vals
 cat > conftest.hdr <<\EOF
-# Protect against being on the right side of a sed subst in config.status. 
 s/[\\&%]/\\&/g
-# Protect against being in an unquoted here document in config.status.
 s%[\\$`]%\\&%g
 s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
 s%ac_d%ac_u%gp
diff --git a/gas/configure.in b/gas/configure.in
index 57e809e..914e8d1 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -196,18 +196,14 @@ dnl
 dnl Make sure the desired support files exist.
 dnl
 
-changequote(<<<,>>>)dnl
-
-if [ ! -r ${srcdir}/config/tc-${cpu_type}.c ]; then
+if test ! -r ${srcdir}/config/tc-${cpu_type}.c; then
   AC_MSG_ERROR(GAS does not support target CPU ${cpu_type})
 fi
 
-if [ ! -r ${srcdir}/config/obj-${obj_format}.c ]; then
+if test ! -r ${srcdir}/config/obj-${obj_format}.c; then
   AC_MSG_ERROR(GAS does not have support for object file format ${obj_format})
 fi
 
-changequote([,])dnl
-
 # and target makefile frag
 
 target_frag=${srcdir}/config/${gas_target}.mt
@@ -295,7 +291,6 @@ esac
 AC_PROG_CC
 AC_PROG_INSTALL
 
-AC_HEADER_STDC
 AC_CHECK_HEADERS(string.h stdlib.h memory.h strings.h unistd.h stdarg.h varargs.h errno.h sys/types.h)
 
 dnl ansidecl.h will deal with const
@@ -306,7 +301,8 @@ AC_C_INLINE
 # Some non-ANSI preprocessors botch requoting inside strings.  That's bad
 # enough, but on some of those systems, the assert macro relies on requoting
 # working properly!
-AC_CHECKING([for working assert macro])
+AC_MSG_CHECKING([for working assert macro])
+AC_CACHE_VAL(gas_cv_assert_ok,
 AC_TRY_LINK([#include <assert.h>
 #include <stdio.h>], [
 /* check for requoting problems */
@@ -316,12 +312,15 @@ assert (!strcmp(s, "foo bar baz quux"));
 /* check for newline handling */
 assert (a == b
         || c == d);
-], , AC_DEFINE(BROKEN_ASSERT))
+], gas_cv_assert_ok=yes, gas_cv_assert_ok=no))dnl
+AC_MSG_RESULT($gas_cv_assert_ok)
+test $gas_cv_assert_ok = yes || AC_DEFINE(BROKEN_ASSERT)
 
 # On some systems, the system header files may not declare malloc, realloc,
 # and free.  There are places where gas needs these functions to have been
 # declared -- such as when taking their addresses.
-AC_CHECKING([whether malloc declaration is required])
+AC_MSG_CHECKING([whether a malloc declaration is required])
+AC_CACHE_VAL(gas_cv_malloc_decl_needed,
 AC_TRY_LINK([
 #ifdef HAVE_MEMORY_H
 #include <memory.h>
@@ -338,8 +337,12 @@ AC_TRY_LINK([
 ], [
 char *(*f) ();
 f = (char *(*)()) malloc;
-], , AC_DEFINE(NEED_MALLOC_DECLARATION))
-AC_CHECKING([free declaration required])
+], gas_cv_malloc_decl_needed=no, gas_cv_malloc_decl_needed=yes))dnl
+AC_MSG_RESULT($gas_cv_malloc_decl_needed)
+test $gas_cv_malloc_decl_needed = no || AC_DEFINE(NEED_MALLOC_DECLARATION)
+
+AC_MSG_CHECKING([whether a free declaration is required])
+AC_CACHE_VAL(gas_cv_free_decl_needed,
 AC_TRY_LINK([
 #ifdef HAVE_MEMORY_H
 #include <memory.h>
@@ -356,11 +359,14 @@ AC_TRY_LINK([
 ], [
 int (*f) ();
 f = (int (*)()) free;
-], , AC_DEFINE(NEED_FREE_DECLARATION))
+], gas_cv_free_decl_needed=no, gas_cv_free_decl_needed=yes))
+AC_MSG_RESULT($gas_cv_free_decl_needed)
+test $gas_cv_free_decl_needed = no || AC_DEFINE(NEED_FREE_DECLARATION)
 
 # Does errno.h declare errno, or do we have to add a separate declaration
 # for it?
-AC_CHECKING([errno declaration required])
+AC_MSG_CHECKING([whether an errno declaration is required])
+AC_CACHE_VAL(gas_cv_errno_decl_needed,
 AC_TRY_LINK([
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
@@ -368,7 +374,9 @@ AC_TRY_LINK([
 ], [
 int x;
 x = errno;
-], , AC_DEFINE(NEED_ERRNO_DECLARATION))
+], gas_cv_errno_decl_needed=no, gas_cv_errno_decl_needed=yes))
+AC_MSG_RESULT($gas_cv_errno_decl_needed)
+test $gas_cv_errno_decl_needed = no || AC_DEFINE(NEED_ERRNO_DECLARATION)
 
 AC_CONFIG_SUBDIRS(testsuite)