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

template files.

diff --git a/ChangeLog b/ChangeLog
index a6365cb6c6b54778d495d0554ee1190f9552572b..f83134b8d834b9c11ded146f485de95a1483cced 100644 (file)
--- 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-24  Robert Millan  <robertmh@gnu.org>
 
        * libtool.m4: More fixes for the new GNU/FreeBSD triplet.

diff --git a/libtool.m4 b/libtool.m4
index 9f0ac9496c0f9987965b39231f5f04fb160d51f9..579b9471b20d69dd93f9d811abaefa1066713fce 100644 (file)
--- 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*