* configure.in: ../bfd/config.bfd now just sets shell variables.

	Use them rather than looking through target Makefile fragments.
	* configure: Rebuild.

1 files changed, 78 insertions, 66 deletions

diff --git a/opcodes/configure.in b/opcodes/configure.in
index 8393ed0..c7372aa 100644
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@@ -1,37 +1,68 @@
-# This file is a shell script that supplies the information necessary
-# to tailor a template configure script into the configure script
-# appropriate for this directory.  For more information, check any
-# existing configure script.
-
-srctrigger=z8k-dis.c
-srcname="opcodes"
-
-# per-host:
+AC_PREREQ(2.0)
+AC_INIT(z8k-dis.c)
+#    configure.in script for the opcodes library.
+#    Copyright (C) 1995 Free Software Foundation, Inc.
+#    Written by Cygnus Support.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+AC_ARG_ENABLE(targets,
+[  --enable-targets        alternative target configurations],
+[case "${enableval}" in
+  yes | "") AC_ERROR(enable-targets option must specify target names or 'all')
+            ;;
+  no)       enable_targets= ;;
+  *)        enable_targets=$enableval ;;
+esac])dnl
+
+# host-specific stuff:
+
+AC_PROG_CC
+AC_PROG_RANLIB
+AC_CHECK_HEADERS(string.h strings.h)
+
+AC_CONFIG_AUX_DIR(`cd $srcdir/..;pwd`)
+AC_CANONICAL_SYSTEM
+if test -z "$target" ; then
+    AC_MSG_ERROR(Unrecognized target system type; please check config.sub.)
+fi
+if test -z "$host" ; then
+    AC_MSG_ERROR(Unrecognized host system type; please check config.sub.)
+fi
+AC_ARG_PROGRAM
 
 . ${srcdir}/../bfd/configure.host
 
-# Set up to make a link between the host's include file and "sysdep.h".
-files="../bfd/hosts/${my_host}.h"
-links="sysdep.h"
-
-if [ ! -f ${srcdir}/${files} ] ; then
-	files=../bfd/hosts/std-host.h
-	echo "[${srcname} has no specific support for host ${host} -- using std-host]"
+if test -f ${srcdir}/../bfd/config/${my_host}.mh ; then
+	host_makefile_frag=${srcdir}/../bfd/config/${my_host}.mh
+	frags=${host_makefile_frag}
+else
+	host_makefile_frag=/dev/null
+	frags=
 fi
+AC_SUBST_FILE(host_makefile_frag)
+AC_SUBST(frags)
 
-host_makefile_frag=
-if [ -f ${srcdir}/../bfd/config/${my_host}.mh ] ; then
-	host_makefile_frag=../bfd/config/${my_host}.mh
-fi
-
-# per-target:
+# target-specific stuff:
 
 # Canonicalize the secondary target names.
-if [ -n "$enable_targets" ]; then
+if test -n "$enable_targets" ; then
     for targ in `echo $enable_targets | sed 's/,/ /g'`
     do
-	result=`$configsub $targ 2>/dev/null`
-	if [ -n "$result" ]; then
+	result=`$ac_config_sub $targ 2>/dev/null`
+	if test -n "$result" ; then
 	    canon_targets="$canon_targets $result"
 	else
 	    # Allow targets that config.sub doesn't recognize, like "all".
@@ -41,62 +72,41 @@ if [ -n "$enable_targets" ]; then
 fi
 
 all_targets=false
-
+selarchs=
 for targ in $target $canon_targets
 do
-    bfd_target=`${config_shell} $srcdir/../bfd/config.bfd $targ`
-
-    if [ "x$bfd_target" = "xall" ]; then
+    if test "x$targ" = "xall" ; then
         all_targets=true
     else
