Import GNU binutils-2.9.1. This will break things for a few minutes

until I've made the commits to resolve the conflicts.

Submitted by:	Doug Rabson <dfr>

1 files changed, 5 insertions, 17 deletions

diff --git a/contrib/binutils/libiberty/configure.in b/contrib/binutils/libiberty/configure.in
index b8fe5fe..b0020d8 100644
--- a/contrib/binutils/libiberty/configure.in
+++ b/contrib/binutils/libiberty/configure.in
@@ -54,25 +54,13 @@ fi
 
 # We need multilib support, but only if configuring for the target.
 if [ -n "${with_target_subdir}" ] ; then
-  case ${srcdir} in
-  .)
+  if [ "${srcdir}" = "." ] ; then
     if [ "${with_target_subdir}" != "." ] ; then
-
-      # Set MULTISRCTOP to the value we need if we are not doing
-      # multilib.  This will be overridden if --enable-multilib was
-      # used.
-      sed -e "s:^MULTISRCTOP[ 	]*=.*$:MULTISRCTOP = ../:" \
-	${Makefile} > Makefile.tem
-      rm -f ${Makefile}
-      mv Makefile.tem ${Makefile}
-
-      . ${srcdir}/${with_multisrctop}../../config-ml.in
+      . ${with_multisrctop}../../config-ml.in
     else
-      . ${srcdir}/${with_multisrctop}../config-ml.in
+      . ${with_multisrctop}../config-ml.in
     fi
-    ;;
-  *)
+  else
     . ${srcdir}/../config-ml.in
-    ;;
-  esac
+  fi
 fi