merge from gcc

[deliverable/binutils-gdb.git] / libiberty / configure.ac

diff --git a/libiberty/configure.ac b/libiberty/configure.ac
index eb8a99daa08aeb2cf58a8adc8bc671dd56068d23..3e379cc85a5ba3c5b9309f56a03fcc4f59cae30b 100644 (file)
--- a/libiberty/configure.ac
+++ b/libiberty/configure.ac
@@ -477,11 +477,11 @@ fi
 
 # Figure out which version of pexecute to use.
 case "${host}" in
-     *-*-mingw* | *-*-winnt*)  pexecute=pex-win32.o  ;;
-     *-*-msdosdjgpp*)          pexecute=pex-djgpp.o  ;;
-     *-*-msdos*)               pexecute=pex-msdos.o  ;;
-     *-*-os2-emx*)             pexecute=pex-os2.o    ;;
-     *)                                pexecute=pex-unix.o   ;;
+     *-*-mingw* | *-*-winnt*)  pexecute=./pex-win32.o  ;;
+     *-*-msdosdjgpp*)          pexecute=./pex-djgpp.o  ;;
+     *-*-msdos*)               pexecute=./pex-msdos.o  ;;
+     *-*-os2-emx*)             pexecute=./pex-os2.o    ;;
+     *)                                pexecute=./pex-unix.o   ;;
 esac
 AC_SUBST(pexecute)
 
@@ -496,6 +496,15 @@ else
 fi
 AC_SUBST(INSTALL_DEST)
 
+L=""
+for l in x $LIBOBJS; do
+  case $l in
+    x) ;;
+    *) L="$L ./$l" ;;
+  esac
+done
+LIBOBJS="$L"
+
 # We need multilib support, but only if configuring for the target.
 AC_OUTPUT(Makefile testsuite/Makefile,
 [test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h