-	if [ ! -f ${srcdir}/../bfd/config/${bfd_target}.mt ] ; then
-	    echo '***' No file ${srcdir}/../bfd/config/${bfd_target}.mt 1>&2
-	    echo '***' opcodes does not support target ${bfd_target} 1>&2
-	    echo '***' Look in bfd/config.bfd for supported targets 1>&2
-	    exit 1
-	fi
-
-	if [ "x$targ" = "x$target" ]; then
-	    target_makefile_frag=${srcdir}/../bfd/config/${bfd_target}.mt
-	else
-	    target_extra_frags="$target_extra_frags ${srcdir}/../bfd/config/${bfd_target}.mt"
-	fi
+	. $srcdir/../bfd/config.bfd
+	selarchs="$selarchs $targ_archs"
     fi
-done
+done	
 
 # We don't do any links based on the target system, just makefile config.
 
-# post-target:
-
-rm -f Makefile.tmp Makefile.2
-mv Makefile Makefile.tmp
-
-if [ x${all_targets} = xfalse ]; then
-
-    allfrags="$target_makefile_frag $target_extra_frags"
-
-    # The architectures in all the configured targets.
-    SELECT_ARCHITECTURES=`sed -n '
-    s/SELECT_ARCHITECTURES[ 	]*=[ 	]*//p
-    ' $allfrags`
+if test x${all_targets} = xfalse ; then
 
     # Target architecture .o files.
     ta=
 
-    for arch in $SELECT_ARCHITECTURES
+    for arch in $selarchs
     do
 	ad=`echo $arch | sed -e s/bfd_//g -e s/_arch//g`
 	archdefs="$archdefs -DARCH_$ad"
 	case "$arch" in
 	bfd_a29k_arch)		ta="$ta a29k-dis.o" ;;
 	bfd_alpha_arch)		ta="$ta alpha-dis.o" ;;
+# start-sanitize-arc
+	bfd_arc_arch)		ta="$ta arc-dis.o arc-opc.o" ;;
+# end-sanitize-arc
 	bfd_arm_arch)		ta="$ta arm-dis.o" ;;
 	bfd_h8300_arch)		ta="$ta h8300-dis.o" ;;
 	bfd_h8500_arch)		ta="$ta h8500-dis.o" ;;
 	bfd_hppa_arch)		ta="$ta hppa-dis.o" ;;
 	bfd_i386_arch)		ta="$ta i386-dis.o" ;;
 	bfd_i960_arch)		ta="$ta i960-dis.o" ;;
-	bfd_m68k_arch)		ta="$ta m68k-dis.o" ;;
+	bfd_m68k_arch)		ta="$ta m68k-dis.o m68k-opc.o" ;;
 	bfd_m88k_arch)		ta="$ta m88k-dis.o" ;;
 	bfd_mips_arch)		ta="$ta mips-dis.o mips-opc.o" ;;
 	bfd_ns32k_arch)		ta="$ta ns32k-dis.o" ;;
@@ -110,9 +120,10 @@ if [ x${all_targets} = xfalse ]; then
 	bfd_vax_arch)		;;
 	bfd_we32k_arch)		;;
 	bfd_z8k_arch)		ta="$ta z8k-dis.o" ;;
+	bfd_w65_arch)		ta="$ta w65-dis.o" ;;
 
 	"")			;;
-	*) echo "*** unknown target architecture $arch" 1>&2; exit 1 ;;
+	*)		AC_MSG_ERROR(*** unknown target architecture $arch) ;;
 	esac
     done
 
@@ -136,14 +147,15 @@ if [ x${all_targets} = xfalse ]; then
     done
     archdefs="$f"
 
-    echo "ARCHDEFS = $archdefs"			>> Makefile.2
-    echo "BFD_MACHINES = $ta"			>> Makefile.2
+    BFD_MACHINES="$ta"
 
 else	# all_targets is true
-    echo 'ARCHDEFS = -DARCH_all'		>> Makefile.2
-    echo 'BFD_MACHINES = $(ALL_MACHINES)'	>> Makefile.2
-fi	# all_targets is true
+    archdefs=-DARCH_all
+    BFD_MACHINES='$(ALL_MACHINES)'
+fi
+
+AC_SUBST(archdefs)
+AC_SUBST(BFD_MACHINES)
 
-cat Makefile.tmp >> Makefile.2
-rm -f Makefile.tmp
-mv Makefile.2 Makefile
+AC_CONFIG_HEADER(config.h:config.in)
+AC_OUTPUT(Makefile)