From 46bcd2ec35e4e800bc14f45692d568b51b6054ee Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Thu, 15 Feb 1996 22:10:41 +0000
Subject: [PATCH] 	* configure.in: Call AC_PROG_CC before configure.host.
 	* configure: Rebuild.

---
 opcodes/ChangeLog    |  3 +++
 opcodes/configure    | 29 ++++++++++++++++++++++++-----
 opcodes/configure.in |  5 +++--
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index a6a5ddc419..a1808875fa 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,5 +1,8 @@
 Thu Feb 15 14:45:05 1996  Ian Lance Taylor  <ian@cygnus.com>
 
+	* configure.in: Call AC_PROG_CC before configure.host.
+	* configure: Rebuild.
+
 	* Makefile.in (SONAME): Remove leading ../bfd/ from $(SHLIB).
 
 Wed Feb 14 19:01:27 1996  Alan Modra  <alan@spri.levels.unisa.edu.au>
diff --git a/opcodes/configure b/opcodes/configure
index 3aac7c52cb..8ee854e13d 100755
--- a/opcodes/configure
+++ b/opcodes/configure
@@ -678,6 +678,25 @@ test "$host_alias" != "$target_alias" &&
 if test -z "$target" ; then
     { echo "configure: error: Unrecognized target system type; please check config.sub." 1>&2; exit 1; }
 fi
+if test "$program_transform_name" = s,x,x,; then
+  program_transform_name=
+else
+  # Double any \ or $.  echo might interpret backslashes.
+  cat <<\EOF_SED > conftestsed
+s,\\,\\\\,g; s,\$,$$,g
+EOF_SED
+  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
+  rm -f conftestsed
+fi
+test "$program_prefix" != NONE &&
+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+
+# sed with no file args requires a program.
+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+
 
 # host-specific stuff:
 
@@ -697,8 +716,6 @@ if test "${shared}" = "true"; then
   fi
 fi
 
-. ${srcdir}/../bfd/configure.host
-
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -775,6 +792,8 @@ else
 fi
 
 
+. ${srcdir}/../bfd/configure.host
+
 
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
@@ -929,7 +948,7 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 933 "configure"
+#line 952 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -943,7 +962,7 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 947 "configure"
+#line 966 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -976,7 +995,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 980 "configure"
+#line 999 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
diff --git a/opcodes/configure.in b/opcodes/configure.in
index 74123dc8bc..90ebe101b5 100644
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@@ -48,6 +48,7 @@ AC_CANONICAL_SYSTEM
 if test -z "$target" ; then
     AC_MSG_ERROR(Unrecognized target system type; please check config.sub.)
 fi
+AC_ARG_PROGRAM
 
 # host-specific stuff:
 
@@ -71,10 +72,10 @@ changequote([,])dnl
   fi
 fi
 
+AC_PROG_CC
+
 . ${srcdir}/../bfd/configure.host
 
-AC_PROG_CC
-AC_SUBST(CFLAGS)
 AC_SUBST(HDEFINES)
 AC_CHECK_PROG(AR, ar, ar, :)
 AC_PROG_RANLIB
-- 
2.34.1