Fix autoconf breakage + commit target.c, omitted in previous delta

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

diff --git a/opcodes/configure.in b/opcodes/configure.in
index 0e947fb50a2fcd442b348c3dca4c386df70f29b0..80a335101c534f4ffd18faa94dc5015c566eb24f 100644 (file)
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@@ -11,7 +11,7 @@ AC_ISC_POSIX
 # library.  For user convenience, we always use the same version
 # number that BFD is using.
 changequote(,)dnl
-BFD_VERSION=`grep INIT_AUTOMAKE ${srcdir}/../bfd/configure.in | sed -n -e 's/[         ]//g' -e 's/^.*,\(.*\)).*$/\1/p'`
+BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[        ]*\([^  ]*\)[   ]*).*/\1/p' < ${srcdir}/../bfd/configure.in`
 changequote([,])dnl
 
 AM_INIT_AUTOMAKE(opcodes, ${BFD_VERSION})
@@ -69,7 +69,6 @@ AM_CONFIG_HEADER(config.h:config.in)
 if test -z "$target" ; then
     AC_MSG_ERROR(Unrecognized target system type; please check config.sub.)
 fi
-AC_ARG_PROGRAM
 
 AM_MAINTAINER_MODE
 AC_EXEEXT
@@ -88,6 +87,24 @@ AC_PROG_INSTALL
 
 AC_CHECK_HEADERS(string.h strings.h stdlib.h)
 
+cgen_maint=no
+cgendir='$(srcdir)/../cgen'
+
+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
+       ;;
+esac])dnl
+AM_CONDITIONAL(CGEN_MAINT, test x${cgen_maint} = xyes)
+AC_SUBST(cgendir)
 
 using_cgen=no
 
@@ -152,10 +169,11 @@ if test x${all_targets} = xfalse ; then
        bfd_a29k_arch)          ta="$ta a29k-dis.lo" ;;
        bfd_alliant_arch)       ;;
        bfd_alpha_arch)         ta="$ta alpha-dis.lo alpha-opc.lo" ;;
-       bfd_arc_arch)           ta="$ta arc-dis.lo arc-opc.lo" ;;
+       bfd_arc_arch)           ta="$ta arc-dis.lo arc-opc.lo arc-ext.lo" ;;
        bfd_arm_arch)           ta="$ta arm-dis.lo" ;;
        bfd_avr_arch)           ta="$ta avr-dis.lo" ;;
        bfd_convex_arch)        ;;
+       bfd_cris_arch)          ta="$ta cris-dis.lo cris-opc.lo" ;;
        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 fr30-asm.lo fr30-desc.lo fr30-dis.lo fr30-ibld.lo fr30-opc.lo" using_cgen=yes ;;
@@ -164,7 +182,7 @@ if test x${all_targets} = xfalse ; then
        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_i860_arch)          ta="$ta i860-dis.lo" ;;
        bfd_i960_arch)          ta="$ta i960-dis.lo" ;;
        bfd_ia64_arch)          ta="$ta ia64-dis.lo ia64-opc.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 ;;
@@ -177,13 +195,16 @@ if test x${all_targets} = xfalse ; then
        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_pdp11_arch)         ta="$ta pdp11-dis.lo pdp11-opc.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_powerpc_64_arch)    ta="$ta ppc-dis.lo ppc-opc.lo" ;;
        bfd_romp_arch)          ;;
        bfd_rs6000_arch)        ta="$ta ppc-dis.lo ppc-opc.lo" ;;
-       bfd_powerpc_64_arch)    ta="$ta ppc-dis.lo ppc-opc.lo" ;;
-       bfd_sh_arch)            ta="$ta sh-dis.lo" ;;
+       bfd_s390_arch)          ta="$ta s390-dis.lo s390-opc.lo" ;;
+       bfd_sh_arch)
+                               ta="$ta sh-dis.lo" ;;
        bfd_sparc_arch)         ta="$ta sparc-dis.lo sparc-opc.lo" ;;
        bfd_tahoe_arch)         ;;
        bfd_tic30_arch)         ta="$ta tic30-dis.lo" ;;