X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Fconfigure.ac;h=9e4ba6fcf1e5d95be5673f2a87fbdeb0d40f9405;hb=de96689e03235bfd65a33704a9d398cb666140f4;hp=88578c21b605911ed0c2cfa46095f098f0e32a16;hpb=bc7c0509f28d3a448adf4c2da335d0251ef69892;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/configure.ac b/binutils/configure.ac
index 88578c21b6..9e4ba6fcf1 100644
--- a/binutils/configure.ac
+++ b/binutils/configure.ac
@@ -89,7 +89,7 @@ fi
 AC_PROG_YACC
 AM_PROG_LEX
 
-ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca pt"
+ALL_LINGUAS="bg ca da es fi fr hr id it ja pt ro ru rw sk sr sv tr uk vi zh_CN zh_TW"
 ZW_GNU_GETTEXT_SISTER_DIR
 AM_PO_SUBDIRS
 
@@ -228,8 +228,6 @@ AC_CHECK_HEADER(iconv.h)
 AM_ICONV
 
 all_targets=false
-BUILD_NLMCONV=
-NLMCONV_DEFS=
 BUILD_SRCONV=
 BUILD_DLLTOOL=
 DLLTOOL_DEFS=
@@ -248,9 +246,7 @@ for targ in $target $canon_targets
 do
     if test "x$targ" = "xall"; then
         all_targets=true
-	BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
 	BUILD_SRCONV='$(SRCONV_PROG)'
-	NLMCONV_DEFS="-DNLMCONV_I386 -DNLMCONV_ALPHA -DNLMCONV_POWERPC -DNLMCONV_SPARC"
 	BUILD_MISC="${BUILD_MISC} "'bin2c$(EXEEXT_FOR_BUILD)'
 	BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
 	BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
@@ -263,27 +259,6 @@ do
 	od_vectors="$od_vectors objdump_private_desc_xcoff"
     else
 	case $targ in
-changequote(,)dnl
-	i[3-7]86*-*-netware*)
-changequote([,])dnl
-	  BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
-	  NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_I386"
-	  ;;
-	alpha*-*-netware*)
-	  BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
-	  NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_ALPHA"
-	  ;;
-	powerpc*-*-netware*)
-	  BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
-	  NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_POWERPC"
-	  ;;
-	sparc*-*-netware*)
-	  BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
-	  NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_SPARC"
-	  ;;
-	esac
-
-	case $targ in
 	*-*-hms*) BUILD_SRCONV='$(SRCONV_PROG)' ;;
 	esac
 
@@ -417,7 +392,7 @@ changequote([,])dnl
 	avr-*-*)
 	  od_vectors="$od_vectors objdump_private_desc_elf32_avr"
 	  ;;
-	powerpc-*-aix*)
+	powerpc*-*-aix* | rs6000-*-aix*)
 	  od_vectors="$od_vectors objdump_private_desc_xcoff"
 	  ;;
         *-*-darwin*)
@@ -473,8 +448,6 @@ fi
 
 OBJDUMP_DEFS="${OBJDUMP_DEFS} -DOBJDUMP_PRIVATE_VECTORS=\"${OBJDUMP_PRIVATE_VECTORS}\""
 
-AC_SUBST(NLMCONV_DEFS)
-AC_SUBST(BUILD_NLMCONV)
 AC_SUBST(BUILD_SRCONV)
 AC_SUBST(BUILD_DLLTOOL)
 AC_SUBST(DLLTOOL_DEFS)