From: Albert Chin-A-Young <china@thewrittenword.com>
Date: Wed, 30 Jul 2003 21:33:57 +0000 (+0000)
Subject: * libtool.m4 (AC_LIBTOOL_PROG_CC_C_O): Correctly remove IRIX C++
X-Git-Tag: release-1-5-2~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5231d9eb1814587261ec35801569ebcfc0f610e6;p=thirdparty%2Flibtool.git

* libtool.m4 (AC_LIBTOOL_PROG_CC_C_O): Correctly remove IRIX C++
template files.
---

diff --git a/ChangeLog b/ChangeLog
index 1aec94eeb..a437372fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-30  Albert Chin-A-Young  <china@thewrittenword.com>
+
+	* libtool.m4 (AC_LIBTOOL_PROG_CC_C_O): Correctly remove IRIX C++
+	template files.
+
 2003-07-30  Christiaan Welvaart  <cjw@daneel.dyndns.org>
 
 	* tests/dryrun.test: Ignore any 'total' line from "ls -l" output.
diff --git a/libtool.m4 b/libtool.m4
index 9f0ac9496..579b9471b 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -958,8 +958,11 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
      fi
    fi
    chmod u+w .
-   $rm conftest* out/*
-   rmdir out
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
    rmdir conftest
    $rm conftest*