[Pkg-kde-commits] rev 1885 - in
people/chrsmrtn/packages/gwenview/debian/patches: . common
Christopher Martin
chrsmrtn at costa.debian.org
Sat Oct 1 18:56:25 UTC 2005
Author: chrsmrtn
Date: 2005-10-01 18:56:20 +0000 (Sat, 01 Oct 2005)
New Revision: 1885
Modified:
people/chrsmrtn/packages/gwenview/debian/patches/98_buildprep.diff
people/chrsmrtn/packages/gwenview/debian/patches/common/03_libtool_update.diff
Log:
Filter the buildrep, and update the libtool patch.
Modified: people/chrsmrtn/packages/gwenview/debian/patches/98_buildprep.diff
===================================================================
--- people/chrsmrtn/packages/gwenview/debian/patches/98_buildprep.diff 2005-10-01 18:55:44 UTC (rev 1884)
+++ people/chrsmrtn/packages/gwenview/debian/patches/98_buildprep.diff 2005-10-01 18:56:20 UTC (rev 1885)
@@ -1,6 +1,7 @@
-diff -Nru gwenview-1.3.0.orig/acinclude.m4 gwenview-1.3.0/acinclude.m4
---- gwenview-1.3.0.orig/acinclude.m4 2005-09-11 10:39:24.000000000 -0400
-+++ gwenview-1.3.0/acinclude.m4 2005-09-12 08:41:27.000000000 -0400
+#DPATCHLEVEL=0
+# vi: ft=diff
+--- acinclude.m4
++++ acinclude.m4
@@ -1684,15 +1684,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
@@ -1478,9 +1479,8 @@
AC_MSG_RESULT([$SED])
])
-diff -Nru gwenview-1.3.0.orig/aclocal.m4 gwenview-1.3.0/aclocal.m4
---- gwenview-1.3.0.orig/aclocal.m4 2005-09-11 10:39:36.000000000 -0400
-+++ gwenview-1.3.0/aclocal.m4 2005-09-12 08:41:54.000000000 -0400
+--- aclocal.m4
++++ aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
@@ -14589,9 +14589,8 @@
+]) # _AM_PROG_TAR
+m4_include([acinclude.m4])
-diff -Nru gwenview-1.3.0.orig/config.h.in gwenview-1.3.0/config.h.in
---- gwenview-1.3.0.orig/config.h.in 2005-09-11 10:39:49.000000000 -0400
-+++ gwenview-1.3.0/config.h.in 2005-09-12 08:42:05.000000000 -0400
+--- config.h.in
++++ config.h.in
@@ -250,9 +250,6 @@
#endif
@@ -14602,9 +14601,8 @@
#if defined(__SVR4) && !defined(__svr4__)
#define __svr4__ 1
-diff -Nru gwenview-1.3.0.orig/configure gwenview-1.3.0/configure
---- gwenview-1.3.0.orig/configure 2005-09-11 10:39:47.000000000 -0400
-+++ gwenview-1.3.0/configure 2005-09-12 08:43:54.000000000 -0400
+--- configure
++++ configure
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -18533,9 +18531,8 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
-diff -Nru gwenview-1.3.0.orig/configure.in gwenview-1.3.0/configure.in
---- gwenview-1.3.0.orig/configure.in 2005-09-11 10:39:24.000000000 -0400
-+++ gwenview-1.3.0/configure.in 2005-09-12 08:41:28.000000000 -0400
+--- configure.in
++++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(gwenview-1.3.0, "3.4.89") dnl searches for some needed programs
@@ -18545,9 +18542,8 @@
KDE_SET_PREFIX
dnl generate the config header
-diff -Nru gwenview-1.3.0.orig/doc/Makefile.in gwenview-1.3.0/doc/Makefile.in
---- gwenview-1.3.0.orig/doc/Makefile.in 2005-09-11 10:40:29.000000000 -0400
-+++ gwenview-1.3.0/doc/Makefile.in 2005-09-12 08:43:46.000000000 -0400
+--- doc/Makefile.in
++++ doc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -18812,9 +18808,8 @@
cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
-diff -Nru gwenview-1.3.0.orig/Makefile.in gwenview-1.3.0/Makefile.in
---- gwenview-1.3.0.orig/Makefile.in 2005-09-11 10:40:29.000000000 -0400
-+++ gwenview-1.3.0/Makefile.in 2005-09-12 08:43:46.000000000 -0400
+--- Makefile.in
++++ Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -19379,9 +19374,8 @@
cd $(top_srcdir) && perl admin/am_edit Makefile.in
-diff -Nru gwenview-1.3.0.orig/src/app/Makefile.in gwenview-1.3.0/src/app/Makefile.in
---- gwenview-1.3.0.orig/src/app/Makefile.in 2005-09-11 10:40:29.000000000 -0400
-+++ gwenview-1.3.0/src/app/Makefile.in 2005-09-12 08:43:46.000000000 -0400
+--- src/app/Makefile.in
++++ src/app/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20112,9 +20106,8 @@
@echo 'creating libkdeinit_gwenview_la.all_cpp.cpp ...'; \
rm -f libkdeinit_gwenview_la.all_cpp.files libkdeinit_gwenview_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_gwenview_la.all_cpp.final; \
-diff -Nru gwenview-1.3.0.orig/src/desktopfiles/Makefile.in gwenview-1.3.0/src/desktopfiles/Makefile.in
---- gwenview-1.3.0.orig/src/desktopfiles/Makefile.in 2005-09-11 10:40:29.000000000 -0400
-+++ gwenview-1.3.0/src/desktopfiles/Makefile.in 2005-09-12 08:43:46.000000000 -0400
+--- src/desktopfiles/Makefile.in
++++ src/desktopfiles/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20428,9 +20421,8 @@
cd $(top_srcdir) && perl admin/am_edit src/desktopfiles/Makefile.in
-diff -Nru gwenview-1.3.0.orig/src/doc/Makefile.in gwenview-1.3.0/src/doc/Makefile.in
---- gwenview-1.3.0.orig/src/doc/Makefile.in 2005-09-11 10:40:29.000000000 -0400
-+++ gwenview-1.3.0/src/doc/Makefile.in 2005-09-12 08:43:46.000000000 -0400
+--- src/doc/Makefile.in
++++ src/doc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -20721,9 +20713,8 @@
cd $(top_srcdir) && perl admin/am_edit src/doc/Makefile.in
-diff -Nru gwenview-1.3.0.orig/src/gvcore/Makefile.in gwenview-1.3.0/src/gvcore/Makefile.in
---- gwenview-1.3.0.orig/src/gvcore/Makefile.in 2005-09-11 10:40:29.000000000 -0400
-+++ gwenview-1.3.0/src/gvcore/Makefile.in 2005-09-12 08:43:46.000000000 -0400
+--- src/gvcore/Makefile.in
++++ src/gvcore/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -21554,9 +21545,8 @@
@echo 'creating libgwenviewcore_la.all_cpp.cpp ...'; \
rm -f libgwenviewcore_la.all_cpp.files libgwenviewcore_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libgwenviewcore_la.all_cpp.final; \
-diff -Nru gwenview-1.3.0.orig/src/gvdirpart/Makefile.in gwenview-1.3.0/src/gvdirpart/Makefile.in
---- gwenview-1.3.0.orig/src/gvdirpart/Makefile.in 2005-09-11 10:40:29.000000000 -0400
-+++ gwenview-1.3.0/src/gvdirpart/Makefile.in 2005-09-12 08:43:46.000000000 -0400
+--- src/gvdirpart/Makefile.in
++++ src/gvdirpart/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -22113,9 +22103,8 @@
cd $(top_srcdir) && perl admin/am_edit src/gvdirpart/Makefile.in
-diff -Nru gwenview-1.3.0.orig/src/gvimagepart/Makefile.in gwenview-1.3.0/src/gvimagepart/Makefile.in
---- gwenview-1.3.0.orig/src/gvimagepart/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/src/gvimagepart/Makefile.in 2005-09-12 08:43:46.000000000 -0400
+--- src/gvimagepart/Makefile.in
++++ src/gvimagepart/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -22628,9 +22617,8 @@
cd $(top_srcdir) && perl admin/am_edit src/gvimagepart/Makefile.in
-diff -Nru gwenview-1.3.0.orig/src/imageutils/Makefile.in gwenview-1.3.0/src/imageutils/Makefile.in
---- gwenview-1.3.0.orig/src/imageutils/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/src/imageutils/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- src/imageutils/Makefile.in
++++ src/imageutils/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -23222,9 +23210,8 @@
cd $(top_srcdir) && perl admin/am_edit src/imageutils/Makefile.in
-diff -Nru gwenview-1.3.0.orig/src/libgvexif/Makefile.in gwenview-1.3.0/src/libgvexif/Makefile.in
---- gwenview-1.3.0.orig/src/libgvexif/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/src/libgvexif/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- src/libgvexif/Makefile.in
++++ src/libgvexif/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -23667,9 +23654,8 @@
cd $(top_srcdir) && perl admin/am_edit src/libgvexif/Makefile.in
-diff -Nru gwenview-1.3.0.orig/src/Makefile.in gwenview-1.3.0/src/Makefile.in
---- gwenview-1.3.0.orig/src/Makefile.in 2005-09-11 10:40:29.000000000 -0400
-+++ gwenview-1.3.0/src/Makefile.in 2005-09-12 08:43:46.000000000 -0400
+--- src/Makefile.in
++++ src/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -24085,9 +24071,8 @@
cd $(top_srcdir) && perl admin/am_edit src/Makefile.in
-diff -Nru gwenview-1.3.0.orig/src/pics/action/Makefile.in gwenview-1.3.0/src/pics/action/Makefile.in
---- gwenview-1.3.0.orig/src/pics/action/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/src/pics/action/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- src/pics/action/Makefile.in
++++ src/pics/action/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -24434,9 +24419,8 @@
cd $(top_srcdir) && perl admin/am_edit src/pics/action/Makefile.in
-diff -Nru gwenview-1.3.0.orig/src/pics/app/Makefile.in gwenview-1.3.0/src/pics/app/Makefile.in
---- gwenview-1.3.0.orig/src/pics/app/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/src/pics/app/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- src/pics/app/Makefile.in
++++ src/pics/app/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -24705,9 +24689,8 @@
cd $(top_srcdir) && perl admin/am_edit src/pics/app/Makefile.in
-diff -Nru gwenview-1.3.0.orig/src/pics/cursor/Makefile.in gwenview-1.3.0/src/pics/cursor/Makefile.in
---- gwenview-1.3.0.orig/src/pics/cursor/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/src/pics/cursor/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- src/pics/cursor/Makefile.in
++++ src/pics/cursor/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -24989,9 +24972,8 @@
cd $(top_srcdir) && perl admin/am_edit src/pics/cursor/Makefile.in
-diff -Nru gwenview-1.3.0.orig/src/pics/Makefile.in gwenview-1.3.0/src/pics/Makefile.in
---- gwenview-1.3.0.orig/src/pics/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/src/pics/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- src/pics/Makefile.in
++++ src/pics/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -25403,9 +25385,8 @@
cd $(top_srcdir) && perl admin/am_edit src/pics/Makefile.in
-diff -Nru gwenview-1.3.0.orig/src/pics/thumbnail/Makefile.in gwenview-1.3.0/src/pics/thumbnail/Makefile.in
---- gwenview-1.3.0.orig/src/pics/thumbnail/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/src/pics/thumbnail/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- src/pics/thumbnail/Makefile.in
++++ src/pics/thumbnail/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -25688,9 +25669,8 @@
cd $(top_srcdir) && perl admin/am_edit src/pics/thumbnail/Makefile.in
-diff -Nru gwenview-1.3.0.orig/src/tools/Makefile.in gwenview-1.3.0/src/tools/Makefile.in
---- gwenview-1.3.0.orig/src/tools/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/src/tools/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- src/tools/Makefile.in
++++ src/tools/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -26044,9 +26024,8 @@
cd $(top_srcdir) && perl admin/am_edit src/tools/Makefile.in
-diff -Nru gwenview-1.3.0.orig/src/tsthread/Makefile.in gwenview-1.3.0/src/tsthread/Makefile.in
---- gwenview-1.3.0.orig/src/tsthread/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/src/tsthread/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- src/tsthread/Makefile.in
++++ src/tsthread/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -26485,9 +26464,8 @@
cd $(top_srcdir) && perl admin/am_edit src/tsthread/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ar/Makefile.in gwenview-1.3.0/translations/ar/Makefile.in
---- gwenview-1.3.0.orig/translations/ar/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/ar/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/ar/Makefile.in
++++ translations/ar/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -26899,9 +26877,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ar/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ar/messages/Makefile.in gwenview-1.3.0/translations/ar/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/ar/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/ar/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/ar/messages/Makefile.in
++++ translations/ar/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -27320,9 +27297,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ar/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/az/Makefile.in gwenview-1.3.0/translations/az/Makefile.in
---- gwenview-1.3.0.orig/translations/az/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/az/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/az/Makefile.in
++++ translations/az/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -27734,9 +27710,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/az/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/az/messages/Makefile.in gwenview-1.3.0/translations/az/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/az/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/az/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/az/messages/Makefile.in
++++ translations/az/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -28155,9 +28130,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/az/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/br/Makefile.in gwenview-1.3.0/translations/br/Makefile.in
---- gwenview-1.3.0.orig/translations/br/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/br/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/br/Makefile.in
++++ translations/br/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -28569,9 +28543,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/br/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/br/messages/Makefile.in gwenview-1.3.0/translations/br/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/br/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/br/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/br/messages/Makefile.in
++++ translations/br/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -28990,9 +28963,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/br/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ca/Makefile.in gwenview-1.3.0/translations/ca/Makefile.in
---- gwenview-1.3.0.orig/translations/ca/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/ca/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/ca/Makefile.in
++++ translations/ca/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -29404,9 +29376,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ca/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ca/messages/Makefile.in gwenview-1.3.0/translations/ca/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/ca/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/ca/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/ca/messages/Makefile.in
++++ translations/ca/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -29825,9 +29796,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ca/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/cs/Makefile.in gwenview-1.3.0/translations/cs/Makefile.in
---- gwenview-1.3.0.orig/translations/cs/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/cs/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/cs/Makefile.in
++++ translations/cs/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -30239,9 +30209,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/cs/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/cs/messages/Makefile.in gwenview-1.3.0/translations/cs/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/cs/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/cs/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/cs/messages/Makefile.in
++++ translations/cs/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -30660,9 +30629,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/cs/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/cy/Makefile.in gwenview-1.3.0/translations/cy/Makefile.in
---- gwenview-1.3.0.orig/translations/cy/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/cy/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/cy/Makefile.in
++++ translations/cy/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -31074,9 +31042,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/cy/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/cy/messages/Makefile.in gwenview-1.3.0/translations/cy/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/cy/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/cy/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/cy/messages/Makefile.in
++++ translations/cy/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -31495,9 +31462,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/cy/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/da/doc/Makefile.in gwenview-1.3.0/translations/da/doc/Makefile.in
---- gwenview-1.3.0.orig/translations/da/doc/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/da/doc/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/da/doc/Makefile.in
++++ translations/da/doc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -31762,9 +31728,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/da/doc/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/da/Makefile.in gwenview-1.3.0/translations/da/Makefile.in
---- gwenview-1.3.0.orig/translations/da/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/da/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/da/Makefile.in
++++ translations/da/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -32176,9 +32141,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/da/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/da/messages/Makefile.in gwenview-1.3.0/translations/da/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/da/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/da/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/da/messages/Makefile.in
++++ translations/da/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -32597,9 +32561,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/da/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/de/doc/Makefile.in gwenview-1.3.0/translations/de/doc/Makefile.in
---- gwenview-1.3.0.orig/translations/de/doc/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/de/doc/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/de/doc/Makefile.in
++++ translations/de/doc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -32864,9 +32827,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/de/doc/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/de/Makefile.in gwenview-1.3.0/translations/de/Makefile.in
---- gwenview-1.3.0.orig/translations/de/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/de/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/de/Makefile.in
++++ translations/de/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -33278,9 +33240,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/de/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/de/messages/Makefile.in gwenview-1.3.0/translations/de/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/de/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/de/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/de/messages/Makefile.in
++++ translations/de/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -33699,9 +33660,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/de/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/el/Makefile.in gwenview-1.3.0/translations/el/Makefile.in
---- gwenview-1.3.0.orig/translations/el/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/el/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/el/Makefile.in
++++ translations/el/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -34113,9 +34073,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/el/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/el/messages/Makefile.in gwenview-1.3.0/translations/el/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/el/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/el/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/el/messages/Makefile.in
++++ translations/el/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -34534,9 +34493,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/el/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/en_GB/Makefile.in gwenview-1.3.0/translations/en_GB/Makefile.in
---- gwenview-1.3.0.orig/translations/en_GB/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/en_GB/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/en_GB/Makefile.in
++++ translations/en_GB/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -34948,9 +34906,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/en_GB/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/en_GB/messages/Makefile.in gwenview-1.3.0/translations/en_GB/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/en_GB/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/en_GB/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/en_GB/messages/Makefile.in
++++ translations/en_GB/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -35369,9 +35326,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/en_GB/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/es/Makefile.in gwenview-1.3.0/translations/es/Makefile.in
---- gwenview-1.3.0.orig/translations/es/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/es/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/es/Makefile.in
++++ translations/es/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -35783,9 +35739,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/es/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/es/messages/Makefile.in gwenview-1.3.0/translations/es/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/es/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/es/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/es/messages/Makefile.in
++++ translations/es/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -36204,9 +36159,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/es/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/et/doc/Makefile.in gwenview-1.3.0/translations/et/doc/Makefile.in
---- gwenview-1.3.0.orig/translations/et/doc/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/et/doc/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/et/doc/Makefile.in
++++ translations/et/doc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -36471,9 +36425,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/et/doc/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/et/Makefile.in gwenview-1.3.0/translations/et/Makefile.in
---- gwenview-1.3.0.orig/translations/et/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/et/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/et/Makefile.in
++++ translations/et/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -36885,9 +36838,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/et/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/et/messages/Makefile.in gwenview-1.3.0/translations/et/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/et/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/et/messages/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/et/messages/Makefile.in
++++ translations/et/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -37306,9 +37258,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/et/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/fo/Makefile.in gwenview-1.3.0/translations/fo/Makefile.in
---- gwenview-1.3.0.orig/translations/fo/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/fo/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/fo/Makefile.in
++++ translations/fo/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -37720,9 +37671,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/fo/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/fo/messages/Makefile.in gwenview-1.3.0/translations/fo/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/fo/messages/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/fo/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/fo/messages/Makefile.in
++++ translations/fo/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -38141,9 +38091,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/fo/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/fr/doc/Makefile.in gwenview-1.3.0/translations/fr/doc/Makefile.in
---- gwenview-1.3.0.orig/translations/fr/doc/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/fr/doc/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/fr/doc/Makefile.in
++++ translations/fr/doc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -38384,9 +38333,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/fr/doc/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/fr/Makefile.in gwenview-1.3.0/translations/fr/Makefile.in
---- gwenview-1.3.0.orig/translations/fr/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/fr/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/fr/Makefile.in
++++ translations/fr/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -38798,9 +38746,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/fr/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/fr/messages/Makefile.in gwenview-1.3.0/translations/fr/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/fr/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/fr/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/fr/messages/Makefile.in
++++ translations/fr/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -39219,9 +39166,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/fr/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ga/Makefile.in gwenview-1.3.0/translations/ga/Makefile.in
---- gwenview-1.3.0.orig/translations/ga/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/ga/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/ga/Makefile.in
++++ translations/ga/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -39633,9 +39579,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ga/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ga/messages/Makefile.in gwenview-1.3.0/translations/ga/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/ga/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/ga/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/ga/messages/Makefile.in
++++ translations/ga/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -40054,9 +39999,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ga/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/gl/Makefile.in gwenview-1.3.0/translations/gl/Makefile.in
---- gwenview-1.3.0.orig/translations/gl/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/gl/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/gl/Makefile.in
++++ translations/gl/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -40468,9 +40412,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/gl/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/gl/messages/Makefile.in gwenview-1.3.0/translations/gl/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/gl/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/gl/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/gl/messages/Makefile.in
++++ translations/gl/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -40889,9 +40832,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/gl/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/he/Makefile.in gwenview-1.3.0/translations/he/Makefile.in
---- gwenview-1.3.0.orig/translations/he/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/he/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/he/Makefile.in
++++ translations/he/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -41303,9 +41245,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/he/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/he/messages/Makefile.in gwenview-1.3.0/translations/he/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/he/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/he/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/he/messages/Makefile.in
++++ translations/he/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -41724,9 +41665,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/he/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/hi/Makefile.in gwenview-1.3.0/translations/hi/Makefile.in
---- gwenview-1.3.0.orig/translations/hi/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/hi/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/hi/Makefile.in
++++ translations/hi/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -42138,9 +42078,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/hi/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/hi/messages/Makefile.in gwenview-1.3.0/translations/hi/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/hi/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/hi/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/hi/messages/Makefile.in
++++ translations/hi/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -42559,9 +42498,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/hi/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/hu/Makefile.in gwenview-1.3.0/translations/hu/Makefile.in
---- gwenview-1.3.0.orig/translations/hu/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/hu/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/hu/Makefile.in
++++ translations/hu/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -42973,9 +42911,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/hu/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/hu/messages/Makefile.in gwenview-1.3.0/translations/hu/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/hu/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/hu/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/hu/messages/Makefile.in
++++ translations/hu/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -43394,9 +43331,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/hu/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/is/Makefile.in gwenview-1.3.0/translations/is/Makefile.in
---- gwenview-1.3.0.orig/translations/is/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/is/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/is/Makefile.in
++++ translations/is/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -43808,9 +43744,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/is/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/is/messages/Makefile.in gwenview-1.3.0/translations/is/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/is/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/is/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/is/messages/Makefile.in
++++ translations/is/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -44229,9 +44164,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/is/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/it/doc/Makefile.in gwenview-1.3.0/translations/it/doc/Makefile.in
---- gwenview-1.3.0.orig/translations/it/doc/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/it/doc/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/it/doc/Makefile.in
++++ translations/it/doc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -44496,9 +44430,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/it/doc/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/it/Makefile.in gwenview-1.3.0/translations/it/Makefile.in
---- gwenview-1.3.0.orig/translations/it/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/it/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/it/Makefile.in
++++ translations/it/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -44910,9 +44843,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/it/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/it/messages/Makefile.in gwenview-1.3.0/translations/it/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/it/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/it/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/it/messages/Makefile.in
++++ translations/it/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -45331,9 +45263,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/it/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ja/Makefile.in gwenview-1.3.0/translations/ja/Makefile.in
---- gwenview-1.3.0.orig/translations/ja/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/ja/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/ja/Makefile.in
++++ translations/ja/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -45745,9 +45676,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ja/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ja/messages/Makefile.in gwenview-1.3.0/translations/ja/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/ja/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/ja/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/ja/messages/Makefile.in
++++ translations/ja/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -46166,9 +46096,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ja/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ko/Makefile.in gwenview-1.3.0/translations/ko/Makefile.in
---- gwenview-1.3.0.orig/translations/ko/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/ko/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/ko/Makefile.in
++++ translations/ko/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -46580,9 +46509,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ko/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ko/messages/Makefile.in gwenview-1.3.0/translations/ko/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/ko/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/ko/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/ko/messages/Makefile.in
++++ translations/ko/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -47001,9 +46929,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ko/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/lt/Makefile.in gwenview-1.3.0/translations/lt/Makefile.in
---- gwenview-1.3.0.orig/translations/lt/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/lt/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/lt/Makefile.in
++++ translations/lt/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -47415,9 +47342,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/lt/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/lt/messages/Makefile.in gwenview-1.3.0/translations/lt/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/lt/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/lt/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/lt/messages/Makefile.in
++++ translations/lt/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -47836,9 +47762,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/lt/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/Makefile.in gwenview-1.3.0/translations/Makefile.in
---- gwenview-1.3.0.orig/translations/Makefile.in 2005-09-11 10:40:30.000000000 -0400
-+++ gwenview-1.3.0/translations/Makefile.in 2005-09-12 08:43:47.000000000 -0400
+--- translations/Makefile.in
++++ translations/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -48250,9 +48175,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/nb/Makefile.in gwenview-1.3.0/translations/nb/Makefile.in
---- gwenview-1.3.0.orig/translations/nb/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/nb/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/nb/Makefile.in
++++ translations/nb/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -48664,9 +48588,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/nb/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/nb/messages/Makefile.in gwenview-1.3.0/translations/nb/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/nb/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/nb/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/nb/messages/Makefile.in
++++ translations/nb/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -49085,9 +49008,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/nb/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/nl/doc/Makefile.in gwenview-1.3.0/translations/nl/doc/Makefile.in
---- gwenview-1.3.0.orig/translations/nl/doc/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/nl/doc/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/nl/doc/Makefile.in
++++ translations/nl/doc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -49352,9 +49274,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/nl/doc/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/nl/Makefile.in gwenview-1.3.0/translations/nl/Makefile.in
---- gwenview-1.3.0.orig/translations/nl/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/nl/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/nl/Makefile.in
++++ translations/nl/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -49766,9 +49687,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/nl/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/nl/messages/Makefile.in gwenview-1.3.0/translations/nl/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/nl/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/nl/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/nl/messages/Makefile.in
++++ translations/nl/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -50187,9 +50107,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/nl/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/nso/Makefile.in gwenview-1.3.0/translations/nso/Makefile.in
---- gwenview-1.3.0.orig/translations/nso/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/nso/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/nso/Makefile.in
++++ translations/nso/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -50601,9 +50520,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/nso/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/nso/messages/Makefile.in gwenview-1.3.0/translations/nso/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/nso/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/nso/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/nso/messages/Makefile.in
++++ translations/nso/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -51022,9 +50940,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/nso/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/pa/Makefile.in gwenview-1.3.0/translations/pa/Makefile.in
---- gwenview-1.3.0.orig/translations/pa/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/pa/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/pa/Makefile.in
++++ translations/pa/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -51436,9 +51353,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/pa/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/pa/messages/Makefile.in gwenview-1.3.0/translations/pa/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/pa/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/pa/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/pa/messages/Makefile.in
++++ translations/pa/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -51857,9 +51773,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/pa/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/pl/Makefile.in gwenview-1.3.0/translations/pl/Makefile.in
---- gwenview-1.3.0.orig/translations/pl/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/pl/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/pl/Makefile.in
++++ translations/pl/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -52271,9 +52186,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/pl/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/pl/messages/Makefile.in gwenview-1.3.0/translations/pl/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/pl/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/pl/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/pl/messages/Makefile.in
++++ translations/pl/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -52692,9 +52606,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/pl/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/pt/doc/Makefile.in gwenview-1.3.0/translations/pt/doc/Makefile.in
---- gwenview-1.3.0.orig/translations/pt/doc/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/pt/doc/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/pt/doc/Makefile.in
++++ translations/pt/doc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -52959,9 +52872,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/pt/doc/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/pt/Makefile.in gwenview-1.3.0/translations/pt/Makefile.in
---- gwenview-1.3.0.orig/translations/pt/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/pt/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/pt/Makefile.in
++++ translations/pt/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -53373,9 +53285,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/pt/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/pt/messages/Makefile.in gwenview-1.3.0/translations/pt/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/pt/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/pt/messages/Makefile.in 2005-09-12 08:43:48.000000000 -0400
+--- translations/pt/messages/Makefile.in
++++ translations/pt/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -53794,9 +53705,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/pt/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/pt_BR/doc/Makefile.in gwenview-1.3.0/translations/pt_BR/doc/Makefile.in
---- gwenview-1.3.0.orig/translations/pt_BR/doc/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/pt_BR/doc/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/pt_BR/doc/Makefile.in
++++ translations/pt_BR/doc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -54061,9 +53971,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/pt_BR/doc/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/pt_BR/Makefile.in gwenview-1.3.0/translations/pt_BR/Makefile.in
---- gwenview-1.3.0.orig/translations/pt_BR/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/pt_BR/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/pt_BR/Makefile.in
++++ translations/pt_BR/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -54475,9 +54384,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/pt_BR/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/pt_BR/messages/Makefile.in gwenview-1.3.0/translations/pt_BR/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/pt_BR/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/pt_BR/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/pt_BR/messages/Makefile.in
++++ translations/pt_BR/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -54896,9 +54804,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/pt_BR/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ro/Makefile.in gwenview-1.3.0/translations/ro/Makefile.in
---- gwenview-1.3.0.orig/translations/ro/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/ro/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/ro/Makefile.in
++++ translations/ro/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -55310,9 +55217,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ro/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ro/messages/Makefile.in gwenview-1.3.0/translations/ro/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/ro/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/ro/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/ro/messages/Makefile.in
++++ translations/ro/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -55731,9 +55637,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ro/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ru/doc/Makefile.in gwenview-1.3.0/translations/ru/doc/Makefile.in
---- gwenview-1.3.0.orig/translations/ru/doc/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/ru/doc/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/ru/doc/Makefile.in
++++ translations/ru/doc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -55998,9 +55903,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ru/doc/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ru/Makefile.in gwenview-1.3.0/translations/ru/Makefile.in
---- gwenview-1.3.0.orig/translations/ru/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/ru/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/ru/Makefile.in
++++ translations/ru/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -56412,9 +56316,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ru/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ru/messages/Makefile.in gwenview-1.3.0/translations/ru/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/ru/messages/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/ru/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/ru/messages/Makefile.in
++++ translations/ru/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -56833,9 +56736,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ru/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/rw/Makefile.in gwenview-1.3.0/translations/rw/Makefile.in
---- gwenview-1.3.0.orig/translations/rw/Makefile.in 2005-09-11 10:40:31.000000000 -0400
-+++ gwenview-1.3.0/translations/rw/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/rw/Makefile.in
++++ translations/rw/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -57247,9 +57149,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/rw/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/rw/messages/Makefile.in gwenview-1.3.0/translations/rw/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/rw/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/rw/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/rw/messages/Makefile.in
++++ translations/rw/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -57668,9 +57569,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/rw/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/sr/Makefile.in gwenview-1.3.0/translations/sr/Makefile.in
---- gwenview-1.3.0.orig/translations/sr/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/sr/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/sr/Makefile.in
++++ translations/sr/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -58082,9 +57982,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/sr/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/sr/messages/Makefile.in gwenview-1.3.0/translations/sr/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/sr/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/sr/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/sr/messages/Makefile.in
++++ translations/sr/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -58503,9 +58402,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/sr/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/sr at Latn/Makefile.in gwenview-1.3.0/translations/sr at Latn/Makefile.in
---- gwenview-1.3.0.orig/translations/sr at Latn/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/sr at Latn/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/sr at Latn/Makefile.in
++++ translations/sr at Latn/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -58917,9 +58815,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/sr at Latn/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/sr at Latn/messages/Makefile.in gwenview-1.3.0/translations/sr at Latn/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/sr at Latn/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/sr at Latn/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/sr at Latn/messages/Makefile.in
++++ translations/sr at Latn/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -59338,9 +59235,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/sr at Latn/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/sv/doc/Makefile.in gwenview-1.3.0/translations/sv/doc/Makefile.in
---- gwenview-1.3.0.orig/translations/sv/doc/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/sv/doc/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/sv/doc/Makefile.in
++++ translations/sv/doc/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -59605,9 +59501,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/sv/doc/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/sv/Makefile.in gwenview-1.3.0/translations/sv/Makefile.in
---- gwenview-1.3.0.orig/translations/sv/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/sv/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/sv/Makefile.in
++++ translations/sv/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -60019,9 +59914,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/sv/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/sv/messages/Makefile.in gwenview-1.3.0/translations/sv/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/sv/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/sv/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/sv/messages/Makefile.in
++++ translations/sv/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -60440,9 +60334,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/sv/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ta/Makefile.in gwenview-1.3.0/translations/ta/Makefile.in
---- gwenview-1.3.0.orig/translations/ta/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/ta/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/ta/Makefile.in
++++ translations/ta/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -60854,9 +60747,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ta/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ta/messages/Makefile.in gwenview-1.3.0/translations/ta/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/ta/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/ta/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/ta/messages/Makefile.in
++++ translations/ta/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -61275,9 +61167,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ta/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/tr/Makefile.in gwenview-1.3.0/translations/tr/Makefile.in
---- gwenview-1.3.0.orig/translations/tr/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/tr/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/tr/Makefile.in
++++ translations/tr/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -61689,9 +61580,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/tr/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/tr/messages/Makefile.in gwenview-1.3.0/translations/tr/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/tr/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/tr/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/tr/messages/Makefile.in
++++ translations/tr/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -62110,9 +62000,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/tr/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/uk/Makefile.in gwenview-1.3.0/translations/uk/Makefile.in
---- gwenview-1.3.0.orig/translations/uk/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/uk/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/uk/Makefile.in
++++ translations/uk/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -62524,9 +62413,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/uk/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/uk/messages/Makefile.in gwenview-1.3.0/translations/uk/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/uk/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/uk/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/uk/messages/Makefile.in
++++ translations/uk/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -62945,9 +62833,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/uk/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ven/Makefile.in gwenview-1.3.0/translations/ven/Makefile.in
---- gwenview-1.3.0.orig/translations/ven/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/ven/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/ven/Makefile.in
++++ translations/ven/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -63359,9 +63246,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ven/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/ven/messages/Makefile.in gwenview-1.3.0/translations/ven/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/ven/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/ven/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/ven/messages/Makefile.in
++++ translations/ven/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -63780,9 +63666,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/ven/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/xh/Makefile.in gwenview-1.3.0/translations/xh/Makefile.in
---- gwenview-1.3.0.orig/translations/xh/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/xh/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/xh/Makefile.in
++++ translations/xh/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -64194,9 +64079,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/xh/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/xh/messages/Makefile.in gwenview-1.3.0/translations/xh/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/xh/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/xh/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/xh/messages/Makefile.in
++++ translations/xh/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -64615,9 +64499,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/xh/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/zh_CN/Makefile.in gwenview-1.3.0/translations/zh_CN/Makefile.in
---- gwenview-1.3.0.orig/translations/zh_CN/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/zh_CN/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/zh_CN/Makefile.in
++++ translations/zh_CN/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -65029,9 +64912,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/zh_CN/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/zh_CN/messages/Makefile.in gwenview-1.3.0/translations/zh_CN/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/zh_CN/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/zh_CN/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/zh_CN/messages/Makefile.in
++++ translations/zh_CN/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -65450,9 +65332,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/zh_CN/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/zh_TW/Makefile.in gwenview-1.3.0/translations/zh_TW/Makefile.in
---- gwenview-1.3.0.orig/translations/zh_TW/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/zh_TW/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/zh_TW/Makefile.in
++++ translations/zh_TW/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -65864,9 +65745,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/zh_TW/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/zh_TW/messages/Makefile.in gwenview-1.3.0/translations/zh_TW/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/zh_TW/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/zh_TW/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/zh_TW/messages/Makefile.in
++++ translations/zh_TW/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -66285,9 +66165,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/zh_TW/messages/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/zu/Makefile.in gwenview-1.3.0/translations/zu/Makefile.in
---- gwenview-1.3.0.orig/translations/zu/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/zu/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/zu/Makefile.in
++++ translations/zu/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -66699,9 +66578,8 @@
cd $(top_srcdir) && perl admin/am_edit translations/zu/Makefile.in
-diff -Nru gwenview-1.3.0.orig/translations/zu/messages/Makefile.in gwenview-1.3.0/translations/zu/messages/Makefile.in
---- gwenview-1.3.0.orig/translations/zu/messages/Makefile.in 2005-09-11 10:40:32.000000000 -0400
-+++ gwenview-1.3.0/translations/zu/messages/Makefile.in 2005-09-12 08:43:49.000000000 -0400
+--- translations/zu/messages/Makefile.in
++++ translations/zu/messages/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
Modified: people/chrsmrtn/packages/gwenview/debian/patches/common/03_libtool_update.diff
===================================================================
--- people/chrsmrtn/packages/gwenview/debian/patches/common/03_libtool_update.diff 2005-10-01 18:55:44 UTC (rev 1884)
+++ people/chrsmrtn/packages/gwenview/debian/patches/common/03_libtool_update.diff 2005-10-01 18:56:20 UTC (rev 1885)
@@ -1,24 +1,41 @@
diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in 2005-07-17 09:33:34.000000000 -0400
-+++ b/admin/libtool.m4.in 2005-08-21 17:50:03.000000000 -0400
-@@ -15,7 +15,7 @@
+--- a/admin/libtool.m4.in 2005-10-01 14:33:07.000000000 -0400
++++ b/admin/libtool.m4.in 2005-10-01 14:33:27.000000000 -0400
+@@ -1,28 +1,13 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
##
- ## You should have received a copy of the GNU General Public License
- ## along with this program; if not, write to the Free Software
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful, but
+-## WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-## General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
-+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- ##
- ## As a special exception to the GNU General Public License, if you
- ## distribute this file as part of a program that contains a
-@@ -23,6 +23,7 @@
- ## the same distribution terms that you use for the rest of that program.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
++## This file is free software; the Free Software Foundation gives
++## unlimited permission to copy and/or distribute it, with or without
++## modifications, as long as this notice is preserved.
- # serial 47 AC_PROG_LIBTOOL
-+# Debian $Rev: 214 $
+-# serial 47 AC_PROG_LIBTOOL
++# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -82,7 +83,7 @@
+@@ -82,7 +67,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -27,9 +44,107 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -496,12 +497,11 @@
+@@ -132,7 +117,7 @@
+
+ # Sed substitution that helps us do robust quoting. It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+ # Same as above, but do not quote variable references.
+@@ -152,7 +137,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -200,6 +185,8 @@
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+
++_LT_CC_BASENAME([$compiler])
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -245,6 +232,48 @@
+ ])# _LT_AC_SYS_COMPILER
+
+
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++ case $cc_temp in
++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
++
++
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_COMPILER_BOILERPLATE
++
++
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[ac_outfile=conftest.$ac_objext
++printf "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_LINKER_BOILERPLATE
++
++
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+ # Links a minimal program and checks the executable
+@@ -317,15 +346,15 @@
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+- echo_test_string="`eval $cmd`" &&
++ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++ echo_test_string=`eval $cmd` &&
+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+ then
+ break
+@@ -494,14 +523,13 @@
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
- case "`/usr/bin/file conftest.o`" in
+- case "`/usr/bin/file conftest.o`" in
++ case `/usr/bin/file conftest.o` in
*32-bit*)
- LINUX_64_MODE="32"
case $host in
@@ -41,7 +156,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -513,7 +513,6 @@
+@@ -513,7 +541,6 @@
esac
;;
*64-bit*)
@@ -49,7 +164,47 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -643,7 +642,7 @@
+@@ -578,7 +605,7 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -588,8 +615,10 @@
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+- # So say no if there are warnings
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+ fi
+ fi
+@@ -615,11 +644,16 @@
+ LDFLAGS="$LDFLAGS $3"
+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+- # The compiler can only warn and ignore the option if not recognized
++ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
++ $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
++ $SED '/^$/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ $2=yes
++ fi
+ else
+ $2=yes
+ fi
+@@ -643,7 +677,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -58,24 +213,52 @@
case $build_os in
msdosdjgpp*)
-@@ -672,20 +671,26 @@
+@@ -672,20 +706,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
+- *)
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
- *)
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++ # This has been around since 386BSD, at least. Likely further.
++ if test -x /sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++ elif test -x /usr/sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++ else
++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
++ fi
++ # And add a safety zone
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ ;;
++ osf*)
++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++ # nice to cause kernel panics so lets avoid the loop below.
++ # First set a reasonable default.
++ lt_cv_sys_max_cmd_len=16384
++ #
++ if test -x /sbin/sysconfig; then
++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++ *1*) lt_cv_sys_max_cmd_len=-1 ;;
++ esac
++ fi
++ ;;
++ *)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
- = "XX$testring") >/dev/null 2>&1 &&
- new_result=`expr "X$testring" : ".*" 2>&1` &&
-+ while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
lt_cv_sys_max_cmd_len=$new_result &&
@@ -90,7 +273,16 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -835,7 +840,7 @@
+@@ -781,7 +848,7 @@
+ }]
+ EOF
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) $1 ;;
+@@ -835,7 +902,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -99,7 +291,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -924,13 +929,6 @@
+@@ -924,20 +991,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -113,12 +305,29 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -954,8 +952,11 @@
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -949,13 +1009,18 @@
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+- if test ! -s out/conftest.err; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
++ $SED '/^$/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
fi
fi
- chmod u+w .
+- chmod u+w .
- $rm conftest* out/*
- rmdir out
++ chmod u+w . 2>&AS_MESSAGE_LOG_FD
+ $rm conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
@@ -127,7 +336,18 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -1072,7 +1073,7 @@
+@@ -1014,8 +1079,8 @@
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+@@ -1072,7 +1137,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -136,7 +356,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -1085,7 +1086,7 @@
+@@ -1085,7 +1150,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -145,7 +365,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -1095,7 +1096,20 @@
+@@ -1095,7 +1160,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -167,7 +387,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -1160,7 +1174,7 @@
+@@ -1160,7 +1238,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -176,8 +396,17 @@
;;
beos*)
-@@ -1185,7 +1199,7 @@
+@@ -1169,7 +1247,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
+-bsdi4*)
++bsdi[[45]]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1185,7 +1263,7 @@
+
cygwin* | mingw* | pw32*)
version_type=windows
- shrext=".dll"
@@ -185,16 +414,35 @@
need_version=no
need_lib_prefix=no
-@@ -1250,7 +1264,7 @@
+@@ -1197,7 +1275,8 @@
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -1227,7 +1306,7 @@
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+@@ -1250,7 +1329,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -1273,7 +1287,7 @@
+@@ -1273,7 +1352,7 @@
dynamic_linker=no
;;
@@ -203,16 +451,48 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -1333,7 +1347,7 @@
+@@ -1285,8 +1364,17 @@
+ dynamic_linker='GNU ld.so'
+ ;;
+
+-freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++ # DragonFly does not have aout. When/if they implement a new
++ # versioning mechanism, adjust this.
++ if test -x /usr/bin/objformat; then
++ objformat=`/usr/bin/objformat`
++ else
++ case $host_os in
++ freebsd[[123]]*) objformat=aout ;;
++ *) objformat=elf ;;
++ esac
++ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+@@ -1304,7 +1392,7 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.[01]* | freebsdelf3.[01]*)
++ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -1331,9 +1419,9 @@
+ version_type=sunos
+ need_lib_prefix=no
need_version=no
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
ia64*)
- shrext='.so'
+ shrext_cmds='.so'
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -1348,7 +1362,7 @@
+@@ -1348,7 +1436,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -221,7 +501,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -1359,7 +1373,7 @@
+@@ -1359,7 +1447,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -230,7 +510,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -1421,22 +1435,19 @@
+@@ -1421,22 +1509,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -252,14 +532,14 @@
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -1446,6 +1457,30 @@
+@@ -1446,6 +1531,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -290,7 +570,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -1455,7 +1490,7 @@
+@@ -1455,7 +1564,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -299,16 +579,20 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -1484,7 +1519,7 @@
+@@ -1484,7 +1593,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=no
-+ need_version=yes
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -1504,7 +1539,7 @@
+@@ -1504,7 +1617,7 @@
os2*)
libname_spec='$name'
@@ -317,9 +601,80 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -2095,31 +2130,23 @@
+@@ -1650,7 +1763,9 @@
+
+ case $tagname in
+ CXX)
+- if test -n "$CXX" && test "X$CXX" != "Xno"; then
++ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
+ AC_LIBTOOL_LANG_CXX_CONFIG
+ else
+ tagname=""
+@@ -1712,7 +1827,7 @@
+
+ # AC_LIBTOOL_WIN32_DLL
+ # --------------------
+-# declare package support for building win32 dll's
++# declare package support for building win32 DLLs
+ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+ [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_WIN32_DLL
+@@ -1886,7 +2001,7 @@
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+@@ -1996,7 +2111,7 @@
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+- # but apparently some GNU ld's only accept -v.
++ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -2028,7 +2143,7 @@
+ AC_DEFUN([AC_PROG_LD_GNU],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+@@ -2055,6 +2170,15 @@
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++ darwin*)
++ if test "$GCC" = yes; then
++ reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++ else
++ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++ fi
++ ;;
++esac
+ ])# AC_PROG_LD_RELOAD_FLAG
+
+
+@@ -2088,44 +2212,36 @@
+ lt_cv_deplibs_check_method=pass_all
;;
+-bsdi4*)
++bsdi[[45]]*)
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+
cygwin*)
- lt_cv_deplibs_check_method=pass_all
+ # func_win32_libid is a shell function defined in ltmain.sh
@@ -354,11 +709,27 @@
;;
-freebsd*)
-+freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -2158,42 +2185,21 @@
+ # Not sure whether the presence of OpenBSD here was a mistake.
+ # Let's accept both of them until this is cleared up.
+- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ ;;
+@@ -2141,7 +2257,7 @@
+
+ hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*)
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -2158,42 +2274,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -408,9 +779,21 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -2222,9 +2228,6 @@
+@@ -2212,19 +2307,14 @@
;;
+ openbsd*)
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+ else
+- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ fi
+ ;;
+
osf3* | osf4* | osf5*)
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
@@ -418,7 +801,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -2234,7 +2237,6 @@
+@@ -2234,7 +2324,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -426,7 +809,83 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -2500,7 +2502,7 @@
+@@ -2342,13 +2431,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!). If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-convenience to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!). If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ case $enable_ltdl_convenience in
+@@ -2367,13 +2456,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments. Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!). If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-install to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!). If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+@@ -2411,10 +2500,21 @@
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+ ])# _LT_AC_LANG_CXX
+
++# _LT_AC_PROG_CXXCPP
++# ---------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
+
+ # AC_LIBTOOL_F77
+ # --------------
+@@ -2487,6 +2587,10 @@
+
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ #
+ # Check for any special shared library compilation flags.
+ #
+@@ -2500,7 +2604,7 @@
fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -435,7 +894,16 @@
else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -2550,7 +2552,7 @@
+@@ -2541,7 +2645,7 @@
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -2550,48 +2654,11 @@
fi
;;
@@ -444,18 +912,18 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -2560,29 +2562,29 @@
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
+- ;;
+- darwin* | rhapsody*)
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- else
+- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
@@ -464,42 +932,67 @@
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+ ;;
-+ esac
- fi
- ;;
- esac
- output_verbose_link_cmd='echo'
+- fi
+- ;;
+- esac
+- output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -2590,8 +2592,8 @@
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+ fi
+ ;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -2699,8 +2701,8 @@
+@@ -2616,7 +2683,7 @@
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -2645,7 +2712,7 @@
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+
+ # Object file extension for compiled C++ test sources.
+ objext=o
+@@ -2660,6 +2727,10 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -2681,7 +2752,7 @@
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -2699,8 +2770,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -510,7 +1003,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -2726,7 +2728,7 @@
+@@ -2726,7 +2797,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -519,7 +1012,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -2756,8 +2758,22 @@
+@@ -2756,8 +2827,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -544,7 +1037,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -2803,15 +2819,16 @@
+@@ -2774,7 +2859,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ if test "$GXX" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
++ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -2795,6 +2880,9 @@
+ fi
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -2803,15 +2891,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -565,7 +1077,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -2820,13 +2837,12 @@
+@@ -2820,13 +2909,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -581,16 +1093,23 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -2841,7 +2857,7 @@
+@@ -2840,8 +2928,8 @@
+ # Exported symbols can be pulled into shared objects from archives
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
+- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -2858,12 +2874,12 @@
+@@ -2854,16 +2942,17 @@
+ esac
+ ;;
+
++
+ cygwin* | mingw* | pw32*)
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -605,7 +1124,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -2872,7 +2888,7 @@
+@@ -2872,70 +2961,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -614,17 +1133,52 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -2883,20 +2899,20 @@
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
+ ;;
++ darwin* | rhapsody*)
++ case $host_os in
++ rhapsody* | darwin1.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+- darwin* | rhapsody*)
+- if test "$GXX" = yes; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
++ if test "$GXX" = yes ; then
++ lt_int_apple_cc_single_mod=no
++ output_verbose_link_cmd='echo'
++ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++ lt_int_apple_cc_single_mod=yes
++ fi
++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
@@ -634,67 +1188,114 @@
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
- ;;
- esac
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+ ;;
-+ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ fi
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ fi
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
fi
- ;;
- esac
-@@ -2906,19 +2922,19 @@
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- ;;
+- esac
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
+- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
+- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
+- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
+- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -2953,7 +2969,7 @@
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++ ;;
+
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2946,14 +3046,14 @@
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[[12]]*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
- freebsd*)
-+ freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -2975,7 +2991,7 @@
+@@ -2970,12 +3070,12 @@
+ # location of the library.
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
- aCC)
+- aCC)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ aCC*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -2984,11 +3000,11 @@
+@@ -2984,11 +3084,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
*)
if test "$GXX" = yes; then
@@ -703,7 +1304,38 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3045,7 +3061,7 @@
+@@ -2998,7 +3098,7 @@
+ ;;
+ hpux10*|hpux11*)
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -3014,7 +3114,7 @@
+ ;;
+ esac
+ fi
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -3035,17 +3135,17 @@
+ esac
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aCC)
+- case "$host_cpu" in
++ aCC*)
++ case $host_cpu in
+ hppa*64*|ia64*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -712,7 +1344,13 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -3066,7 +3082,7 @@
+@@ -3061,12 +3161,12 @@
+ *)
+ if test "$GXX" = yes; then
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*|hppa*64*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -721,28 +1359,38 @@
;;
esac
fi
-@@ -3081,7 +3097,7 @@
+@@ -3079,9 +3179,9 @@
+ ;;
+ irix5* | irix6*)
case $cc_basename in
- CC)
+- CC)
++ CC*)
# SGI C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -3092,9 +3108,9 @@
+@@ -3092,9 +3192,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -3111,8 +3127,8 @@
+@@ -3105,14 +3205,14 @@
+ ;;
+ linux*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -753,19 +1401,49 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -3134,16 +3150,16 @@
+@@ -3130,20 +3230,44 @@
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ ;;
+- icpc)
++ icpc*)
# Intel C++
with_gnu_ld=yes
++ # version 8.0 and above of icpc choke on multiply defined symbols
++ # if we add $predep_objects and $postdep_objects, however 7.1 and
++ # earlier do not add the objects themselves.
++ case `$CC -V 2>&1` in
++ *"Version 7."*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ *) # Version 8.0 or newer
++ tmp_idyn=
++ case $host_cpu in
++ ia64*) tmp_idyn=' -i_dynamic';;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ esac
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
- cxx)
+- cxx)
++ pgCC*)
++ # Portland Group C++ compiler
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ ;;
++ cxx*)
# Compaq C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -774,8 +1452,17 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3181,7 +3197,7 @@
+@@ -3171,7 +3295,7 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
+@@ -3181,7 +3305,7 @@
+ ;;
esac
;;
- netbsd*)
@@ -783,7 +1470,32 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -3200,7 +3216,7 @@
+@@ -3192,15 +3316,31 @@
+ # Workaround some broken pre-1.5 toolchains
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+ ;;
++ openbsd2*)
++ # C++ shared libraries are fairly broken
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ openbsd*)
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ fi
++ output_verbose_link_cmd='echo'
++ ;;
+ osf3*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -792,25 +1504,41 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3217,7 +3233,7 @@
+@@ -3210,14 +3350,14 @@
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
;;
- cxx)
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- cxx)
++ cxx*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3235,7 +3251,7 @@
+@@ -3235,7 +3375,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3260,7 +3276,7 @@
+@@ -3254,13 +3394,13 @@
+ ;;
+ osf4* | osf5*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -819,50 +1547,123 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3276,10 +3292,10 @@
+@@ -3269,17 +3409,17 @@
+ # the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
- cxx)
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- cxx)
++ cxx*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
-+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3298,7 +3314,7 @@
+@@ -3298,7 +3438,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -3355,9 +3371,9 @@
- CC)
+@@ -3322,7 +3462,7 @@
+ sco*)
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+@@ -3334,12 +3474,12 @@
+ ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3352,36 +3492,33 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
# Sun C++ 4.2, 5.x and Centerline C++
++ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
-+ $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -3391,7 +3407,7 @@
+ case $host_os in
+- solaris2.[0-5] | solaris2.[0-5].*) ;;
++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+ # The C++ compiler is used as linker so we must use $wl
+ # flag to pass the commands to the underlying system
+- # linker.
++ # linker. We must also pass each convience library through
++ # to the system linker between allextract/defaultextract.
++ # The C++ compiler will combine linker options so we
++ # cannot just pass the convience library names through
++ # without $wl.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
+ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- #
+- # There doesn't appear to be a way to prevent this compiler from
+- # explicitly linking system object files so we need to strip them
+- # from the output so that they don't get included in the library
+- # dependencies.
+- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -3389,9 +3526,9 @@
+ # in the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
;;
- gcx)
+- gcx)
++ gcx*)
# Green Hills C++ Compiler
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -3401,9 +3417,9 @@
+@@ -3401,9 +3538,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -874,7 +1675,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -3412,9 +3428,9 @@
+@@ -3412,9 +3549,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -886,7 +1687,25 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -3582,7 +3598,7 @@
+@@ -3432,7 +3569,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3542,7 +3679,7 @@
+ # The `*' in the case matches for architectures that use `case' in
+ # $output_verbose_cmd can trigger glob expansion during the loop
+ # eval without this substitution.
+- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+
+ for p in `eval $output_verbose_link_cmd`; do
+ case $p in
+@@ -3582,7 +3719,7 @@
fi
;;
@@ -895,16 +1714,115 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -3691,7 +3707,7 @@
+@@ -3618,6 +3755,21 @@
+
+ $rm -f confest.$objext
+
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++solaris*)
++ case $cc_basename in
++ CC*)
++ # Adding this requires a known-good setup of shared libraries for
++ # Sun compiler versions before 5.6, else PIC objects from an old
++ # archive will be linked into the output, leading to subtle bugs.
++ _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++ ;;
++ esac
++esac
++])
++
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+@@ -3668,12 +3820,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+@@ -3683,7 +3839,7 @@
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -3691,8 +3847,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
-aix4*)
+- test "$enable_shared" = yes && enable_static=no
+aix4* | aix5*)
- test "$enable_shared" = yes && enable_static=no
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
++ fi
;;
esac
-@@ -3833,11 +3849,12 @@
+ AC_MSG_RESULT([$enable_shared])
+@@ -3743,20 +3901,27 @@
+ lt_simple_compile_test_code="class foo {}\n"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -3803,11 +3968,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+ AC_LIBTOOL_CONFIG($1)
+@@ -3833,11 +4003,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -919,7 +1837,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -3887,7 +3904,7 @@
+@@ -3887,7 +4058,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -928,16 +1846,43 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -3942,7 +3959,7 @@
+@@ -3942,7 +4113,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
-@@ -4018,7 +4035,7 @@
+@@ -3953,11 +4124,11 @@
+ SED=$lt_SED
+
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -3988,6 +4159,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -4018,7 +4195,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -946,7 +1891,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -4049,7 +4066,7 @@
+@@ -4049,7 +4226,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -955,7 +1900,16 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -4293,7 +4310,10 @@
+@@ -4064,7 +4241,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -4293,7 +4470,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -967,7 +1921,31 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -4366,7 +4386,7 @@
+@@ -4335,9 +4515,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+@@ -4359,6 +4536,13 @@
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+ ;;
++linux*)
++ if test "$host_cpu" = ia64; then
++ symcode='[[ABCDGIRSTW]]'
++ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
++ fi
++ ;;
+ irix* | nonstopux*)
+ symcode='[[BCDEGRST]]'
+ ;;
+@@ -4366,7 +4550,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -976,7 +1954,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -4384,7 +4404,7 @@
+@@ -4384,14 +4568,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -985,26 +1963,133 @@
esac
# Try without a prefix undercore, then with it.
-@@ -4599,7 +4619,7 @@
+ for ac_symprfx in "" "_"; do
+
++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++ symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+ # Write the raw and C identifiers.
+- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+@@ -4555,7 +4742,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
+ *)
+@@ -4580,18 +4767,28 @@
+ ;;
+ chorus*)
+ case $cc_basename in
+- cxch68)
++ cxch68*)
+ # Green Hills C++ Compiler
+ # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ ;;
+ esac
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ esac
++ ;;
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+@@ -4599,22 +4796,22 @@
+ ;;
esac
;;
- freebsd*)
-+ freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -4650,7 +4670,7 @@
+ case $cc_basename in
+- CC)
++ CC*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ fi
+ ;;
+- aCC)
++ aCC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -4629,7 +4826,7 @@
+ ;;
+ irix5* | irix6* | nonstopux*)
+ case $cc_basename in
+- CC)
++ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ # CC pic flag -KPIC is the default.
+@@ -4640,18 +4837,24 @@
+ ;;
+ linux*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # KAI C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+- icpc)
++ icpc* | ecpc*)
+ # Intel C++
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
+- cxx)
+ ;;
- cxx)
++ pgCC*)
++ # Portland Group C++ compiler.
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++ cxx*)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -4675,7 +4695,7 @@
+ # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -4668,25 +4871,25 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
;;
+ *)
+ ;;
esac
;;
- netbsd*)
@@ -1012,17 +2097,175 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -4986,6 +5006,9 @@
+- KCC)
++ KCC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+- cxx)
++ cxx*)
+ # Digital/Compaq C++
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # Make sure the PIC flag is empty. It appears that all Alpha
+@@ -4702,7 +4905,7 @@
+ ;;
+ sco*)
+ case $cc_basename in
+- CC)
++ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+ *)
+@@ -4711,13 +4914,13 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
+- gcx)
++ gcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ ;;
+@@ -4727,12 +4930,12 @@
+ ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+@@ -4742,7 +4945,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ ;;
+@@ -4813,7 +5016,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -4839,6 +5042,16 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ esac
++ ;;
+
+ mingw* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+@@ -4850,7 +5063,7 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -4874,12 +5087,19 @@
+ ;;
+
+ linux*)
+- case $CC in
++ case $cc_basename in
+ icc* | ecc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
++ pgcc* | pgf77* | pgf90* | pgf95*)
++ # Portland Group compilers (*not* the Pentium gcc compiler,
++ # which looks to be a dead project)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
+ ccc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # All Alpha code is PIC.
+@@ -4900,9 +5120,14 @@
+ ;;
+
+ solaris*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ case $cc_basename in
++ f77* | f90* | f95*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++ *)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++ esac
+ ;;
+
+ sunos4*)
+@@ -4924,6 +5149,11 @@
+ fi
+ ;;
+
++ unicos*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++ ;;
++
+ uts4*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -4951,7 +5181,7 @@
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+ fi
+-case "$host_os" in
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+@@ -4984,7 +5214,10 @@
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
cygwin* | mingw*)
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ ;;
+ linux*)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+ ;;
+ ;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
-@@ -5010,7 +5033,7 @@
+@@ -5010,7 +5243,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1031,7 +2274,45 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -5084,7 +5107,7 @@
+@@ -5027,7 +5260,8 @@
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ extract_expsyms_cmds=
+-
++ # Just being paranoid about ensuring that cc_basename is set.
++ _LT_CC_BASENAME([$compiler])
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+@@ -5047,6 +5281,27 @@
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
++ # Set some defaults for GNU ld with shared library support. These
++ # are reset later if shared libraries are not supported. Putting them
++ # here allows them to be overridden if necessary.
++ runpath_var=LD_RUN_PATH
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ # ancient GNU ld didn't support --whole-archive et. al.
++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ else
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++ fi
++ supports_anon_versioning=no
++ case `$LD -v 2>/dev/null` in
++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++ *\ 2.11.*) ;; # other 2.11 versions
++ *) supports_anon_versioning=yes ;;
++ esac
++
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix3* | aix4* | aix5*)
+@@ -5084,7 +5339,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -1040,7 +2321,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5094,13 +5117,13 @@
+@@ -5094,13 +5349,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1048,7 +2329,8 @@
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -1056,14 +2338,47 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -5109,19 +5132,19 @@
+@@ -5109,19 +5364,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++
++ linux*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ tmp_addflag=
++ case $cc_basename,$host_cpu in
++ pgcc*) # Portland Group C compiler
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag'
++ ;;
++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag -Mnomain' ;;
++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
++ tmp_addflag=' -i_dynamic' ;;
++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
++ tmp_addflag=' -i_dynamic -nofor_main' ;;
++ ifc* | ifort*) # Intel Fortran compiler
++ tmp_addflag=' -nofor_main' ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++ if test $supports_anon_versioning = yes; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ $echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ fi
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
- ld_shlibs=no
+- ld_shlibs=no
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
@@ -1080,7 +2395,7 @@
fi
;;
-@@ -5139,8 +5162,8 @@
+@@ -5139,8 +5426,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1091,36 +2406,8 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5153,10 +5176,36 @@
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
+@@ -5155,24 +5442,19 @@
-+ linux*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
-+ supports_anon_versioning=no
-+ case `$LD -v 2>/dev/null` in
-+ *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+ *\ 2.11.*) ;; # other 2.11 versions
-+ *) supports_anon_versioning=yes ;;
-+ esac
-+ if test $supports_anon_versioning = yes; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+$echo "local: *; };" >> $output_objdir/$libname.ver~
-+ $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+ else
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
-+ fi
-+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-+
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
@@ -1130,7 +2417,28 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -5206,9 +5255,20 @@
+ ;;
+ esac
+
+- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+- runpath_var=LD_RUN_PATH
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+- fi
++ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++ runpath_var=
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -5206,9 +5488,20 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -1153,7 +2461,26 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -5254,29 +5314,29 @@
+@@ -5225,7 +5518,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ if test "$GCC" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
++ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -5246,6 +5539,9 @@
+ fi
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -5254,29 +5550,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1192,16 +2519,27 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -5291,7 +5351,7 @@
+@@ -5290,8 +5586,8 @@
+ # Exported symbols can be pulled into shared objects from archives
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds it's shared libraries.
+- # This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
-@@ -5314,13 +5374,13 @@
+@@ -5304,7 +5600,7 @@
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+- bsdi4*)
++ bsdi[[45]]*)
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+ ;;
+
+@@ -5314,69 +5610,69 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1218,14 +2556,20 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
-@@ -5334,21 +5394,21 @@
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- case "$host_os" in
- rhapsody* | darwin1.[[012]])
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+- fix_srcfile_path='`cygpath -w "$srcfile"`'
++ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
+ darwin* | rhapsody*)
+- if test "$GXX" = yes ; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
+- ;;
+- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
- else
@@ -1238,68 +2582,91 @@
- ;;
- esac
- fi
-+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+ else
-+ case ${MACOSX_DEPLOYMENT_TARGET} in
-+ 10.[[012]])
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-+ ;;
-+ 10.*)
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-+ ;;
-+ esac
-+ fi
- ;;
+- ;;
++ case $host_os in
++ rhapsody* | darwin1.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
esac
- lt_int_apple_cc_single_mod=no
-@@ -5357,26 +5417,26 @@
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
+- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
+- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
-+ _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
+- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
+- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
++ if test "$GCC" = yes ; then
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
+ fi
;;
dgux*)
-@@ -5409,8 +5469,8 @@
+@@ -5409,8 +5705,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
-+ freebsd* | kfreebsd*-gnu)
++ freebsd* | kfreebsd*-gnu | dragonfly*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -5418,7 +5478,7 @@
+@@ -5418,7 +5714,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1308,9 +2675,12 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -5436,10 +5496,10 @@
+@@ -5434,16 +5730,16 @@
+
+ hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- case "$host_cpu" in
+- case "$host_cpu" in
++ case $host_cpu in
hppa*64*|ia64*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -1321,7 +2691,21 @@
;;
esac
else
-@@ -5486,7 +5546,7 @@
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+ ;;
+@@ -5453,7 +5749,7 @@
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+@@ -5486,7 +5782,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1330,7 +2714,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -5496,7 +5556,7 @@
+@@ -5496,7 +5792,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1339,16 +2723,17 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -5519,7 +5579,7 @@
+@@ -5519,7 +5815,8 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -5529,7 +5589,7 @@
+@@ -5529,7 +5826,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1357,7 +2742,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -5540,14 +5600,14 @@
+@@ -5540,14 +5837,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1374,7 +2759,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -5559,7 +5619,7 @@
+@@ -5559,13 +5856,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1383,19 +2768,50 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -5584,9 +5644,9 @@
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -5584,10 +5881,12 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ wlarc='${wl}'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
else
++ wlarc=''
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -5606,7 +5666,7 @@
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -5596,8 +5895,18 @@
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ *)
++ # The compiler driver will combine linker options so we
++ # cannot just pass the convience library names through
++ # without $wl, iff we do not link with $LD.
++ # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # Supported since Solaris 2.6 (maybe 2.5.1?)
++ case $wlarc in
++ '')
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ *)
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
++ esac ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+@@ -5606,7 +5915,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -1404,7 +2820,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -5666,9 +5726,9 @@
+@@ -5666,9 +5975,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1416,7 +2832,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -5726,7 +5786,7 @@
+@@ -5726,7 +6035,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1425,33 +2841,33 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -5885,7 +5945,7 @@
- fi
- done
- done
--])
- SED=$lt_cv_path_SED
-+])
- AC_MSG_RESULT([$SED])
- ])
+@@ -5860,7 +6169,7 @@
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+- test ! -f $lt_ac_sed && break
++ test ! -f $lt_ac_sed && continue
+ cat /dev/null > conftest.in
+ lt_ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh 2005-07-17 09:33:34.000000000 -0400
-+++ b/admin/ltmain.sh 2005-08-21 17:50:03.000000000 -0400
+--- a/admin/ltmain.sh 2005-10-01 14:33:07.000000000 -0400
++++ b/admin/ltmain.sh 2005-10-01 14:33:27.000000000 -0400
@@ -1,7 +1,7 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
#
-@@ -17,13 +17,36 @@
+@@ -17,13 +17,41 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -1477,14 +2893,19 @@
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
-+VERSION=1.5.6
-+TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
++VERSION="1.5.20 Debian 1.5.20-2"
++TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
+
++# See if we are running on zsh, and set the options which allow our
++# commands through without removal of \ escapes.
++if test -n "${ZSH_VERSION+set}" ; then
++ setopt NO_GLOB_SUBST
++fi
+
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
-@@ -36,7 +59,7 @@
+@@ -36,7 +64,7 @@
:
else
# Restart under the correct shell, and then maybe $echo will work.
@@ -1493,7 +2914,7 @@
fi
if test "X$1" = X--fallback-echo; then
-@@ -45,19 +68,9 @@
+@@ -45,19 +73,9 @@
cat <<EOF
$*
EOF
@@ -1514,13 +2935,37 @@
default_mode=
help="Try \`$progname --help' for more information."
magic="%%%MAGIC variable%%%"
-@@ -94,12 +107,13 @@
+@@ -70,14 +88,15 @@
+ Xsed="${SED}"' -e 1s/^X//'
+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+ # test EBCDIC or ASCII
+-case `echo A|tr A '\301'` in
+- A) # EBCDIC based system
+- SP2NL="tr '\100' '\n'"
+- NL2SP="tr '\r\n' '\100\100'"
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++ SP2NL='tr \040 \012'
++ NL2SP='tr \015\012 \040\040'
+ ;;
+- *) # Assume ASCII based system
+- SP2NL="tr '\040' '\012'"
+- NL2SP="tr '\015\012' '\040\040'"
++ *) # EBCDIC based system
++ SP2NL='tr \100 \n'
++ NL2SP='tr \r\n \100\100'
+ ;;
+ esac
+
+@@ -94,12 +113,14 @@
fi
# Make sure IFS has a sensible default
-: ${IFS=" "}
-+: ${IFS="
-+"}
++lt_nl='
++'
++IFS=" $lt_nl"
if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
$echo "$modename: not configured to build any kind of library" 1>&2
@@ -1530,7 +2975,7 @@
fi
# Global variables.
-@@ -118,10 +132,13 @@
+@@ -118,10 +139,14 @@
# Shell function definitions:
# This seems to be the best place for them
@@ -1541,11 +2986,12 @@
# Has to be a shell function in order to 'eat' the argument
# that is supplied when $file_magic_command is called.
-win32_libid () {
-+func_win32_libid () {
++func_win32_libid ()
++{
win32_libid_type="unknown"
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
-@@ -130,7 +147,7 @@
+@@ -130,7 +155,7 @@
;;
*ar\ archive*) # could be an import, or static
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
@@ -1554,7 +3000,7 @@
win32_nmres=`eval $NM -f posix -A $1 | \
sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
if test "X$win32_nmres" = "Ximport" ; then
-@@ -140,7 +157,7 @@
+@@ -140,7 +165,7 @@
fi
fi
;;
@@ -1563,7 +3009,7 @@
win32_libid_type="x86 DLL"
;;
*executable*) # but shell scripts are "executable" too...
-@@ -154,9 +171,76 @@
+@@ -154,9 +179,179 @@
$echo $win32_libid_type
}
@@ -1574,7 +3020,8 @@
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
-+func_infer_tag () {
++func_infer_tag ()
++{
+ if test -n "$available_tags" && test -z "$tagname"; then
+ CC_quoted=
+ for arg in $CC; do
@@ -1631,6 +3078,108 @@
+ esac
+ fi
+}
++
++
++# func_extract_an_archive dir oldlib
++func_extract_an_archive ()
++{
++ f_ex_an_ar_dir="$1"; shift
++ f_ex_an_ar_oldlib="$1"
++
++ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
++ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
++ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++ :
++ else
++ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
++ exit $EXIT_FAILURE
++ fi
++}
++
++# func_extract_archives gentop oldlib ...
++func_extract_archives ()
++{
++ my_gentop="$1"; shift
++ my_oldlibs=${1+"$@"}
++ my_oldobjs=""
++ my_xlib=""
++ my_xabs=""
++ my_xdir=""
++ my_status=""
++
++ $show "${rm}r $my_gentop"
++ $run ${rm}r "$my_gentop"
++ $show "$mkdir $my_gentop"
++ $run $mkdir "$my_gentop"
++ my_status=$?
++ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
++ exit $my_status
++ fi
++
++ for my_xlib in $my_oldlibs; do
++ # Extract the objects.
++ case $my_xlib in
++ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++ *) my_xabs=`pwd`"/$my_xlib" ;;
++ esac
++ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
++ my_xdir="$my_gentop/$my_xlib"
++
++ $show "${rm}r $my_xdir"
++ $run ${rm}r "$my_xdir"
++ $show "$mkdir $my_xdir"
++ $run $mkdir "$my_xdir"
++ status=$?
++ if test "$status" -ne 0 && test ! -d "$my_xdir"; then
++ exit $status
++ fi
++ case $host in
++ *-darwin*)
++ $show "Extracting $my_xabs"
++ # Do not bother doing anything if just a dry run
++ if test -z "$run"; then
++ darwin_orig_dir=`pwd`
++ cd $my_xdir || exit $?
++ darwin_archive=$my_xabs
++ darwin_curdir=`pwd`
++ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
++ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
++ if test -n "$darwin_arches"; then
++ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
++ darwin_arch=
++ $show "$darwin_base_archive has multiple architectures $darwin_arches"
++ for darwin_arch in $darwin_arches ; do
++ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ func_extract_an_archive "`pwd`" "${darwin_base_archive}"
++ cd "$darwin_curdir"
++ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
++ done # $darwin_arches
++ ## Okay now we have a bunch of thin objects, gotta fatten them up :)
++ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
++ darwin_file=
++ darwin_files=
++ for darwin_file in $darwin_filelist; do
++ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++ lipo -create -output "$darwin_file" $darwin_files
++ done # $darwin_filelist
++ ${rm}r unfat-$$
++ cd "$darwin_orig_dir"
++ else
++ cd "$darwin_orig_dir"
++ func_extract_an_archive "$my_xdir" "$my_xabs"
++ fi # $darwin_arches
++ fi # $run
++ ;;
++ *)
++ func_extract_an_archive "$my_xdir" "$my_xabs"
++ ;;
++ esac
++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++ done
++ func_extract_archives_result="$my_oldobjs"
++}
# End of Shell function definitions
#####################################
@@ -1640,7 +3189,7 @@
# Parse our command line options once, thoroughly.
while test "$#" -gt 0
do
-@@ -176,12 +260,13 @@
+@@ -176,12 +371,13 @@
;;
tag)
tagname="$arg"
@@ -1655,7 +3204,7 @@
;;
esac
-@@ -191,10 +276,10 @@
+@@ -191,10 +387,10 @@
# not specially marked.
;;
*)
@@ -1668,12 +3217,16 @@
else
$echo "$progname: ignoring unknown tag $tagname" 1>&2
fi
-@@ -223,21 +308,22 @@
- $echo "Copyright (C) 2003 Free Software Foundation, Inc."
+@@ -220,24 +416,25 @@
+ --version)
+ $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+ $echo
+- $echo "Copyright (C) 2003 Free Software Foundation, Inc."
++ $echo "Copyright (C) 2005 Free Software Foundation, Inc."
$echo "This is free software; see the source for copying conditions. There is NO"
$echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
- exit 0
-+ exit $EXIT_SUCCESS
++ exit $?
;;
--config)
@@ -1685,7 +3238,7 @@
+ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
done
- exit 0
-+ exit $EXIT_SUCCESS
++ exit $?
;;
--debug)
@@ -1695,16 +3248,16 @@
;;
--dry-run | -n)
-@@ -256,7 +342,7 @@
+@@ -256,7 +453,7 @@
else
$echo "disable static libraries"
fi
- exit 0
-+ exit $EXIT_SUCCESS
++ exit $?
;;
--finish) mode="finish" ;;
-@@ -268,6 +354,7 @@
+@@ -268,6 +465,7 @@
--quiet | --silent)
show=:
@@ -1712,7 +3265,7 @@
;;
--tag) prevopt="--tag" prev=tag ;;
-@@ -275,6 +362,7 @@
+@@ -275,6 +473,7 @@
set tag "$optarg" ${1+"$@"}
shift
prev=tag
@@ -1720,7 +3273,7 @@
;;
-dlopen)
-@@ -285,7 +373,7 @@
+@@ -285,7 +484,7 @@
-*)
$echo "$modename: unrecognized option \`$arg'" 1>&2
$echo "$help" 1>&2
@@ -1729,7 +3282,7 @@
;;
*)
-@@ -298,7 +386,7 @@
+@@ -298,7 +497,7 @@
if test -n "$prevopt"; then
$echo "$modename: option \`$prevopt' requires an argument" 1>&2
$echo "$help" 1>&2
@@ -1738,7 +3291,16 @@
fi
# If this variable is set in any of the actions, the command in it
-@@ -354,7 +442,7 @@
+@@ -311,7 +510,7 @@
+ # Infer the operation mode.
+ if test -z "$mode"; then
+ $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+- $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
++ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+ case $nonopt in
+ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+ mode=link
+@@ -354,7 +553,7 @@
if test -n "$execute_dlfiles" && test "$mode" != execute; then
$echo "$modename: unrecognized option \`-dlopen'" 1>&2
$echo "$help" 1>&2
@@ -1747,7 +3309,7 @@
fi
# Change the help message to a mode-specific one.
-@@ -369,9 +457,11 @@
+@@ -369,13 +568,15 @@
# Get the compilation command and the source file.
base_compile=
srcfile="$nonopt" # always keep a non-empty value in "srcfile"
@@ -1759,7 +3321,12 @@
for arg
do
-@@ -394,24 +484,19 @@
+- case "$arg_mode" in
++ case $arg_mode in
+ arg )
+ # do not "continue". Instead, add this to base_compile
+ lastarg="$arg"
+@@ -394,24 +595,19 @@
-o)
if test -n "$libobj" ; then
$echo "$modename: you cannot specify \`-o' more than once" 1>&2
@@ -1772,16 +3339,16 @@
- -static)
- build_old_libs=yes
-- continue
-- ;;
--
-- -prefer-pic)
-- pic_mode=yes
+ -static | -prefer-pic | -prefer-non-pic)
+ later="$later $arg"
continue
;;
+- -prefer-pic)
+- pic_mode=yes
+- continue
+- ;;
+-
- -prefer-non-pic)
- pic_mode=no
+ -no-suppress)
@@ -1789,7 +3356,7 @@
continue
;;
-@@ -424,7 +509,7 @@
+@@ -424,7 +620,7 @@
args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
lastarg=
save_ifs="$IFS"; IFS=','
@@ -1798,7 +3365,19 @@
IFS="$save_ifs"
# Double-quote args containing other shell metacharacters.
-@@ -474,11 +559,11 @@
+@@ -462,7 +658,10 @@
+ case $lastarg in
+ # Double-quote args containing other shell metacharacters.
+ # Many Bourne shells cannot handle close brackets correctly
+- # in scan sets, so we specify it separately.
++ # in scan sets, and some SunOS ksh mistreat backslash-escaping
++ # in scan sets (worked around with variable expansion),
++ # and furthermore cannot handle '|' '&' '(' ')' in scan sets
++ # at all, so we specify them separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ lastarg="\"$lastarg\""
+ ;;
+@@ -474,11 +673,11 @@
case $arg_mode in
arg)
$echo "$modename: you must specify an argument for -Xcompile"
@@ -1812,7 +3391,7 @@
;;
*)
# Get the name of the library object.
-@@ -511,50 +596,30 @@
+@@ -511,51 +710,39 @@
*.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
*)
$echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
@@ -1880,9 +3459,18 @@
- fi
+ done
++ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
++ case $qlibobj in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ qlibobj="\"$qlibobj\"" ;;
++ esac
++ test "X$libobj" != "X$qlibobj" \
++ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \
++ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-@@ -568,7 +633,7 @@
+ if test "X$xdir" = "X$obj"; then
+@@ -568,7 +755,7 @@
if test -z "$base_compile"; then
$echo "$modename: you must specify a compilation command" 1>&2
$echo "$help" 1>&2
@@ -1891,7 +3479,7 @@
fi
# Delete any leftover library objects.
-@@ -579,7 +644,7 @@
+@@ -579,7 +766,7 @@
fi
$run $rm $removelist
@@ -1900,7 +3488,7 @@
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
-@@ -598,7 +663,7 @@
+@@ -598,7 +785,7 @@
output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
removelist="$removelist $output_obj $lockfile"
@@ -1909,7 +3497,7 @@
else
output_obj=
need_locks=no
-@@ -608,7 +673,7 @@
+@@ -608,7 +795,7 @@
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
if test "$need_locks" = yes; then
@@ -1918,16 +3506,42 @@
$show "Waiting for $lockfile to be removed"
sleep 2
done
-@@ -626,7 +691,7 @@
+@@ -626,14 +813,19 @@
compiler."
$run $rm $removelist
- exit 1
+ exit $EXIT_FAILURE
fi
- $echo $srcfile > "$lockfile"
+- $echo $srcfile > "$lockfile"
++ $echo "$srcfile" > "$lockfile"
fi
-@@ -681,7 +746,7 @@
+
+ if test -n "$fix_srcfile_path"; then
+ eval srcfile=\"$fix_srcfile_path\"
+ fi
++ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
++ case $qsrcfile in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ qsrcfile="\"$qsrcfile\"" ;;
++ esac
+
+ $run $rm "$libobj" "${libobj}T"
+
+@@ -655,10 +847,10 @@
+ fbsd_hideous_sh_bug=$base_compile
+
+ if test "$pic_mode" != no; then
+- command="$base_compile $srcfile $pic_flag"
++ command="$base_compile $qsrcfile $pic_flag"
+ else
+ # Don't build PIC code
+- command="$base_compile $srcfile"
++ command="$base_compile $qsrcfile"
+ fi
+
+ if test ! -d "${xdir}$objdir"; then
+@@ -681,7 +873,7 @@
if $run eval "$command"; then :
else
test -n "$output_obj" && $run $rm $removelist
@@ -1936,7 +3550,7 @@
fi
if test "$need_locks" = warn &&
-@@ -701,7 +766,7 @@
+@@ -701,7 +893,7 @@
compiler."
$run $rm $removelist
@@ -1945,7 +3559,7 @@
fi
# Just move the object if needed, then go on to compile the next one
-@@ -722,7 +787,9 @@
+@@ -722,7 +914,9 @@
EOF
# Allow error messages only from the first compilation.
@@ -1956,7 +3570,19 @@
else
# No PIC object so indicate it doesn't exist in the libtool
# object file.
-@@ -751,7 +818,7 @@
+@@ -736,9 +930,9 @@
+ if test "$build_old_libs" = yes; then
+ if test "$pic_mode" != yes; then
+ # Don't build PIC code
+- command="$base_compile $srcfile"
++ command="$base_compile $qsrcfile"
+ else
+- command="$base_compile $srcfile $pic_flag"
++ command="$base_compile $qsrcfile $pic_flag"
+ fi
+ if test "$compiler_c_o" = yes; then
+ command="$command -o $obj"
+@@ -751,7 +945,7 @@
if $run eval "$command"; then :
else
$run $rm $removelist
@@ -1965,7 +3591,7 @@
fi
if test "$need_locks" = warn &&
-@@ -771,7 +838,7 @@
+@@ -771,7 +965,7 @@
compiler."
$run $rm $removelist
@@ -1974,7 +3600,7 @@
fi
# Just move the object if needed
-@@ -809,7 +876,7 @@
+@@ -809,7 +1003,7 @@
$run $rm "$lockfile"
fi
@@ -1983,7 +3609,7 @@
;;
# libtool link mode
-@@ -835,7 +902,7 @@
+@@ -835,7 +1029,7 @@
;;
esac
libtool_args="$nonopt"
@@ -1992,7 +3618,7 @@
compile_command="$nonopt"
finalize_command="$nonopt"
-@@ -847,7 +914,6 @@
+@@ -847,7 +1041,6 @@
old_convenience=
deplibs=
old_deplibs=
@@ -2000,7 +3626,7 @@
compiler_flags=
linker_flags=
dllsearchpath=
-@@ -868,6 +934,7 @@
+@@ -868,6 +1061,7 @@
no_install=no
objs=
non_pic_objects=
@@ -2008,7 +3634,7 @@
prefer_static_libs=no
preload=no
prev=
-@@ -881,6 +948,8 @@
+@@ -881,6 +1075,8 @@
vinfo=
vinfo_number=no
@@ -2017,7 +3643,7 @@
# We need to know -static, to get the right output filenames.
for arg
do
-@@ -912,7 +981,6 @@
+@@ -912,7 +1108,6 @@
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
arg="$1"
@@ -2025,7 +3651,7 @@
shift
case $arg in
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
-@@ -976,7 +1044,7 @@
+@@ -976,7 +1171,7 @@
export_symbols="$arg"
if test ! -f "$arg"; then
$echo "$modename: symbol file \`$arg' does not exist"
@@ -2034,7 +3660,7 @@
fi
prev=
continue
-@@ -991,6 +1059,11 @@
+@@ -991,6 +1186,11 @@
prev=
continue
;;
@@ -2046,7 +3672,7 @@
release)
release="-$arg"
prev=
-@@ -1023,7 +1096,7 @@
+@@ -1023,7 +1223,7 @@
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -2055,7 +3681,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1076,7 +1149,7 @@
+@@ -1076,7 +1276,7 @@
# Only an error if not doing a dry-run.
if test -z "$run"; then
$echo "$modename: \`$arg' is not a valid libtool object" 1>&2
@@ -2064,7 +3690,7 @@
else
# Dry-run case.
-@@ -1097,7 +1170,7 @@
+@@ -1097,7 +1297,7 @@
done
else
$echo "$modename: link input file \`$save_arg' does not exist"
@@ -2073,7 +3699,7 @@
fi
arg=$save_arg
prev=
-@@ -1109,7 +1182,7 @@
+@@ -1109,7 +1309,7 @@
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -2082,7 +3708,7 @@
;;
esac
if test "$prev" = rpath; then
-@@ -1149,16 +1222,8 @@
+@@ -1149,16 +1349,15 @@
finalize_command="$finalize_command $qarg"
continue
;;
@@ -2098,10 +3724,17 @@
- esac
+ shrext)
+ shrext_cmds="$arg"
++ prev=
++ continue
++ ;;
++ darwin_framework)
++ compiler_flags="$compiler_flags $arg"
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
prev=
continue
;;
-@@ -1210,7 +1275,7 @@
+@@ -1210,7 +1409,7 @@
-export-symbols | -export-symbols-regex)
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
$echo "$modename: more than one -exported-symbols argument is not allowed"
@@ -2110,7 +3743,22 @@
fi
if test "X$arg" = "X-export-symbols"; then
prev=expsyms
-@@ -1246,7 +1311,7 @@
+@@ -1220,6 +1419,14 @@
+ continue
+ ;;
+
++ -framework|-arch)
++ prev=darwin_framework
++ compiler_flags="$compiler_flags $arg"
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
++ continue
++ ;;
++
+ -inst-prefix-dir)
+ prev=inst_prefix
+ continue
+@@ -1246,7 +1453,7 @@
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
@@ -2119,7 +3767,7 @@
fi
dir="$absdir"
;;
-@@ -1276,9 +1341,6 @@
+@@ -1276,28 +1483,22 @@
# These systems don't actually have a C or math library (as such)
continue
;;
@@ -2129,8 +3777,12 @@
*-*-mingw* | *-*-os2*)
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
-@@ -1289,15 +1351,12 @@
;;
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
- deplibs="$deplibs System.ltframework"
@@ -2143,24 +3795,56 @@
- # prevent being parsed by the freebsd regexp below
- ;;
- *-*-openbsd*)
-+ *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
-@@ -1307,6 +1366,11 @@
+@@ -1307,18 +1508,36 @@
continue
;;
++ # Tru64 UNIX uses -model [arg] to determine the layout of C++
++ # classes, name mangling, and exception handling.
++ -model)
++ compile_command="$compile_command $arg"
++ compiler_flags="$compiler_flags $arg"
++ finalize_command="$finalize_command $arg"
++ prev=xcompiler
++ continue
++ ;;
++
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+ deplibs="$deplibs $arg"
++ compiler_flags="$compiler_flags $arg"
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
+ continue
+ ;;
+
-module)
module=yes
continue
-@@ -1371,6 +1435,11 @@
+ ;;
+- # gcc -m* arguments should be passed to the linker via $compiler_flags
+- # in order to pass architecture information to the linker
+- # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo
+- # but this is not reliable with gcc because gcc may use -mfoo to
+- # select a different linker, different libraries, etc, while
+- # -Wl,-mfoo simply passes -mfoo to the linker.
+- -m*)
++ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
++ # -r[0-9][0-9]* specifies the processor on the SGI compiler
++ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
++ # +DA*, +DD* enable 64-bit mode on the HP compiler
++ # -q* pass through compiler args for the IBM compiler
++ # -m* pass through architecture-specific compiler args for GCC
++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
++
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+@@ -1371,6 +1590,11 @@
+
-o) prev=output ;;
+ -precious-files-regex)
@@ -2171,7 +3855,7 @@
-release)
prev=release
continue
-@@ -1393,7 +1462,7 @@
+@@ -1393,7 +1617,7 @@
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -2180,7 +3864,7 @@
;;
esac
case "$xrpath " in
-@@ -1479,11 +1548,6 @@
+@@ -1479,11 +1703,6 @@
continue
;;
@@ -2192,7 +3876,7 @@
# Some other compiler flag.
-* | +*)
# Unknown arguments in both finalize_command and compile_command need
-@@ -1494,7 +1558,6 @@
+@@ -1494,7 +1713,6 @@
arg="\"$arg\""
;;
esac
@@ -2200,7 +3884,7 @@
;;
*.$objext)
-@@ -1522,7 +1585,7 @@
+@@ -1522,7 +1740,7 @@
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -2209,7 +3893,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1575,7 +1638,7 @@
+@@ -1575,7 +1793,7 @@
# Only an error if not doing a dry-run.
if test -z "$run"; then
$echo "$modename: \`$arg' is not a valid libtool object" 1>&2
@@ -2218,7 +3902,7 @@
else
# Dry-run case.
-@@ -1629,7 +1692,6 @@
+@@ -1629,7 +1847,6 @@
arg="\"$arg\""
;;
esac
@@ -2226,7 +3910,7 @@
;;
esac # arg
-@@ -1643,48 +1705,7 @@
+@@ -1643,48 +1860,7 @@
if test -n "$prev"; then
$echo "$modename: the \`$prevarg' option requires an argument" 1>&2
$echo "$help" 1>&2
@@ -2276,7 +3960,7 @@
fi
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1728,7 +1749,7 @@
+@@ -1728,7 +1904,7 @@
"")
$echo "$modename: you must specify an output file" 1>&2
$echo "$help" 1>&2
@@ -2285,7 +3969,7 @@
;;
*.$libext) linkmode=oldlib ;;
*.lo | *.$objext) linkmode=obj ;;
-@@ -1738,7 +1759,7 @@
+@@ -1738,7 +1914,7 @@
case $host in
*cygwin* | *mingw* | *pw32*)
@@ -2294,7 +3978,7 @@
duplicate_compiler_generated_deps=yes
;;
*)
-@@ -1791,7 +1812,7 @@
+@@ -1791,7 +1967,7 @@
*.la) ;;
*)
$echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
@@ -2303,7 +3987,7 @@
;;
esac
done
-@@ -1817,7 +1838,10 @@
+@@ -1817,7 +1993,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -2315,7 +3999,7 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -1829,18 +1853,23 @@
+@@ -1829,18 +2008,23 @@
lib=
found=no
case $deplib in
@@ -2324,7 +4008,7 @@
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
-+ deplibs="$deplib $deplibs"
++ compiler_flags="$compiler_flags $deplib"
+ fi
+ continue
+ ;;
@@ -2344,7 +4028,7 @@
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
if test -f "$lib"; then
-@@ -1901,18 +1930,6 @@
+@@ -1901,18 +2085,6 @@
fi
fi
;; # -l
@@ -2363,7 +4047,7 @@
-L*)
case $linkmode in
lib)
-@@ -1928,11 +1945,11 @@
+@@ -1928,11 +2100,11 @@
fi
if test "$pass" = scan; then
deplibs="$deplib $deplibs"
@@ -2376,7 +4060,31 @@
;;
*)
$echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-@@ -2011,14 +2028,14 @@
+@@ -1960,7 +2132,22 @@
+ fi
+ case $linkmode in
+ lib)
+- if test "$deplibs_check_method" != pass_all; then
++ valid_a_lib=no
++ case $deplibs_check_method in
++ match_pattern*)
++ set dummy $deplibs_check_method
++ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++ if eval $echo \"$deplib\" 2>/dev/null \
++ | $SED 10q \
++ | $EGREP "$match_pattern_regex" > /dev/null; then
++ valid_a_lib=yes
++ fi
++ ;;
++ pass_all)
++ valid_a_lib=yes
++ ;;
++ esac
++ if test "$valid_a_lib" != yes; then
+ $echo
+ $echo "*** Warning: Trying to link with static lib archive $deplib."
+ $echo "*** I have the capability to make that library automatically link in when"
+@@ -2011,14 +2198,14 @@
if test "$found" = yes || test -f "$lib"; then :
else
$echo "$modename: cannot find the library \`$lib'" 1>&2
@@ -2393,7 +4101,16 @@
fi
ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -2041,13 +2058,6 @@
+@@ -2034,6 +2221,8 @@
+ # it will not redefine variables installed, or shouldnotlink
+ installed=yes
+ shouldnotlink=no
++ avoidtemprpath=
++
+
+ # Read the .la file
+ case $lib in
+@@ -2041,13 +2230,6 @@
*) . ./$lib ;;
esac
@@ -2407,7 +4124,7 @@
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -2058,33 +2068,32 @@
+@@ -2058,33 +2240,32 @@
if test "$pass" = conv; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
@@ -2454,7 +4171,7 @@
# Get the name of the library we link against.
linklib=
for l in $old_library $library_names; do
-@@ -2092,16 +2101,18 @@
+@@ -2092,16 +2273,18 @@
done
if test -z "$linklib"; then
$echo "$modename: cannot find name of link library for \`$lib'" 1>&2
@@ -2476,7 +4193,31 @@
# If there is no dlname, no dlopen support or we're linking
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
-@@ -2150,7 +2161,7 @@
+@@ -2138,11 +2321,19 @@
+ dir="$libdir"
+ absdir="$libdir"
+ fi
++ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+- dir="$ladir/$objdir"
+- absdir="$abs_ladir/$objdir"
+- # Remove this search path later
+- notinst_path="$notinst_path $abs_ladir"
++ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++ dir="$ladir"
++ absdir="$abs_ladir"
++ # Remove this search path later
++ notinst_path="$notinst_path $abs_ladir"
++ else
++ dir="$ladir/$objdir"
++ absdir="$abs_ladir/$objdir"
++ # Remove this search path later
++ notinst_path="$notinst_path $abs_ladir"
++ fi
+ fi # $installed = yes
+ name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+
+@@ -2150,7 +2341,7 @@
if test "$pass" = dlpreopen; then
if test -z "$libdir"; then
$echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
@@ -2485,7 +4226,7 @@
fi
# Prefer using a static library (so that no silly _DYNAMIC symbols
# are required to link).
-@@ -2177,7 +2188,7 @@
+@@ -2177,7 +2368,7 @@
continue
fi
@@ -2494,7 +4235,22 @@
if test "$linkmode" = prog && test "$pass" != link; then
newlib_search_path="$newlib_search_path $ladir"
deplibs="$lib $deplibs"
-@@ -2264,17 +2275,18 @@
+@@ -2215,12 +2406,12 @@
+ if test -n "$library_names" &&
+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ # We need to hardcode the library path
+- if test -n "$shlibpath_var"; then
++ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ # Make sure the rpath contains only unique directories.
+ case "$temp_rpath " in
+ *" $dir "*) ;;
+ *" $absdir "*) ;;
+- *) temp_rpath="$temp_rpath $dir" ;;
++ *) temp_rpath="$temp_rpath $absdir" ;;
+ esac
+ fi
+
+@@ -2264,17 +2455,18 @@
need_relink=yes
fi
# This is a shared library
@@ -2518,7 +4274,7 @@
if test "$linkmode" = lib &&
test "$hardcode_into_libs" = yes; then
# Hardcode the library path.
-@@ -2332,9 +2344,10 @@
+@@ -2332,9 +2524,10 @@
else
$show "extracting exported symbol list from \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -2530,7 +4286,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2345,9 +2358,10 @@
+@@ -2345,9 +2538,10 @@
if test -f "$output_objdir/$newlib"; then :; else
$show "generating import library for \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -2542,7 +4298,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2370,9 +2384,9 @@
+@@ -2370,9 +2564,9 @@
case $host in
*-*-sco3.2v5* ) add_dir="-L$dir" ;;
*-*-darwin* )
@@ -2555,7 +4311,7 @@
$echo "** Warning, lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
$echo
-@@ -2380,7 +2394,7 @@
+@@ -2380,7 +2574,7 @@
$echo "** The link will probably fail, sorry"
else
add="$dir/$old_library"
@@ -2564,16 +4320,19 @@
fi
esac
elif test "$hardcode_minus_L" = no; then
-@@ -2405,7 +2419,7 @@
+@@ -2403,9 +2597,9 @@
+ add_dir="-L$dir"
+ # Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
- case "$libdir" in
+- case "$libdir" in
++ case $libdir in
[\\/]*)
- add_dir="-L$inst_prefix_dir$libdir $add_dir"
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
esac
fi
-@@ -2422,7 +2436,7 @@
+@@ -2422,7 +2616,7 @@
if test "$lib_linked" != yes; then
$echo "$modename: configuration error: unsupported hardcode properties"
@@ -2582,7 +4341,7 @@
fi
if test -n "$add_shlibpath"; then
-@@ -2465,7 +2479,8 @@
+@@ -2465,7 +2659,8 @@
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
@@ -2592,16 +4351,27 @@
add="$inst_prefix_dir$libdir/$linklib"
else
add="$libdir/$linklib"
-@@ -2477,7 +2492,7 @@
+@@ -2475,9 +2670,9 @@
+ add_dir="-L$libdir"
+ # Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
- case "$libdir" in
+- case "$libdir" in
++ case $libdir in
[\\/]*)
- add_dir="-L$inst_prefix_dir$libdir $add_dir"
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
esac
fi
-@@ -2544,9 +2559,10 @@
+@@ -2536,17 +2731,16 @@
+ fi
+ fi
+ else
+- convenience="$convenience $dir/$old_library"
+- old_convenience="$old_convenience $dir/$old_library"
+ deplibs="$dir/$old_library $deplibs"
+ link_static=yes
+ fi
fi # link shared/static library?
if test "$linkmode" = lib; then
@@ -2615,7 +4385,7 @@
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
-@@ -2560,7 +2576,7 @@
+@@ -2560,7 +2754,7 @@
esac
done
dependency_libs="$temp_deplibs"
@@ -2624,7 +4394,7 @@
newlib_search_path="$newlib_search_path $absdir"
# Link against this library
-@@ -2602,20 +2618,18 @@
+@@ -2602,20 +2796,18 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -z "$libdir"; then
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
@@ -2649,7 +4419,7 @@
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do
-@@ -2623,52 +2637,42 @@
+@@ -2623,55 +2815,45 @@
done
if test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
@@ -2711,15 +4481,21 @@
*) continue ;;
esac
case " $deplibs " in
- *" $depdepl "*) ;;
+- *" $depdepl "*) ;;
- *) deplibs="$deplibs $depdepl" ;;
- esac
+- case " $deplibs " in
+ *" $path "*) ;;
+- *) deplibs="$deplibs $path" ;;
++ *) deplibs="$path $deplibs" ;;
++ esac
++ case " $deplibs " in
++ *" $depdepl "*) ;;
+ *) deplibs="$depdepl $deplibs" ;;
-+ esac
- case " $deplibs " in
- *" $path "*) ;;
- *) deplibs="$deplibs $path" ;;
-@@ -2758,7 +2762,8 @@
+ esac
+ done
+ fi # link_all_deplibs != no
+@@ -2758,7 +2940,8 @@
eval $var=\"$tmp_libs\"
done # for var
fi
@@ -2729,7 +4505,7 @@
tmp_libs=
for i in $dependency_libs ; do
case " $predeps $postdeps $compiler_lib_search_path " in
-@@ -2818,19 +2823,19 @@
+@@ -2818,19 +3001,19 @@
case $outputname in
lib*)
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -2752,7 +4528,7 @@
eval libname=\"$libname_spec\"
else
libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2841,7 +2846,7 @@
+@@ -2841,7 +3024,7 @@
if test -n "$objs"; then
if test "$deplibs_check_method" != pass_all; then
$echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
@@ -2761,7 +4537,7 @@
else
$echo
$echo "*** Warning: Linking the shared library $output against the non-libtool"
-@@ -2889,13 +2894,13 @@
+@@ -2889,13 +3072,13 @@
if test -n "$8"; then
$echo "$modename: too many parameters to \`-version-info'" 1>&2
$echo "$help" 1>&2
@@ -2777,7 +4553,7 @@
case $vinfo_number in
yes)
number_major="$2"
-@@ -2924,6 +2929,11 @@
+@@ -2924,6 +3107,11 @@
age="$number_minor"
revision="$number_minor"
;;
@@ -2789,14 +4565,15 @@
esac
;;
no)
-@@ -2935,36 +2945,36 @@
+@@ -2935,36 +3123,36 @@
# Check that each of the things are valid numbers.
case $current in
- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
- exit 1
+ exit $EXIT_FAILURE
@@ -2807,7 +4584,8 @@
- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
- exit 1
+ exit $EXIT_FAILURE
@@ -2818,7 +4596,8 @@
- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
- exit 1
+ exit $EXIT_FAILURE
@@ -2833,7 +4612,16 @@
fi
# Calculate the version variables.
-@@ -3053,7 +3063,7 @@
+@@ -2981,7 +3169,7 @@
+ versuffix="$major.$age.$revision"
+ # Darwin ld doesn't like 0 for these options...
+ minor_current=`expr $current + 1`
+- verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++ verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ ;;
+
+ freebsd-aout)
+@@ -3053,7 +3241,7 @@
*)
$echo "$modename: unknown library version type \`$version_type'" 1>&2
$echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
@@ -2842,7 +4630,7 @@
;;
esac
-@@ -3104,9 +3114,15 @@
+@@ -3104,9 +3292,15 @@
tempremovelist=`$echo "$output_objdir/*"`
for p in $tempremovelist; do
case $p in
@@ -2859,7 +4647,7 @@
removelist="$removelist $p"
;;
*) ;;
-@@ -3143,7 +3159,7 @@
+@@ -3143,7 +3337,7 @@
*) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
@@ -2868,7 +4656,7 @@
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
-@@ -3176,17 +3192,11 @@
+@@ -3176,18 +3370,12 @@
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
@@ -2884,10 +4672,48 @@
- deplibs="$deplibs -lc"
- fi
- ;;
- *-*-openbsd* | *-*-freebsd*)
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
# Do not include libc due to us having libc/libc_r.
test "X$arg" = "X-lc" && continue
-@@ -3475,7 +3485,7 @@
+ ;;
+@@ -3237,7 +3425,7 @@
+ if test "$?" -eq 0 ; then
+ ldd_output=`ldd conftest`
+ for i in $deplibs; do
+- name="`expr $i : '-l\(.*\)'`"
++ name=`expr $i : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" -ne "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3274,7 +3462,7 @@
+ # Error occurred in the first compile. Let's try to salvage
+ # the situation: Compile a separate program for each library.
+ for i in $deplibs; do
+- name="`expr $i : '-l\(.*\)'`"
++ name=`expr $i : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ $rm conftest
+@@ -3326,7 +3514,7 @@
+ set dummy $deplibs_check_method
+ file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+- name="`expr $a_deplib : '-l\(.*\)'`"
++ name=`expr $a_deplib : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3395,7 +3583,7 @@
+ set dummy $deplibs_check_method
+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+- name="`expr $a_deplib : '-l\(.*\)'`"
++ name=`expr $a_deplib : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test -n "$name" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3475,7 +3663,7 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -2896,7 +4722,7 @@
;;
esac
-@@ -3521,13 +3531,6 @@
+@@ -3521,13 +3709,6 @@
fi
fi
fi
@@ -2910,7 +4736,7 @@
# Done checking deplibs!
deplibs=$newdeplibs
fi
-@@ -3544,7 +3547,7 @@
+@@ -3544,7 +3725,7 @@
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
@@ -2919,7 +4745,7 @@
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
-@@ -3599,7 +3602,7 @@
+@@ -3599,7 +3780,7 @@
fi
# Get the real and link names of the library.
@@ -2928,7 +4754,7 @@
eval library_names=\"$library_names_spec\"
set dummy $library_names
realname="$2"
-@@ -3629,10 +3632,11 @@
+@@ -3629,10 +3810,11 @@
$show "generating symbol list for \`$libname.la'"
export_symbols="$output_objdir/$libname.exp"
$run $rm $export_symbols
@@ -2941,7 +4767,17 @@
if len=`expr "X$cmd" : ".*"` &&
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
$show "$cmd"
-@@ -3662,12 +3666,12 @@
+@@ -3642,6 +3824,9 @@
+ # The command line is too long to execute in one step.
+ $show "using reloadable object file for export list..."
+ skipped_export=:
++ # Break out early, otherwise skipped_export may be
++ # set to false by a later but shorter cmd.
++ break
+ fi
+ done
+ IFS="$save_ifs"
+@@ -3662,12 +3847,12 @@
for test_deplib in $deplibs; do
case " $convenience " in
*" $test_deplib "*) ;;
@@ -2956,7 +4792,78 @@
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
-@@ -3746,31 +3750,26 @@
+@@ -3675,67 +3860,13 @@
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ else
+ gentop="$output_objdir/${outputname}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- for xlib in $convenience; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $convenience
++ libobjs="$libobjs $func_extract_archives_result"
+ fi
+ fi
+-
++
+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ eval flag=\"$thread_safe_flag_spec\"
+ linker_flags="$linker_flags $flag"
+@@ -3746,31 +3877,27 @@
$run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
fi
@@ -2993,11 +4900,64 @@
fi
- if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
-+ if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
++ if test "X$skipped_export" != "X:" &&
++ len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
:
else
-@@ -3871,19 +3870,28 @@
+@@ -3789,6 +3916,7 @@
+ save_libobjs=$libobjs
+ fi
+ save_output=$output
++ output_la=`$echo "X$output" | $Xsed -e "$basename"`
+
+ # Clear the reloadable object creation command queue and
+ # initialize k to one.
+@@ -3798,13 +3926,13 @@
+ delfiles=
+ last_robj=
+ k=1
+- output=$output_objdir/$save_output-${k}.$objext
++ output=$output_objdir/$output_la-${k}.$objext
+ # Loop over the list of objects to be linked.
+ for obj in $save_libobjs
+ do
+ eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+ if test "X$objlist" = X ||
+- { len=`expr "X$test_cmds" : ".*"` &&
++ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len"; }; then
+ objlist="$objlist $obj"
+ else
+@@ -3818,9 +3946,9 @@
+ # the last one created.
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ fi
+- last_robj=$output_objdir/$save_output-${k}.$objext
++ last_robj=$output_objdir/$output_la-${k}.$objext
+ k=`expr $k + 1`
+- output=$output_objdir/$save_output-${k}.$objext
++ output=$output_objdir/$output_la-${k}.$objext
+ objlist=$obj
+ len=1
+ fi
+@@ -3840,13 +3968,13 @@
+ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+ fi
+
+- # Set up a command to remove the reloadale object files
++ # Set up a command to remove the reloadable object files
+ # after they are used.
+ i=0
+ while test "$i" -lt "$k"
+ do
+ i=`expr $i + 1`
+- delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
++ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
+ done
+
+ $echo "creating a temporary reloadable object file: $output"
+@@ -3871,28 +3999,54 @@
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
@@ -3027,18 +4987,37 @@
IFS="$save_ifs"
+ eval cmd=\"$cmd\"
$show "$cmd"
- $run eval "$cmd" || exit $?
+- $run eval "$cmd" || exit $?
++ $run eval "$cmd" || {
++ lt_exit=$?
++
++ # Restore the uninstalled library and exit
++ if test "$mode" = relink; then
++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++ fi
++
++ exit $lt_exit
++ }
done
-@@ -3892,7 +3900,7 @@
+ IFS="$save_ifs"
+
# Restore the uninstalled library and exit
if test "$mode" = relink; then
$run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
- exit 0
++
++ if test -n "$convenience"; then
++ if test -z "$whole_archive_flag_spec"; then
++ $show "${rm}r $gentop"
++ $run ${rm}r "$gentop"
++ fi
++ fi
++
+ exit $EXIT_SUCCESS
fi
# Create links to the real library.
-@@ -3940,7 +3948,7 @@
+@@ -3940,7 +4094,7 @@
*.lo)
if test -n "$objs$old_deplibs"; then
$echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
@@ -3047,7 +5026,74 @@
fi
libobj="$output"
obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -4034,10 +4042,11 @@
+@@ -3969,64 +4123,10 @@
+ eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ else
+ gentop="$output_objdir/${obj}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- for xlib in $convenience; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $convenience
++ reload_conv_objs="$reload_objs $func_extract_archives_result"
+ fi
+ fi
+
+@@ -4034,10 +4134,11 @@
reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
output="$obj"
@@ -3060,7 +5106,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4050,7 +4059,7 @@
+@@ -4050,7 +4151,7 @@
$run ${rm}r $gentop
fi
@@ -3069,7 +5115,7 @@
fi
if test "$build_libtool_libs" != yes; then
-@@ -4063,17 +4072,18 @@
+@@ -4063,17 +4164,18 @@
# accidentally link it into a program.
# $show "echo timestamp > $libobj"
# $run eval "echo timestamp > $libobj" || exit $?
@@ -3090,7 +5136,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4085,7 +4095,7 @@
+@@ -4085,7 +4187,7 @@
$run ${rm}r $gentop
fi
@@ -3099,7 +5145,7 @@
;;
prog)
-@@ -4110,21 +4120,18 @@
+@@ -4110,21 +4212,18 @@
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -3124,7 +5170,51 @@
;;
esac
-@@ -4406,7 +4413,7 @@
+@@ -4289,12 +4388,12 @@
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+- export_symbols="$output_objdir/$output.exp"
++ export_symbols="$output_objdir/$outputname.exp"
+ $run $rm $export_symbols
+- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ else
+- $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++ $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ $run eval 'mv "$nlist"T "$nlist"'
+ fi
+ fi
+@@ -4346,7 +4445,26 @@
+ #endif
+
+ /* The mapping between symbol names and symbols. */
++"
++
++ case $host in
++ *cygwin* | *mingw* )
++ $echo >> "$output_objdir/$dlsyms" "\
++/* DATA imports from DLLs on WIN32 can't be const, because
++ runtime relocations are performed -- see ld's documentation
++ on pseudo-relocs */
++struct {
++"
++ ;;
++ * )
++ $echo >> "$output_objdir/$dlsyms" "\
+ const struct {
++"
++ ;;
++ esac
++
++
++ $echo >> "$output_objdir/$dlsyms" "\
+ const char *name;
+ lt_ptr address;
+ }
+@@ -4406,7 +4524,7 @@
;;
*)
$echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
@@ -3133,7 +5223,7 @@
;;
esac
else
-@@ -4419,17 +4426,6 @@
+@@ -4419,17 +4537,6 @@
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
fi
@@ -3151,7 +5241,7 @@
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-@@ -4505,7 +4501,7 @@
+@@ -4505,7 +4612,7 @@
# Link the executable and exit
$show "$link_command"
$run eval "$link_command" || exit $?
@@ -3160,7 +5250,7 @@
fi
if test "$hardcode_action" = relink; then
-@@ -4560,10 +4556,10 @@
+@@ -4560,10 +4667,10 @@
fi
# Quote $echo for shipping.
@@ -3175,14 +5265,14 @@
esac
qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
else
-@@ -4585,11 +4581,11 @@
+@@ -4585,11 +4692,11 @@
*) exeext= ;;
esac
case $host in
- *mingw* )
- cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
+ *cygwin* | *mingw* )
-+ cwrappersource=`$echo ${objdir}/lt-${output}.c`
++ cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
cwrapper=`$echo ${output}.exe`
$rm $cwrappersource $cwrapper
- trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
@@ -3190,7 +5280,7 @@
cat > $cwrappersource <<EOF
-@@ -4598,7 +4594,7 @@
+@@ -4598,7 +4705,7 @@
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -3199,7 +5289,7 @@
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
-@@ -4630,7 +4626,7 @@
+@@ -4630,7 +4737,7 @@
#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
defined (__OS2__)
#define HAVE_DOS_BASED_FILE_SYSTEM
@@ -3208,7 +5298,7 @@
#define DIR_SEPARATOR_2 '\\'
#endif
#endif
-@@ -4661,7 +4657,7 @@
+@@ -4661,7 +4768,7 @@
{
char **newargz;
int i;
@@ -3217,7 +5307,7 @@
program_name = (char *) xstrdup ((char *) basename (argv[0]));
newargz = XMALLOC(char *, argc+2);
EOF
-@@ -4674,7 +4670,7 @@
+@@ -4674,7 +4781,7 @@
newargz[1] = fnqualify(argv[0]);
/* we know the script has the same name, without the .exe */
/* so make sure newargz[1] doesn't end in .exe */
@@ -3226,7 +5316,15 @@
for (i = 1; i < argc; i++)
newargz[i+1] = xstrdup(argv[i]);
newargz[argc+1] = NULL;
-@@ -4697,7 +4693,7 @@
+@@ -4685,6 +4792,7 @@
+ EOF
+
+ cat >> $cwrappersource <<"EOF"
++ return 127;
+ }
+
+ void *
+@@ -4697,7 +4805,7 @@
return p;
}
@@ -3235,7 +5333,7 @@
xstrdup (const char *string)
{
return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-@@ -4711,7 +4707,7 @@
+@@ -4711,7 +4819,7 @@
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
/* Skip over the disk name in MSDOS pathnames. */
@@ -3244,7 +5342,7 @@
name += 2;
#endif
-@@ -4721,7 +4717,7 @@
+@@ -4721,7 +4829,7 @@
return (char *) base;
}
@@ -3253,7 +5351,7 @@
fnqualify(const char *path)
{
size_t size;
-@@ -4749,7 +4745,7 @@
+@@ -4749,7 +4857,7 @@
}
char *
@@ -3262,7 +5360,7 @@
{
size_t len, patlen;
-@@ -4769,7 +4765,7 @@
+@@ -4769,7 +4877,7 @@
}
static void
@@ -3271,7 +5369,7 @@
const char * message, va_list ap)
{
fprintf (stderr, "%s: %s: ", program_name, mode);
-@@ -4798,7 +4794,7 @@
+@@ -4798,7 +4906,7 @@
;;
esac
$rm $output
@@ -3280,7 +5378,16 @@
$echo > $output "\
#! $SHELL
-@@ -4898,7 +4894,7 @@
+@@ -4819,7 +4927,7 @@
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ relink_command=\"$relink_command\"
+
+@@ -4898,7 +5006,7 @@
else
$echo \"\$relink_command_output\" >&2
$rm \"\$progdir/\$file\"
@@ -3289,7 +5396,13 @@
fi
fi
-@@ -4953,29 +4949,27 @@
+@@ -4948,34 +5056,32 @@
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2*)
+ $echo >> $output "\
+- exec \$progdir\\\\\$program \${1+\"\$@\"}
++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+ "
;;
*)
@@ -3297,7 +5410,7 @@
- # computed within libtool.
$echo >> $output "\
- LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"}
-+ exec \$progdir/\$program \${1+\"\$@\"}
++ exec \"\$progdir/\$program\" \${1+\"\$@\"}
"
;;
esac
@@ -3308,7 +5421,8 @@
fi
else
# The program doesn't exist.
- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
++ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
\$echo \"This script is just a wrapper for \$program.\" 1>&2
$echo \"See the $PACKAGE documentation for more information.\" 1>&2
- exit 1
@@ -3323,8 +5437,71 @@
;;
esac
-@@ -5059,17 +5053,15 @@
- done
+@@ -4998,78 +5104,78 @@
+
+ if test -n "$addlibs"; then
+ gentop="$output_objdir/${outputname}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- # Add in members from convenience archives.
+- for xlib in $addlibs; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $addlibs
++ oldobjs="$oldobjs $func_extract_archives_result"
fi
- compiler_flags="$compiler_flags $add_flags"
@@ -3334,6 +5511,63 @@
- eval cmds=\"$old_archive_from_new_cmds\"
+ cmds=$old_archive_from_new_cmds
else
++ # POSIX demands no paths to be encoded in archives. We have
++ # to avoid creating archives with duplicate basenames if we
++ # might have to extract them afterwards, e.g., when creating a
++ # static archive out of a convenience library, or when linking
++ # the entirety of a libtool archive into another (currently
++ # not supported by libtool).
++ if (for obj in $oldobjs
++ do
++ $echo "X$obj" | $Xsed -e 's%^.*/%%'
++ done | sort | sort -uc >/dev/null 2>&1); then
++ :
++ else
++ $echo "copying selected object files to avoid basename conflicts..."
++
++ if test -z "$gentop"; then
++ gentop="$output_objdir/${outputname}x"
++ generated="$generated $gentop"
++
++ $show "${rm}r $gentop"
++ $run ${rm}r "$gentop"
++ $show "$mkdir $gentop"
++ $run $mkdir "$gentop"
++ status=$?
++ if test "$status" -ne 0 && test ! -d "$gentop"; then
++ exit $status
++ fi
++ fi
++
++ save_oldobjs=$oldobjs
++ oldobjs=
++ counter=1
++ for obj in $save_oldobjs
++ do
++ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++ case " $oldobjs " in
++ " ") oldobjs=$obj ;;
++ *[\ /]"$objbase "*)
++ while :; do
++ # Make sure we don't pick an alternate name that also
++ # overlaps.
++ newobj=lt$counter-$objbase
++ counter=`expr $counter + 1`
++ case " $oldobjs " in
++ *[\ /]"$newobj "*) ;;
++ *) if test ! -f "$gentop/$newobj"; then break; fi ;;
++ esac
++ done
++ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
++ $run ln "$obj" "$gentop/$newobj" ||
++ $run cp "$obj" "$gentop/$newobj"
++ oldobjs="$oldobjs $gentop/$newobj"
++ ;;
++ *) oldobjs="$oldobjs $obj" ;;
++ esac
++ done
++ fi
++
eval cmds=\"$old_archive_cmds\"
if len=`expr "X$cmds" : ".*"` &&
@@ -3343,7 +5577,26 @@
else
# the command line is too long to link in one step, link in parts
$echo "using piecewise archive linking..."
-@@ -5096,7 +5088,7 @@
+@@ -5078,31 +5184,18 @@
+ objlist=
+ concat_cmds=
+ save_oldobjs=$oldobjs
+- # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+- # encoded into archives. This makes 'ar r' malfunction in
+- # this piecewise linking case whenever conflicting object
+- # names appear in distinct ar calls; check, warn and compensate.
+- if (for obj in $save_oldobjs
+- do
+- $echo "X$obj" | $Xsed -e 's%^.*/%%'
+- done | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+- $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+- AR_FLAGS=cq
+- fi
++
+ # Is there a better way of finding the last object in the list?
for obj in $save_oldobjs
do
last_oldobj=$obj
@@ -3352,7 +5605,14 @@
for obj in $save_oldobjs
do
oldobjs="$objlist $obj"
-@@ -5110,7 +5102,7 @@
+ objlist="$objlist $obj"
+ eval test_cmds=\"$old_archive_cmds\"
+- if len=`expr "X$test_cmds" : ".*"` &&
++ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len"; then
+ :
+ else
+@@ -5110,7 +5203,7 @@
oldobjs=$objlist
if test "$obj" = "$last_oldobj" ; then
RANLIB=$save_RANLIB
@@ -3361,7 +5621,7 @@
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
objlist=
-@@ -5121,12 +5113,13 @@
+@@ -5121,12 +5214,13 @@
if test "X$oldobjs" = "X" ; then
eval cmds=\"\$concat_cmds\"
else
@@ -3376,7 +5636,7 @@
IFS="$save_ifs"
$show "$cmd"
$run eval "$cmd" || exit $?
-@@ -5158,11 +5151,13 @@
+@@ -5158,11 +5252,13 @@
fi
done
# Quote the link command for shipping.
@@ -3393,7 +5653,7 @@
# Only create the output if not a dry run.
if test -z "$run"; then
for installed in no yes; do
-@@ -5180,7 +5175,7 @@
+@@ -5180,7 +5276,7 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -z "$libdir"; then
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
@@ -3402,7 +5662,7 @@
fi
newdependency_libs="$newdependency_libs $libdir/$name"
;;
-@@ -5194,7 +5189,7 @@
+@@ -5194,7 +5290,7 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
if test -z "$libdir"; then
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
@@ -3411,7 +5671,7 @@
fi
newdlfiles="$newdlfiles $libdir/$name"
done
-@@ -5205,11 +5200,30 @@
+@@ -5205,11 +5301,30 @@
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
if test -z "$libdir"; then
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
@@ -3443,7 +5703,7 @@
fi
$rm $output
# place dlname in correct position for cygwin
-@@ -5253,7 +5267,7 @@
+@@ -5253,7 +5368,7 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
@@ -3452,7 +5712,7 @@
$echo >> $output "\
relink_command=\"$relink_command\""
fi
-@@ -5266,7 +5280,7 @@
+@@ -5266,7 +5381,7 @@
$run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
;;
esac
@@ -3461,7 +5721,87 @@
;;
# libtool install mode
-@@ -5355,13 +5369,13 @@
+@@ -5277,11 +5392,11 @@
+ # install_prog (especially on Windows NT).
+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ # Allow the use of GNU shtool's install command.
+- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
++ $echo "X$nonopt" | grep shtool > /dev/null; then
+ # Aesthetically quote it.
+ arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5290,14 +5405,14 @@
+ shift
+ else
+ install_prog=
+- arg="$nonopt"
++ arg=$nonopt
+ fi
+
+ # The real first argument should be the name of the installation program.
+ # Aesthetically quote it.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5315,28 +5430,31 @@
+ do
+ if test -n "$dest"; then
+ files="$files $dest"
+- dest="$arg"
++ dest=$arg
+ continue
+ fi
+
+ case $arg in
+ -d) isdir=yes ;;
+- -f) prev="-f" ;;
+- -g) prev="-g" ;;
+- -m) prev="-m" ;;
+- -o) prev="-o" ;;
++ -f)
++ case " $install_prog " in
++ *[\\\ /]cp\ *) ;;
++ *) prev=$arg ;;
++ esac
++ ;;
++ -g | -m | -o) prev=$arg ;;
+ -s)
+ stripme=" -s"
+ continue
+ ;;
+- -*) ;;
+-
++ -*)
++ ;;
+ *)
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
+ prev=
+ else
+- dest="$arg"
++ dest=$arg
+ continue
+ fi
+ ;;
+@@ -5345,7 +5463,7 @@
+ # Aesthetically quote the argument.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5355,13 +5473,13 @@
if test -z "$install_prog"; then
$echo "$modename: you must specify an install program" 1>&2
$echo "$help" 1>&2
@@ -3477,7 +5817,7 @@
fi
if test -z "$files"; then
-@@ -5371,7 +5385,7 @@
+@@ -5371,7 +5489,7 @@
$echo "$modename: you must specify a destination" 1>&2
fi
$echo "$help" 1>&2
@@ -3486,7 +5826,7 @@
fi
# Strip any trailing slash from the destination.
-@@ -5392,7 +5406,7 @@
+@@ -5392,7 +5510,7 @@
if test "$#" -gt 2; then
$echo "$modename: \`$dest' is not a directory" 1>&2
$echo "$help" 1>&2
@@ -3495,7 +5835,7 @@
fi
fi
case $destdir in
-@@ -5404,7 +5418,7 @@
+@@ -5404,7 +5522,7 @@
*)
$echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
$echo "$help" 1>&2
@@ -3504,7 +5844,7 @@
;;
esac
done
-@@ -5433,7 +5447,7 @@
+@@ -5433,7 +5551,7 @@
else
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -3513,7 +5853,7 @@
fi
library_names=
-@@ -5475,7 +5489,7 @@
+@@ -5475,7 +5593,7 @@
# but it's something to keep an eye on.
if test "$inst_prefix_dir" = "$destdir"; then
$echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
@@ -3522,7 +5862,7 @@
fi
if test -n "$inst_prefix_dir"; then
-@@ -5490,7 +5504,7 @@
+@@ -5490,7 +5608,7 @@
if $run eval "$relink_command"; then :
else
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
@@ -3531,8 +5871,24 @@
fi
fi
-@@ -5525,10 +5539,11 @@
+@@ -5514,23 +5632,36 @@
+ if test "$#" -gt 0; then
+ # Delete the old symlinks, and create new ones.
++ # Try `ln -sf' first, because the `ln' binary might depend on
++ # the symlink we replace! Solaris /bin/ln does not understand -f,
++ # so we also need to try rm && ln -s.
+ for linkname
+ do
+ if test "$linkname" != "$realname"; then
+- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
++ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+ fi
+ done
+ fi
+
# Do each command in the postinstall commands.
lib="$destdir/$realname"
- eval cmds=\"$postinstall_cmds\"
@@ -3542,9 +5898,21 @@
IFS="$save_ifs"
+ eval cmd=\"$cmd\"
$show "$cmd"
- $run eval "$cmd" || exit $?
+- $run eval "$cmd" || exit $?
++ $run eval "$cmd" || {
++ lt_exit=$?
++
++ # Restore the uninstalled library and exit
++ if test "$mode" = relink; then
++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++ fi
++
++ exit $lt_exit
++ }
done
-@@ -5568,7 +5583,7 @@
+ IFS="$save_ifs"
+ fi
+@@ -5568,7 +5699,7 @@
*)
$echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
$echo "$help" 1>&2
@@ -3553,7 +5921,7 @@
;;
esac
-@@ -5586,7 +5601,7 @@
+@@ -5586,7 +5717,7 @@
$show "$install_prog $staticobj $staticdest"
$run eval "$install_prog \$staticobj \$staticdest" || exit $?
fi
@@ -3562,7 +5930,31 @@
;;
*)
-@@ -5640,7 +5655,7 @@
+@@ -5624,23 +5755,21 @@
+ notinst_deplibs=
+ relink_command=
+
+- # To insure that "foo" is sourced, and not "foo.exe",
+- # finese the cygwin/MSYS system by explicitly sourcing "foo."
+- # which disallows the automatic-append-.exe behavior.
+- case $build in
+- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+- *) wrapperdot=${wrapper} ;;
+- esac
++ # Note that it is not necessary on cygwin/mingw to append a dot to
++ # foo even if both foo and FILE.exe exist: automatic-append-.exe
++ # behavior happens only for exec(3), not for open(2)! Also, sourcing
++ # `FILE.' does not work on cygwin managed mounts.
++ #
+ # If there is no directory component, then add one.
+- case $file in
+- */* | *\\*) . ${wrapperdot} ;;
+- *) . ./${wrapperdot} ;;
++ case $wrapper in
++ */* | *\\*) . ${wrapper} ;;
++ *) . ./${wrapper} ;;
+ esac
+
# Check the variables that should have been set.
if test -z "$notinst_deplibs"; then
$echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
@@ -3571,7 +5963,33 @@
fi
finalize=yes
-@@ -5681,8 +5696,12 @@
+@@ -5662,17 +5791,15 @@
+ done
+
+ relink_command=
+- # To insure that "foo" is sourced, and not "foo.exe",
+- # finese the cygwin/MSYS system by explicitly sourcing "foo."
+- # which disallows the automatic-append-.exe behavior.
+- case $build in
+- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+- *) wrapperdot=${wrapper} ;;
+- esac
++ # Note that it is not necessary on cygwin/mingw to append a dot to
++ # foo even if both foo and FILE.exe exist: automatic-append-.exe
++ # behavior happens only for exec(3), not for open(2)! Also, sourcing
++ # `FILE.' does not work on cygwin managed mounts.
++ #
+ # If there is no directory component, then add one.
+- case $file in
+- */* | *\\*) . ${wrapperdot} ;;
+- *) . ./${wrapperdot} ;;
++ case $wrapper in
++ */* | *\\*) . ${wrapper} ;;
++ *) . ./${wrapper} ;;
+ esac
+
+ outputname=
+@@ -5681,8 +5808,12 @@
tmpdir="/tmp"
test -n "$TMPDIR" && tmpdir="$TMPDIR"
tmpdir="$tmpdir/libtool-$$"
@@ -3585,7 +6003,16 @@
$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
continue
fi
-@@ -5741,16 +5760,17 @@
+@@ -5709,7 +5840,7 @@
+ fi
+
+ # remove .exe since cygwin /usr/bin/install will append another
+- # one anyways
++ # one anyway
+ case $install_prog,$host in
+ */usr/bin/install*,*cygwin*)
+ case $file:$destfile in
+@@ -5741,16 +5872,17 @@
$show "$install_prog $file $oldlib"
$run eval "$install_prog \$file \$oldlib" || exit $?
@@ -3605,7 +6032,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -5764,9 +5784,9 @@
+@@ -5764,9 +5896,9 @@
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
test -n "$run" && current_libdirs=" -n$current_libdirs"
@@ -3617,7 +6044,7 @@
fi
;;
-@@ -5785,10 +5805,11 @@
+@@ -5785,10 +5917,11 @@
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
@@ -3630,7 +6057,7 @@
$show "$cmd"
$run eval "$cmd" || admincmds="$admincmds
$cmd"
-@@ -5805,7 +5826,7 @@
+@@ -5805,7 +5938,7 @@
fi
# Exit here if they wanted silent mode.
@@ -3639,7 +6066,7 @@
$echo "----------------------------------------------------------------------"
$echo "Libraries have been installed in:"
-@@ -5841,7 +5862,7 @@
+@@ -5841,7 +5974,7 @@
$echo "See any operating system documentation about shared libraries for"
$echo "more information, such as the ld(1) and ld.so(8) manual pages."
$echo "----------------------------------------------------------------------"
@@ -3648,7 +6075,7 @@
;;
# libtool execute mode
-@@ -5853,7 +5874,7 @@
+@@ -5853,7 +5986,7 @@
if test -z "$cmd"; then
$echo "$modename: you must specify a COMMAND" 1>&2
$echo "$help"
@@ -3657,7 +6084,7 @@
fi
# Handle -dlopen flags immediately.
-@@ -5861,7 +5882,7 @@
+@@ -5861,7 +5994,7 @@
if test ! -f "$file"; then
$echo "$modename: \`$file' is not a file" 1>&2
$echo "$help" 1>&2
@@ -3666,7 +6093,7 @@
fi
dir=
-@@ -5872,7 +5893,7 @@
+@@ -5872,7 +6005,7 @@
else
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -3675,7 +6102,7 @@
fi
# Read the libtool library.
-@@ -5899,7 +5920,7 @@
+@@ -5899,7 +6032,7 @@
dir="$dir/$objdir"
else
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
@@ -3684,7 +6111,7 @@
fi
;;
-@@ -5979,7 +6000,7 @@
+@@ -5979,7 +6112,7 @@
$echo "export $shlibpath_var"
fi
$echo "$cmd$args"
@@ -3693,7 +6120,7 @@
fi
;;
-@@ -6007,7 +6028,7 @@
+@@ -6007,7 +6140,7 @@
if test -z "$rm"; then
$echo "$modename: you must specify an RM program" 1>&2
$echo "$help" 1>&2
@@ -3702,7 +6129,7 @@
fi
rmdirs=
-@@ -6062,10 +6083,11 @@
+@@ -6062,10 +6195,11 @@
if test "$mode" = uninstall; then
if test -n "$library_names"; then
# Do each command in the postuninstall commands.
@@ -3715,7 +6142,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6077,10 +6099,11 @@
+@@ -6077,10 +6211,11 @@
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
@@ -3728,7 +6155,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6119,7 +6142,7 @@
+@@ -6119,7 +6254,7 @@
if test "$mode" = clean ; then
noexename=$name
case $file in
@@ -3737,7 +6164,7 @@
file=`$echo $file|${SED} 's,.exe$,,'`
noexename=`$echo $name|${SED} 's,.exe$,,'`
# $file with .exe has already been added to rmfiles,
-@@ -6164,20 +6187,20 @@
+@@ -6164,20 +6299,20 @@
"")
$echo "$modename: you must specify a MODE" 1>&2
$echo "$generic_help" 1>&2
@@ -3761,7 +6188,7 @@
fi
# We need to display help for each of the modes.
-@@ -6213,7 +6236,7 @@
+@@ -6213,7 +6348,7 @@
a more detailed description of MODE.
Report bugs to <bug-libtool at gnu.org>."
@@ -3770,7 +6197,7 @@
;;
clean)
-@@ -6325,6 +6348,8 @@
+@@ -6325,6 +6460,8 @@
-no-undefined declare that a library does not refer to external symbols
-o OUTPUT-FILE create OUTPUT-FILE from the specified objects
-objectlist FILE Use a list of object files found in FILE to specify objects
@@ -3779,7 +6206,7 @@
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
-@@ -6366,14 +6391,14 @@
+@@ -6366,14 +6503,14 @@
*)
$echo "$modename: invalid operation mode \`$mode'" 1>&2
$echo "$help" 1>&2
@@ -3792,7 +6219,7 @@
$echo "Try \`$modename --help' for more information about other modes."
-exit 0
-+exit $EXIT_SUCCESS
++exit $?
# The TAGs below are defined such that we never get into a situation
# in which we disable both kinds of libraries. Given conflicting
More information about the pkg-kde-commits
mailing list