X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Fconfigure.in;h=e8690d1b121cf9d5f45b7a6800c422516786938b;hb=e3659cbf49a8943c32010608668da3d54c83b36d;hp=90ebe101b5f59b538c9a32e1d2a0905185a3b4dc;hpb=46bcd2ec35e4e800bc14f45692d568b51b6054ee;p=deliverable%2Fbinutils-gdb.git

diff --git a/opcodes/configure.in b/opcodes/configure.in
index 90ebe101b5..e8690d1b12 100644
--- a/opcodes/configure.in
+++ b/opcodes/configure.in
@@ -1,7 +1,7 @@
-AC_PREREQ(2.0)
+AC_PREREQ(2.5)
 AC_INIT(z8k-dis.c)
 #    configure.in script for the opcodes library.
-#    Copyright (C) 1995 Free Software Foundation, Inc.
+#    Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 #    Written by Cygnus Support.
 # 
 # This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,8 @@ AC_ARG_ENABLE(shared,
 [case "${enableval}" in
   yes) shared=true ;;
   no)  shared=false ;;
-  *)   AC_MSG_ERROR([bad value ${enableval} for opcodes shared option]) ;;
+  *opcodes*) shared=true ;;
+  *) shared=false ;;
 esac])dnl
 AC_ARG_ENABLE(commonbfdlib,
 [  --enable-commonbfdlib   build shared BFD/opcodes/libiberty library],
@@ -54,8 +55,8 @@ AC_ARG_PROGRAM
 
 ALLLIBS='$(TARGETLIB)'
 PICFLAG=
-SHLIB=
-SHLINK=
+SHLIB=unused-shlib
+SHLINK=unused-shlink
 if test "${shared}" = "true"; then
   ALLLIBS='$(TARGETLIB) $(SHLIB) $(SHLINK)'
   PICFLAG=-fpic
@@ -77,16 +78,17 @@ AC_PROG_CC
 . ${srcdir}/../bfd/configure.host
 
 AC_SUBST(HDEFINES)
-AC_CHECK_PROG(AR, ar, ar, :)
-AC_PROG_RANLIB
+AC_CHECK_TOOL(AR, ar)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_PROG_INSTALL
 
 if test "${shared}" = "true"; then
   if test "${GCC}" != "yes" && test "${shared_non_gcc}" != "yes"; then
     AC_MSG_WARN([opcodes --enable-shared only supported when using gcc])
     shared=false
+    ALLLIBS='$(TARGETLIB)'
     PICFLAG=
-    SHLIB=
+    SHLIB=unused-shlib
   fi
 fi
 
@@ -97,10 +99,17 @@ AC_SUBST(SHLIB_CC)
 AC_SUBST(SHLIB_CFLAGS)
 if test "${commonbfdlib}" = "true"; then
   COMMON_SHLIB=yes
+  # Rebuild the shared library if libiberty or libbfd changes.
+  SHLIB_DEP="../libiberty/libiberty.a ../bfd/libbfd.a"
+  BFD_PICLIST=../bfd/piclist
 else
   COMMON_SHLIB=
+  SHLIB_DEP=
+  BFD_PICLIST=
 fi
 AC_SUBST(COMMON_SHLIB)
+AC_SUBST(SHLIB_DEP)
+AC_SUBST(BFD_PICLIST)
 AC_SUBST(SHLINK)
 
 AC_CHECK_HEADERS(string.h strings.h)
@@ -147,12 +156,15 @@ if test x${all_targets} = xfalse ; then
 	case "$arch" in
 	bfd_a29k_arch)		ta="$ta a29k-dis.o" ;;
 	bfd_alliant_arch)	;;
-	bfd_alpha_arch)		ta="$ta alpha-dis.o" ;;
+	bfd_alpha_arch)		ta="$ta alpha-dis.o alpha-opc.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_convex_arch)	;;
+# start-sanitize-d10v
+	bfd_d10v_arch)		ta="$ta d10v-dis.o d10v-opc.o" ;;
+# end-sanitize-d10v
 	bfd_h8300_arch)		ta="$ta h8300-dis.o" ;;
 	bfd_h8500_arch)		ta="$ta h8500-dis.o" ;;
 	bfd_hppa_arch)		ta="$ta hppa-dis.o" ;;
@@ -167,9 +179,6 @@ if test x${all_targets} = xfalse ; then
 	bfd_pyramid_arch)	;;
 	bfd_romp_arch)		;;
 	bfd_rs6000_arch)	ta="$ta ppc-dis.o ppc-opc.o" ;;
-# start-sanitize-rce
-	bfd_rce_arch)		ta="$ta rce-dis.o" ;;
-# end-sanitize-rce
 	bfd_sh_arch)		ta="$ta sh-dis.o" ;;
 	bfd_sparc_arch)		ta="$ta sparc-dis.o sparc-opc.o" ;;
 	bfd_tahoe_arch)		;;