2000-03-28 J.T. Conklin <jtc@redback.com>

[deliverable/binutils-gdb.git] / opcodes / configure.in

diff --git a/opcodes/configure.in b/opcodes/configure.in
index f7a25a95253aebf9b0caccd92cd1e6d0eec24d40..6ef461f9a4985222b7d781e2516c7c92b33f5845 100644 (file)
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-AC_PREREQ(2.5)
+AC_PREREQ(2.13)
 AC_INIT(z8k-dis.c)
 
 AC_CANONICAL_SYSTEM
@@ -51,8 +51,7 @@ fi
 AC_ARG_PROGRAM
 
 AM_MAINTAINER_MODE
-AM_CYGWIN32
-AM_EXEEXT
+AC_EXEEXT
 
 # host-specific stuff:
 
@@ -64,38 +63,12 @@ CY_GNU_GETTEXT
 . ${srcdir}/../bfd/configure.host
 
 AC_SUBST(HDEFINES)
-AM_PROG_INSTALL
+AC_PROG_INSTALL
 
 AC_CHECK_HEADERS(string.h strings.h stdlib.h)
 
-# start-sanitize-cygnus
-cgen_maint=no
-# Default is to use one in build tree.
-cgen=../cgen/cgen
-cgendir='$(srcdir)/../cgen'
-# Having --enable-maintainer-mode take arguments is another way to go.
-# ??? One can argue --with is more appropriate if one wants to specify
-# a directory name, but what we're doing here is an enable/disable kind
-# of thing and specifying both --enable and --with is klunky.
-# If you reeely want this to be --with, go ahead and change it.
-AC_ARG_ENABLE(cgen-maint,
-[  --enable-cgen-maint[=dir]    build cgen generated files],
-[case "${enableval}" in
-  yes) cgen_maint=yes ;;
-  no)  cgen_maint=no ;;
-  *)
-       # argument is cgen install directory (not implemented yet).
-       # Having a `share' directory might be more appropriate for the .scm,
-       # .cpu, etc. files.
-       cgen_maint=yes
-       cgendir=${cgen_maint}/lib/cgen
-       cgen=${cgendir}/bin/cgen
-       ;;
-esac])dnl
-AM_CONDITIONAL(CGEN_MAINT, test x${cgen_maint} = xyes)
-AC_SUBST(cgendir)
-AC_SUBST(cgen)
-# end-sanitize-cygnus
+
+using_cgen=no
 
 # Horrible hacks to build DLLs on Windows.
 WIN32LDFLAGS=
@@ -117,7 +90,7 @@ AC_SUBST(WIN32LIBADD)
 if test -n "$enable_targets" ; then
     for targ in `echo $enable_targets | sed 's/,/ /g'`
     do
-       result=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $targ 2>/dev/null`
+       result=`$ac_config_sub $targ 2>/dev/null`
        if test -n "$result" ; then
            canon_targets="$canon_targets $result"
        else
@@ -160,23 +133,27 @@ if test x${all_targets} = xfalse ; then
        bfd_alpha_arch)         ta="$ta alpha-dis.lo alpha-opc.lo" ;;
        bfd_arc_arch)           ta="$ta arc-dis.lo arc-opc.lo" ;;
        bfd_arm_arch)           ta="$ta arm-dis.lo" ;;
+       bfd_avr_arch)           ta="$ta avr-dis.lo" ;;
        bfd_convex_arch)        ;;
        bfd_d10v_arch)          ta="$ta d10v-dis.lo d10v-opc.lo" ;;
        bfd_d30v_arch)          ta="$ta d30v-dis.lo d30v-opc.lo" ;;
-       bfd_fr30_arch)          ta="$ta $cgen_files fr30-opc.lo fr30-asm.lo fr30-dis.lo" ;;
+       bfd_fr30_arch)          ta="$ta fr30-asm.lo fr30-desc.lo fr30-dis.lo fr30-ibld.lo fr30-opc.lo" using_cgen=yes ;;
        bfd_h8300_arch)         ta="$ta h8300-dis.lo" ;;
        bfd_h8500_arch)         ta="$ta h8500-dis.lo" ;;
        bfd_hppa_arch)          ta="$ta hppa-dis.lo" ;;
+       bfd_i370_arch)          ta="$ta i370-dis.lo i370-opc.lo" ;;
        bfd_i386_arch)          ta="$ta i386-dis.lo" ;;
        bfd_i860_arch)          ;;
        bfd_i960_arch)          ta="$ta i960-dis.lo" ;;
-       bfd_m32r_arch)          ta="$ta $cgen_files m32r-opc.lo m32r-asm.lo m32r-dis.lo" ;;
+       bfd_m32r_arch)          ta="$ta m32r-asm.lo m32r-desc.lo m32r-dis.lo m32r-ibld.lo m32r-opc.lo m32r-opinst.lo" using_cgen=yes ;;
        bfd_m68k_arch)          ta="$ta m68k-dis.lo m68k-opc.lo" ;;
        bfd_m88k_arch)          ta="$ta m88k-dis.lo" ;;
+       bfd_mcore_arch)         ta="$ta mcore-dis.lo" ;;
        bfd_mips_arch)          ta="$ta mips-dis.lo mips-opc.lo mips16-opc.lo" ;;
        bfd_mn10200_arch)       ta="$ta m10200-dis.lo m10200-opc.lo" ;;
        bfd_mn10300_arch)       ta="$ta m10300-dis.lo m10300-opc.lo" ;;
        bfd_ns32k_arch)         ta="$ta ns32k-dis.lo" ;;
+       bfd_pj_arch)            ta="$ta pj-dis.lo pj-opc.lo" ;;
        bfd_powerpc_arch)       ta="$ta ppc-dis.lo ppc-opc.lo" ;;
        bfd_pyramid_arch)       ;;
        bfd_romp_arch)          ;;
@@ -185,17 +162,10 @@ if test x${all_targets} = xfalse ; then
        bfd_sparc_arch)         ta="$ta sparc-dis.lo sparc-opc.lo" ;;
        bfd_tahoe_arch)         ;;
        bfd_tic30_arch)         ta="$ta tic30-dis.lo" ;;
-# start-sanitize-tic80
        bfd_tic80_arch)         ta="$ta tic80-dis.lo tic80-opc.lo" ;;
-# end-sanitize-tic80
-# start-sanitize-sky
-       bfd_dvp_arch)           ta="$ta mips-dis.lo mips-opc.lo mips16-opc.lo dvp-dis.lo dvp-opc.lo" ;;
-# end-sanitize-sky
        bfd_v850_arch)          ta="$ta v850-opc.lo v850-dis.lo" ;;
-# start-sanitize-v850e
        bfd_v850e_arch)         ta="$ta v850-opc.lo v850-dis.lo" ;;
        bfd_v850ea_arch)        ta="$ta v850-opc.lo v850-dis.lo" ;;
-# end-sanitize-v850e
        bfd_vax_arch)           ta="$ta vax-dis.lo" ;;
        bfd_w65_arch)           ta="$ta w65-dis.lo" ;;
        bfd_we32k_arch)         ;;
@@ -206,6 +176,10 @@ if test x${all_targets} = xfalse ; then
        esac
     done
 
+    if test $using_cgen = yes ; then
+       ta="$ta $cgen_files"
+    fi
+
     # Weed out duplicate .o files.
     f=""
     for i in $ta ; do