Update to KDE 3.5.5 / KOffice 1.6.1

Approved by:	portmgr

10 files changed, 802 insertions, 450 deletions

diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 357dd2077af..89b184a3bdc 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -35,7 +35,9 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 CONFIGURE_ARGS+=--with-db-include-dir=${LOCALBASE}/include/db4 \
 		--with-db-lib-dir=${LOCALBASE}/lib --with-db-name=db4 \
 		--with-apr-config=${LOCALBASE}/bin/apr-1-config \
-		--with-apu-config=${LOCALBASE}/bin/apu-1-config
+		--with-apu-config=${LOCALBASE}/bin/apu-1-config \
+		--with-svn-include=${LOCALBASE}/include \
+		--with-svn-lib=${LOCALBASE}/lib
 
 MAN1=		cervisia.1 cvsblame.1 cvscheck.1 cvsversion.1 includemocs.1 kde-build.1 kdesvn-build.1 noncvslist.1
 
diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo
index e7b1e72619e..386f9cf1ea1 100644
--- a/devel/kdesdk3/distinfo
+++ b/devel/kdesdk3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdesdk-3.5.4.tar.bz2) = 2150e6a4ce5e42886a4afc6c0198c30c
-SHA256 (KDE/kdesdk-3.5.4.tar.bz2) = 62f244c0cdb33b8d80c17406de97589cfd4d314d81c5a7d80f3699722d0a5e2d
-SIZE (KDE/kdesdk-3.5.4.tar.bz2) = 4973943
+MD5 (KDE/kdesdk-3.5.5.tar.bz2) = d226bf07bf8106f37b4e9e31a7d451f0
+SHA256 (KDE/kdesdk-3.5.5.tar.bz2) = fedd1631c2e139d27450dc51ab5aa3e9e46f5d5c0c030992818b9c37058678cd
+SIZE (KDE/kdesdk-3.5.5.tar.bz2) = 5043560
diff --git a/devel/kdesdk3/pkg-plist b/devel/kdesdk3/pkg-plist
index 04f3d4a2935..061e86c3a5b 100644
--- a/devel/kdesdk3/pkg-plist
+++ b/devel/kdesdk3/pkg-plist
@@ -74,6 +74,7 @@ bin/svnrevertlast
 bin/svnversions
 bin/swappo
 bin/transxx
+bin/umbodoc
 bin/umbrello
 bin/xml2pot
 bin/zonetab2pot.py
@@ -554,6 +555,8 @@ share/apps/konqueror/servicemenus/subversion_toplevel.desktop
 share/apps/kstyle/themes/scheck.themerc
 share/apps/kuiviewer/kuiviewerui.rc
 share/apps/kuiviewerpart/kuiviewer_part.rc
+share/apps/umbrello/common.ent
+share/apps/umbrello/docbook2xhtml.xsl
 share/apps/umbrello/headings/heading.adb
 share/apps/umbrello/headings/heading.ads
 share/apps/umbrello/headings/heading.as
@@ -677,6 +680,8 @@ share/apps/umbrello/pics/uniassociation.png
 share/apps/umbrello/pics/usecase.png
 share/apps/umbrello/tips
 share/apps/umbrello/umbrelloui.rc
+share/apps/umbrello/xmi.css
+share/apps/umbrello/xmi2docbook.xsl
 share/config.kcfg/cervisiapart.kcfg
 share/config.kcfg/kbabel.kcfg
 share/config.kcfg/kbprojectsettings.kcfg
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 357dd2077af..89b184a3bdc 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -35,7 +35,9 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 CONFIGURE_ARGS+=--with-db-include-dir=${LOCALBASE}/include/db4 \
 		--with-db-lib-dir=${LOCALBASE}/lib --with-db-name=db4 \
 		--with-apr-config=${LOCALBASE}/bin/apr-1-config \
-		--with-apu-config=${LOCALBASE}/bin/apu-1-config
+		--with-apu-config=${LOCALBASE}/bin/apu-1-config \
+		--with-svn-include=${LOCALBASE}/include \
+		--with-svn-lib=${LOCALBASE}/lib
 
 MAN1=		cervisia.1 cvsblame.1 cvscheck.1 cvsversion.1 includemocs.1 kde-build.1 kdesvn-build.1 noncvslist.1
 
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index e7b1e72619e..386f9cf1ea1 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdesdk-3.5.4.tar.bz2) = 2150e6a4ce5e42886a4afc6c0198c30c
-SHA256 (KDE/kdesdk-3.5.4.tar.bz2) = 62f244c0cdb33b8d80c17406de97589cfd4d314d81c5a7d80f3699722d0a5e2d
-SIZE (KDE/kdesdk-3.5.4.tar.bz2) = 4973943
+MD5 (KDE/kdesdk-3.5.5.tar.bz2) = d226bf07bf8106f37b4e9e31a7d451f0
+SHA256 (KDE/kdesdk-3.5.5.tar.bz2) = fedd1631c2e139d27450dc51ab5aa3e9e46f5d5c0c030992818b9c37058678cd
+SIZE (KDE/kdesdk-3.5.5.tar.bz2) = 5043560
diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/pkg-plist
index 04f3d4a2935..061e86c3a5b 100644
--- a/devel/kdesdk4/pkg-plist
+++ b/devel/kdesdk4/pkg-plist
@@ -74,6 +74,7 @@ bin/svnrevertlast
 bin/svnversions
 bin/swappo
 bin/transxx
+bin/umbodoc
 bin/umbrello
 bin/xml2pot
 bin/zonetab2pot.py
@@ -554,6 +555,8 @@ share/apps/konqueror/servicemenus/subversion_toplevel.desktop
 share/apps/kstyle/themes/scheck.themerc
 share/apps/kuiviewer/kuiviewerui.rc
 share/apps/kuiviewerpart/kuiviewer_part.rc
+share/apps/umbrello/common.ent
+share/apps/umbrello/docbook2xhtml.xsl
 share/apps/umbrello/headings/heading.adb
 share/apps/umbrello/headings/heading.ads
 share/apps/umbrello/headings/heading.as
@@ -677,6 +680,8 @@ share/apps/umbrello/pics/uniassociation.png
 share/apps/umbrello/pics/usecase.png
 share/apps/umbrello/tips
 share/apps/umbrello/umbrelloui.rc
+share/apps/umbrello/xmi.css
+share/apps/umbrello/xmi2docbook.xsl
 share/config.kcfg/cervisiapart.kcfg
 share/config.kcfg/kbabel.kcfg
 share/config.kcfg/kbprojectsettings.kcfg
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 290ddd4af77..ec320a34c20 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdevelop
-PORTVERSION=	3.3.4
+PORTVERSION=	3.3.5
 CATEGORIES?=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${KDE_VERSION:S/.0//}/src
diff --git a/devel/kdevelop/distinfo b/devel/kdevelop/distinfo
index e039cbede87..e7eb377af79 100644
--- a/devel/kdevelop/distinfo
+++ b/devel/kdevelop/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdevelop-3.3.4.tar.bz2) = e5278e37468bda7fdf6d019f84aeed16
-SHA256 (KDE/kdevelop-3.3.4.tar.bz2) = 808f51aa8084f5aed45ecfef1362624d7fa1a9bbe4b4d6160e2d40f1a4b1ab94
-SIZE (KDE/kdevelop-3.3.4.tar.bz2) = 8148258
+MD5 (KDE/kdevelop-3.3.5.tar.bz2) = e1bb5566c79022c20d534efae386cfa2
+SHA256 (KDE/kdevelop-3.3.5.tar.bz2) = b92ca82e9b0547251d11a647e01578e3f641e0ea2069d07172885e1035406d29
+SIZE (KDE/kdevelop-3.3.5.tar.bz2) = 8178575
diff --git a/devel/kdevelop/files/patch-appwizard-libtool b/devel/kdevelop/files/patch-appwizard-libtool
index fd90c498b01..99a3a09bf55 100644
--- a/devel/kdevelop/files/patch-appwizard-libtool
+++ b/devel/kdevelop/files/patch-appwizard-libtool
@@ -1,5 +1,5 @@
---- parts/appwizard/common/admin/libtool.m4.in.orig	Mon Jun 19 18:09:34 2006
-+++ parts/appwizard/common/admin/libtool.m4.in	Mon Jun 19 18:09:36 2006
+--- parts/appwizard/common/admin/libtool.m4.in	Sun Oct  1 19:29:11 2006
++++ parts/appwizard/common/admin/libtool.m4.in	Sun Dec 18 22:53:17 2005
 @@ -1,28 +1,13 @@
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -19,7 +19,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., 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
@@ -570,7 +570,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
@@ -894,7 +894,7 @@
  ])# AC_PROG_LD_RELOAD_FLAG
  
  
-@@ -2088,40 +2281,36 @@
+@@ -2088,44 +2281,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -905,16 +905,18 @@
    lt_cv_file_magic_test_file=/shlib/libc.so
    ;;
  
--cygwin* | mingw* | pw32*)
--  # win32_libid is a shell function defined in ltmain.sh
-+cygwin*)
+ cygwin*)
+-  lt_cv_deplibs_check_method=pass_all
 +  # func_win32_libid is a shell function defined in ltmain.sh
-   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
--  lt_cv_file_magic_cmd='win32_libid'
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 +  lt_cv_file_magic_cmd='func_win32_libid'
-+  ;;
+   ;;
+-  
 +
-+mingw* | pw32*)
+ mingw* | pw32*)
+-  # win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+-  lt_cv_file_magic_cmd='win32_libid'
 +  # Base MSYS/MinGW do not provide the 'file' command needed by
 +  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
 +  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
@@ -936,7 +938,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
--freebsd*)
+-freebsd* | kfreebsd*-gnu)
 +freebsd* | kfreebsd*-gnu | dragonfly*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
@@ -948,7 +950,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -2137,7 +2326,7 @@
+@@ -2141,7 +2326,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -957,7 +959,7 @@
    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
-@@ -2153,40 +2342,24 @@
+@@ -2157,40 +2342,24 @@
    esac
    ;;
  
@@ -1009,7 +1011,7 @@
    ;;
  
  netbsd*)
-@@ -2208,32 +2381,22 @@
+@@ -2212,32 +2381,22 @@
    ;;
  
  openbsd*)
@@ -1045,7 +1047,7 @@
    case $host_vendor in
    motorola)
      lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -2254,10 +2417,13 @@
+@@ -2258,10 +2417,13 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -1060,7 +1062,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  esac
-@@ -2277,36 +2443,43 @@
+@@ -2281,36 +2443,43 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -1128,7 +1130,7 @@
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi])
  NM="$lt_cv_path_NM"
-@@ -2338,13 +2511,13 @@
+@@ -2342,13 +2511,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl convenience library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -1149,7 +1151,7 @@
  AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
    case $enable_ltdl_convenience in
-@@ -2363,13 +2536,13 @@
+@@ -2367,13 +2536,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl installable library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -1170,7 +1172,7 @@
  # 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
-@@ -2407,10 +2580,21 @@
+@@ -2411,10 +2580,21 @@
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -1193,7 +1195,7 @@
  
  # AC_LIBTOOL_F77
  # --------------
-@@ -2450,7 +2634,7 @@
+@@ -2454,7 +2634,7 @@
  
  
  # AC_LIBTOOL_RC
@@ -1202,7 +1204,7 @@
  # enable support for Windows resource files
  AC_DEFUN([AC_LIBTOOL_RC],
  [AC_REQUIRE([LT_AC_PROG_RC])
-@@ -2483,36 +2667,9 @@
+@@ -2487,36 +2667,9 @@
  
  _LT_AC_SYS_COMPILER
  
@@ -1242,7 +1244,7 @@
  
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
-@@ -2526,9 +2683,9 @@
+@@ -2530,9 +2683,9 @@
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
  AC_LIBTOOL_SYS_LIB_STRIP
@@ -1254,7 +1256,7 @@
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
  
-@@ -2537,7 +2694,7 @@
+@@ -2541,7 +2694,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -1263,7 +1265,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -2546,37 +2703,11 @@
+@@ -2550,48 +2703,11 @@
    fi
    ;;
  
@@ -1278,18 +1280,29 @@
 -    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 -    case "$host_os" in
 -    rhapsody* | darwin1.[[012]])
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
 -      ;;
 -    *) # Darwin 1.3 on
--      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+-      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
 -    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'
+-    _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'
 -    # 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 $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(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(hardcode_direct, $1)=no
 -    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
 -    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -1303,7 +1316,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -2601,7 +2732,7 @@
+@@ -2616,7 +2732,7 @@
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
@@ -1312,7 +1325,7 @@
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -2613,6 +2744,7 @@
+@@ -2628,6 +2744,7 @@
  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
@@ -1320,7 +1333,7 @@
  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
  _LT_AC_TAGVAR(module_cmds, $1)=
  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-@@ -2630,7 +2762,7 @@
+@@ -2645,7 +2762,7 @@
  _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
  
  # Source file extension for C++ test sources.
@@ -1329,7 +1342,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -2640,11 +2772,15 @@
+@@ -2655,11 +2772,15 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -1346,7 +1359,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -2655,18 +2791,18 @@
+@@ -2670,18 +2791,18 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -1368,7 +1381,27 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -2741,8 +2877,23 @@
+@@ -2699,8 +2820,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
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $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 -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $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'
+@@ -2726,7 +2847,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.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+   fi
+ 
+   # Commands to make compiler produce verbose output that lists
+@@ -2756,8 +2877,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -1394,7 +1427,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -2759,7 +2910,7 @@
+@@ -2774,7 +2910,7 @@
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
      if test "$GXX" = yes; then
@@ -1403,7 +1436,7 @@
        # 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`
-@@ -2778,8 +2929,12 @@
+@@ -2793,8 +2929,12 @@
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	fi
@@ -1416,7 +1449,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -2788,15 +2943,16 @@
+@@ -2803,15 +2943,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -1437,23 +1470,23 @@
      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.
-@@ -2805,13 +2961,12 @@
+@@ -2820,13 +2961,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
--      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 +      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
        if test "$host_cpu" = ia64; then
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -2820,16 +2975,26 @@
+@@ -2835,16 +2975,26 @@
  	# -berok will link without error, but may produce a broken library.
  	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -1464,7 +1497,7 @@
 +	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
 -	# 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 $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-	_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 ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
        fi
@@ -1485,20 +1518,26 @@
    chorus*)
      case $cc_basename in
        *)
-@@ -2848,7 +3013,7 @@
+@@ -2858,12 +3008,12 @@
+     # _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'
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++    _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
  
      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
 +      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
        # 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
-@@ -2857,59 +3022,81 @@
+@@ -2872,70 +3022,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
--      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-      $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
 +      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
      else
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -1536,10 +1575,26 @@
 -    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 -    case "$host_os" in
 -    rhapsody* | darwin1.[[012]])
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
 -      ;;
 -    *) # Darwin 1.3 on
--      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+-      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
++    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
 -      ;;
 -    esac
 -    lt_int_apple_cc_single_mod=no
@@ -1548,19 +1603,19 @@
 -      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'
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
 -    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 $deplibs $compiler_flags -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 $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
 -    fi
--    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
 -
 -    # 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 $libobjs $deplibs $compiler_flags -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 $compiler_flags $libobjs $deplibs -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 ${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}'
+-      _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}'
 -    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}'
+-    _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(hardcode_direct, $1)=no
 -    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
 -    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -1570,12 +1625,6 @@
 -    _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -  fi
 -    ;;
-+    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
@@ -1618,7 +1667,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -2920,14 +3107,14 @@
+@@ -2946,14 +3107,14 @@
  	;;
      esac
      ;;
@@ -1630,12 +1679,12 @@
    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
-@@ -2944,11 +3131,11 @@
+@@ -2970,12 +3131,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -1645,11 +1694,13 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
 -    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'
++      _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
-@@ -2958,7 +3145,7 @@
+       # linking a shared library.
+@@ -2984,11 +3145,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.
@@ -1658,7 +1709,12 @@
        ;;
      *)
        if test "$GXX" = yes; then
-@@ -2972,33 +3159,22 @@
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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'
+       else
+         # FIXME: insert proper C++ library support
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2998,33 +3159,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -1699,7 +1755,7 @@
        ;;
      *)
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -3009,14 +3185,17 @@
+@@ -3035,17 +3185,20 @@
      esac
  
      case $cc_basename in
@@ -1721,8 +1777,12 @@
 +	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  	  ;;
  	*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-@@ -3035,9 +3214,12 @@
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	  ;;
+ 	esac
+ 	# Commands to make compiler produce verbose output that lists
+@@ -3061,12 +3214,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -1737,8 +1797,12 @@
 +	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  	      ;;
  	    *)
- 	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-@@ -3051,11 +3233,25 @@
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ 	      ;;
+ 	    esac
+ 	  fi
+@@ -3077,11 +3233,25 @@
  	;;
      esac
      ;;
@@ -1761,21 +1825,24 @@
 -      CC)
 +      CC*)
  	# SGI C++
--	_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 $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 ${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
-@@ -3066,7 +3262,7 @@
+@@ -3092,9 +3262,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
--	    _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 $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}${output_objdir}/so_locations -o $lib'
  	  else
- 	    _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'
+-	    _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
-@@ -3079,7 +3275,7 @@
+ 	fi
+ 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+@@ -3105,14 +3275,14 @@
      ;;
    linux*)
      case $cc_basename in
@@ -1784,7 +1851,16 @@
  	# Kuck and Associates, Inc. (KAI) C++ Compiler
  
  	# KCC will only create a shared library if the output file
-@@ -3104,17 +3300,41 @@
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ 	# Commands to make compiler produce verbose output that lists
+ 	# what "hidden" libraries, object files and flags are used when
+ 	# linking a shared library.
+@@ -3130,20 +3300,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -1810,8 +1886,8 @@
 +	  ;;
 +	esac
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--	_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(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(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'
@@ -1828,9 +1904,14 @@
 +        ;;
 +      cxx*)
  	# Compaq C++
- 	_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  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-@@ -3145,7 +3365,7 @@
+-	_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'
++	_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  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ 
+ 	runpath_var=LD_RUN_PATH
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3171,7 +3365,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -1839,7 +1920,7 @@
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
-@@ -3166,9 +3386,25 @@
+@@ -3192,15 +3386,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::"'
      ;;
@@ -1866,7 +1947,14 @@
  	# Kuck and Associates, Inc. (KAI) C++ Compiler
  
  	# KCC will only create a shared library if the output file
-@@ -3184,14 +3420,14 @@
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3210,14 +3420,14 @@
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -1879,21 +1967,21 @@
 -      cxx)
 +      cxx*)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_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} $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 ${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)=:
-@@ -3209,7 +3445,7 @@
+@@ -3235,7 +3445,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} $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} $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}${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)=:
-@@ -3228,7 +3464,7 @@
+@@ -3254,13 +3464,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -1902,7 +1990,14 @@
  	# Kuck and Associates, Inc. (KAI) C++ Compiler
  
  	# KCC will only create a shared library if the output file
-@@ -3243,17 +3479,17 @@
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+ 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3269,17 +3479,17 @@
  	# the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
  	;;
@@ -1915,25 +2010,25 @@
 -      cxx)
 +      cxx*)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_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} $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 ${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 $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 $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 ${output_objdir}/so_locations -o $lib~
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -3272,7 +3508,7 @@
+@@ -3298,7 +3508,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} $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} $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}${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)=:
-@@ -3293,27 +3529,14 @@
+@@ -3319,27 +3529,14 @@
      # FIXME: insert proper C++ library support
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
      ;;
@@ -1963,7 +2058,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3326,36 +3549,33 @@
+@@ -3352,36 +3549,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -1972,10 +2067,10 @@
  	# 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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	_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}  -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 $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $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}  ${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'
@@ -2012,23 +2107,50 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -3363,7 +3583,7 @@
+@@ -3389,9 +3583,9 @@
  	# in the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
  	;;
 -      gcx)
 +      gcx*)
  	# Green Hills C++ Compiler
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+-	_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'
  
-@@ -3401,12 +3621,63 @@
+ 	# 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 +3595,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
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    _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 -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -3412,9 +3606,9 @@
+ 	  else
+ 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ 	    # platform.
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 	    _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 -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+ 	    # Commands to make compiler produce verbose output that lists
+ 	    # what "hidden" libraries, object files and flags are used when
+@@ -3427,12 +3621,63 @@
  	;;
      esac
      ;;
 -  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
 +  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
 +    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 +    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 +    runpath_var='LD_RUN_PATH'
 +
@@ -2061,7 +2183,7 @@
 +    # names for shared libraries.
 +    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
 +    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 +    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 +    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
 +    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
@@ -2087,7 +2209,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3443,8 +3714,6 @@
+@@ -3469,8 +3714,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2096,7 +2218,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -3462,7 +3731,7 @@
+@@ -3488,7 +3731,7 @@
  ])# AC_LIBTOOL_LANG_CXX_CONFIG
  
  # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2105,7 +2227,7 @@
  # Figure out "hidden" library dependencies from verbose
  # compiler output when linking a shared library.
  # Parse the compiler output and extract the necessary
-@@ -3516,7 +3785,7 @@
+@@ -3542,7 +3785,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.
@@ -2114,7 +2236,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -3556,7 +3825,7 @@
+@@ -3582,7 +3825,7 @@
         fi
         ;;
  
@@ -2123,7 +2245,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -3592,13 +3861,37 @@
+@@ -3618,13 +3861,37 @@
  
  $rm -f confest.$objext
  
@@ -2162,7 +2284,7 @@
  # Ensure that the configuration vars for the C compiler are
  # suitably defined.  Those variables are subsequently used by
  # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -3642,12 +3935,16 @@
+@@ -3668,12 +3935,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -2180,7 +2302,7 @@
  
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
-@@ -3657,7 +3954,7 @@
+@@ -3683,7 +3954,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -2189,7 +2311,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -3665,8 +3962,10 @@
+@@ -3691,8 +3962,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -2202,7 +2324,7 @@
    ;;
  esac
  AC_MSG_RESULT([$enable_shared])
-@@ -3676,8 +3975,6 @@
+@@ -3702,8 +3975,6 @@
  test "$enable_shared" = yes || enable_static=yes
  AC_MSG_RESULT([$enable_static])
  
@@ -2211,7 +2333,7 @@
  _LT_AC_TAGVAR(GCC, $1)="$G77"
  _LT_AC_TAGVAR(LD, $1)="$LD"
  
-@@ -3687,8 +3984,6 @@
+@@ -3713,8 +3984,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2220,7 +2342,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -3717,20 +4012,27 @@
+@@ -3743,20 +4012,27 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -2249,7 +2371,7 @@
  ## 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
-@@ -3742,8 +4044,6 @@
+@@ -3768,8 +4044,6 @@
  AC_LIBTOOL_PROG_LD_SHLIBS($1)
  AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
  AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2258,7 +2380,7 @@
  
  AC_LIBTOOL_CONFIG($1)
  
-@@ -3753,7 +4053,7 @@
+@@ -3779,7 +4053,7 @@
  
  
  # AC_LIBTOOL_LANG_RC_CONFIG
@@ -2267,7 +2389,7 @@
  # Ensure that the configuration vars for the Windows resource compiler are
  # suitably defined.  Those variables are subsequently used by
  # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-@@ -3777,11 +4077,16 @@
+@@ -3803,11 +4077,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -2284,7 +2406,7 @@
  _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
  
  AC_LIBTOOL_CONFIG($1)
-@@ -3807,11 +4112,12 @@
+@@ -3833,11 +4112,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -2299,7 +2421,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 \
-@@ -3861,7 +4167,7 @@
+@@ -3887,7 +4167,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2308,16 +2430,7 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -3916,7 +4222,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., 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
-@@ -3927,11 +4233,11 @@
+@@ -3953,11 +4233,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2331,7 +2444,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -3962,6 +4268,12 @@
+@@ -3988,6 +4268,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -2344,7 +2457,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -3973,6 +4285,9 @@
+@@ -3999,6 +4285,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -2354,7 +2467,7 @@
  # A language-specific compiler.
  CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
  
-@@ -3992,7 +4307,7 @@
+@@ -4018,7 +4307,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -2363,7 +2476,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -4023,7 +4338,7 @@
+@@ -4049,7 +4338,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -2372,7 +2485,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -4038,7 +4353,7 @@
+@@ -4064,7 +4353,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
  
@@ -2381,7 +2494,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -4267,7 +4582,10 @@
+@@ -4293,7 +4582,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.
@@ -2393,7 +2506,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -4309,9 +4627,6 @@
+@@ -4335,9 +4627,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
  
@@ -2403,7 +2516,7 @@
  # 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'"
  
-@@ -4333,14 +4648,30 @@
+@@ -4359,14 +4648,30 @@
    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'"
    ;;
@@ -2436,7 +2549,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -4358,14 +4689,17 @@
+@@ -4384,14 +4689,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -2456,7 +2569,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -4521,6 +4855,10 @@
+@@ -4547,6 +4855,10 @@
        # DJGPP does not support shared libraries at all
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
        ;;
@@ -2467,7 +2580,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-@@ -4529,7 +4867,7 @@
+@@ -4555,7 +4867,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2476,7 +2589,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -4554,18 +4892,28 @@
+@@ -4580,18 +4892,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -2508,11 +2621,11 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -4573,22 +4921,22 @@
+@@ -4599,22 +4921,22 @@
  	    ;;
  	esac
  	;;
--      freebsd*)
+-      freebsd* | kfreebsd*-gnu)
 +      freebsd* | kfreebsd*-gnu | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
@@ -2537,7 +2650,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -4601,9 +4949,13 @@
+@@ -4627,9 +4949,13 @@
  	    ;;
  	esac
  	;;
@@ -2552,7 +2665,7 @@
  	    _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.
-@@ -4614,18 +4966,24 @@
+@@ -4640,18 +4966,24 @@
  	;;
        linux*)
  	case $cc_basename in
@@ -2581,7 +2694,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -4642,7 +5000,7 @@
+@@ -4668,7 +5000,7 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -2590,7 +2703,7 @@
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
  	    ;;
  	  *)
-@@ -4653,14 +5011,14 @@
+@@ -4679,14 +5011,14 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
@@ -2608,7 +2721,7 @@
  	    # Digital/Compaq C++
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -4674,24 +5032,15 @@
+@@ -4700,24 +5032,15 @@
  	;;
        psos*)
  	;;
@@ -2635,7 +2748,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
  	    ;;
-@@ -4701,12 +5050,12 @@
+@@ -4727,12 +5050,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -2650,7 +2763,7 @@
  	    # Lucid
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -4716,7 +5065,7 @@
+@@ -4742,7 +5065,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -2659,7 +2772,7 @@
  	    # NonStop-UX NCC 3.20
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    ;;
-@@ -4724,7 +5073,14 @@
+@@ -4750,7 +5073,14 @@
  	    ;;
  	esac
  	;;
@@ -2675,7 +2788,7 @@
  	;;
        vxworks*)
  	;;
-@@ -4771,6 +5127,11 @@
+@@ -4797,6 +5127,11 @@
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
        ;;
  
@@ -2687,7 +2800,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -4787,7 +5148,7 @@
+@@ -4813,7 +5148,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2696,7 +2809,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -4813,6 +5174,16 @@
+@@ -4839,6 +5174,16 @@
  	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -2713,7 +2826,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -4824,7 +5195,7 @@
+@@ -4850,7 +5195,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.
@@ -2722,7 +2835,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -4848,12 +5219,19 @@
+@@ -4874,12 +5219,19 @@
        ;;
  
      linux*)
@@ -2743,7 +2856,7 @@
        ccc*)
          _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
          # All Alpha code is PIC.
-@@ -4868,15 +5246,15 @@
+@@ -4894,15 +5246,15 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
        ;;
  
@@ -2765,7 +2878,7 @@
        ;;
  
      sunos4*)
-@@ -4885,7 +5263,7 @@
+@@ -4911,7 +5263,7 @@
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        ;;
  
@@ -2774,7 +2887,7 @@
        _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'
-@@ -4898,6 +5276,17 @@
+@@ -4924,6 +5276,17 @@
        fi
        ;;
  
@@ -2792,7 +2905,7 @@
      uts4*)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4925,7 +5314,7 @@
+@@ -4951,7 +5314,7 @@
      [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
  fi
@@ -2801,7 +2914,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -4934,6 +5323,16 @@
+@@ -4960,6 +5323,16 @@
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
      ;;
  esac
@@ -2818,7 +2931,7 @@
  ])
  
  
-@@ -4958,7 +5357,7 @@
+@@ -4984,7 +5357,7 @@
      _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -2827,7 +2940,7 @@
    ;;
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -4984,7 +5383,7 @@
+@@ -5010,7 +5383,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -2836,7 +2949,7 @@
    _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*
-@@ -5001,7 +5400,8 @@
+@@ -5027,7 +5400,8 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -2846,7 +2959,7 @@
    case $host_os in
    cygwin* | mingw* | pw32*)
      # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -5011,6 +5411,10 @@
+@@ -5037,6 +5411,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -2857,7 +2970,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -5021,6 +5425,27 @@
+@@ -5047,6 +5425,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -2885,26 +2998,40 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -5071,10 +5496,10 @@
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+@@ -5084,7 +5483,7 @@
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ 	# support --undefined.  This deserves some investigation.  FIXME
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+@@ -5094,13 +5493,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'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++      _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 '\''/^[[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 $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
 +        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  	# 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
-@@ -5083,9 +5508,55 @@
+@@ -5109,9 +5508,55 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
--	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
+-	$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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+      else
+       else
+-	ld_shlibs=no
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +      fi
 +      ;;
@@ -2950,13 +3077,19 @@
 +  $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
-       else
--	ld_shlibs=no
++      else
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
        ;;
  
-@@ -5099,7 +5570,7 @@
+@@ -5120,12 +5565,12 @@
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
        fi
        ;;
  
@@ -2965,7 +3098,16 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	cat <<EOF 1>&2
-@@ -5120,6 +5591,33 @@
+@@ -5139,13 +5584,40 @@
+ 
+ EOF
+       elif $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'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
        ;;
  
@@ -2999,7 +3141,17 @@
      sunos4*)
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -5137,16 +5635,11 @@
+@@ -5155,24 +5627,19 @@
+ 
+     *)
+       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'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
        ;;
      esac
  
@@ -3021,7 +3173,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -5158,7 +5651,7 @@
+@@ -5184,7 +5651,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -3030,7 +3182,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -5180,9 +5673,21 @@
+@@ -5206,9 +5673,21 @@
  	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
@@ -3054,7 +3206,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -5199,7 +5704,7 @@
+@@ -5225,7 +5704,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
        if test "$GCC" = yes; then
@@ -3063,7 +3215,7 @@
  	# 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`
-@@ -5218,8 +5723,12 @@
+@@ -5244,8 +5723,12 @@
    	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
    	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
  	  fi
@@ -3076,7 +3228,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -5227,30 +5736,30 @@
+@@ -5253,30 +5736,30 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -3104,8 +3256,8 @@
         # Determine the default libpath from the value encoded in an empty executable.
 -	_LT_AC_SYS_LIBPATH_AIX
 -	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--	_LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-	_LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 +       _LT_AC_SYS_LIBPATH_AIX
 +       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
@@ -3113,12 +3265,12 @@
  	if test "$host_cpu" = ia64; then
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
--	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
 +	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -5259,13 +5768,11 @@
+@@ -5285,13 +5768,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
@@ -3129,13 +3281,13 @@
 +	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
  	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
 -	  # 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 $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-	  _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 ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
  	fi
        fi
        ;;
-@@ -5278,7 +5785,7 @@
+@@ -5304,7 +5785,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
  
@@ -3144,14 +3296,20 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
        ;;
  
-@@ -5292,54 +5799,65 @@
+@@ -5314,69 +5795,69 @@
+       # hardcode_libdir_flag_spec is actually meaningless, as there is
+       # no search path for DLLs.
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
        # Tell ltmain to make .lib files, not .a files.
        libext=lib
        # Tell ltmain to make .dll files, not .so files.
 -      shrext=".dll"
 +      shrext_cmds=".dll"
        # FIXME: Setting linknames here is a bad hack.
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
        # 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.
@@ -3166,10 +3324,21 @@
 -      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 -      case "$host_os" in
 -      rhapsody* | darwin1.[[012]])
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
 -	;;
 -      *) # Darwin 1.3 on
--	test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+-	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
 -	;;
 +      case $host_os in
 +        rhapsody* | darwin1.[[012]])
@@ -3196,18 +3365,18 @@
 -    	  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'
+-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
 -    	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 $deplibs $compiler_flags -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 $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
 -      fi
--      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
 -      # 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 $libobjs $deplibs $compiler_flags -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 $compiler_flags $libobjs $deplibs -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 ${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}'
+-          _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}'
 -        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}'
+-          _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_cmds_need_lc, $1)=no
        _LT_AC_TAGVAR(hardcode_direct, $1)=no
        _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
@@ -3243,16 +3412,27 @@
        ;;
  
      dgux*)
-@@ -5372,7 +5890,7 @@
+@@ -5409,8 +5890,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
+-    freebsd* | kfreebsd*-gnu)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
 +    freebsd* | kfreebsd*-gnu | dragonfly*)
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      _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
-@@ -5395,47 +5913,62 @@
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -5418,7 +5899,7 @@
+ 
+     hpux9*)
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       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
+@@ -5432,47 +5913,62 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        ;;
  
@@ -3261,6 +3441,7 @@
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 -	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 -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -3282,13 +3463,14 @@
 +      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 +	case $host_cpu in
 +	hppa*64*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
 +	ia64*)
 +	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
+ 	  ;;
  	*)
- 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  	  ;;
  	esac
        else
@@ -3337,15 +3519,59 @@
  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
  	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
  
-@@ -5483,6 +6016,7 @@
+@@ -5486,7 +5982,7 @@
+ 
+     irix5* | irix6* | nonstopux*)
+       if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${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(archive_cmds, $1)='$CC -shared $libobjs $deplibs $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)='$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'
+@@ -5519,7 +6015,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 $libobjs $deplibs $compiler_flags'
+-	_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
-@@ -5528,7 +6062,7 @@
+@@ -5529,7 +6026,7 @@
+ 	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ 	   ;;
+ 	 *)
+-	   _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(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ 	   ;;
+        esac
+@@ -5540,14 +6037,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
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
++      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+     osf3*)
+       if test "$GCC" = yes; then
+ 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${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(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $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(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,13 +6056,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}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${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(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $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'
+       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 -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~
@@ -3354,7 +3580,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -5536,21 +6070,15 @@
+@@ -5573,21 +6070,15 @@
        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
        ;;
  
@@ -3369,16 +3595,18 @@
      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_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 $libobjs $deplibs $compiler_flags~$rm $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~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -5559,8 +6087,18 @@
+@@ -5596,8 +6087,18 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        case $host_os in
        solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3399,7 +3627,16 @@
        esac
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
-@@ -5617,36 +6155,45 @@
+@@ -5606,7 +6107,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.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+       fi
+@@ -5654,36 +6155,45 @@
        fi
        ;;
  
@@ -3419,11 +3656,11 @@
 -   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
 -      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_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,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
        else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
 +	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
        fi
@@ -3466,7 +3703,7 @@
        ;;
  
      uts4*)
-@@ -5664,11 +6211,6 @@
+@@ -5701,11 +6211,6 @@
  AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
  test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
  
@@ -3478,7 +3715,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -5689,13 +6231,14 @@
+@@ -5726,13 +6231,14 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3494,7 +3731,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -5823,7 +6366,7 @@
+@@ -5860,7 +6366,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
@@ -3503,8 +3740,8 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
---- parts/appwizard/common/admin/ltmain.sh.orig	Mon Jun 19 20:20:16 2006
-+++ parts/appwizard/common/admin/ltmain.sh	Mon Jun 19 20:20:29 2006
+--- parts/appwizard/common/admin/ltmain.sh	Sun Oct  1 19:29:12 2006
++++ parts/appwizard/common/admin/ltmain.sh	Sun Dec 18 23:14:54 2005
 @@ -1,7 +1,7 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.
@@ -3514,15 +3751,7 @@
  # Free Software Foundation, Inc.
  # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
  #
-@@ -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., 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
+@@ -24,6 +24,34 @@
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
@@ -4065,16 +4294,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)
@@ -4473,10 +4702,20 @@
  	    ;;
  	  esac
  	  if test "$prev" = rpath; then
-@@ -1149,6 +1412,18 @@
+@@ -1149,16 +1412,15 @@
  	  finalize_command="$finalize_command $qarg"
  	  continue
  	  ;;
+-	framework)
+-	  case $host in
+-	    *-*-darwin*)
+-	      case "$deplibs " in
+-	        *" $qarg.ltframework "*) ;;
+-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+-		   ;;
+-              esac
+-              ;;
+-   	  esac
 +	shrext)
 +  	  shrext_cmds="$arg"
 +	  prev=
@@ -4486,13 +4725,10 @@
 +	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
 +	  compile_command="$compile_command $arg"
 +	  finalize_command="$finalize_command $arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	*)
- 	  eval "$prev=\"\$arg\""
  	  prev=
-@@ -1197,7 +1472,7 @@
+ 	  continue
+ 	  ;;
+@@ -1210,7 +1472,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"
@@ -4501,7 +4737,7 @@
  	fi
  	if test "X$arg" = "X-export-symbols"; then
  	  prev=expsyms
-@@ -1207,6 +1482,18 @@
+@@ -1220,6 +1482,18 @@
  	continue
  	;;
  
@@ -4520,7 +4756,7 @@
        -inst-prefix-dir)
  	prev=inst_prefix
  	continue
-@@ -1233,7 +1520,8 @@
+@@ -1246,7 +1520,8 @@
  	  absdir=`cd "$dir" && pwd`
  	  if test -z "$absdir"; then
  	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
@@ -4530,7 +4766,7 @@
  	  fi
  	  dir="$absdir"
  	  ;;
-@@ -1247,10 +1535,15 @@
+@@ -1260,10 +1535,15 @@
  	esac
  	case $host in
  	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -4546,7 +4782,7 @@
  	  ;;
  	esac
  	continue
-@@ -1259,18 +1552,15 @@
+@@ -1272,26 +1552,35 @@
        -l*)
  	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
  	  case $host in
@@ -4555,9 +4791,6 @@
  	    # These systems don't actually have a C or math library (as such)
  	    continue
  	    ;;
--	  *-*-freebsd*-gnu*)
--	    # prevent being parsed by the freebsd regexp below
--	    ;;
 -	  *-*-mingw* | *-*-os2*)
 +	  *-*-os2*)
  	    # These systems don't actually have a C library (as such)
@@ -4568,9 +4801,10 @@
  	    # Do not include libc due to us having libc/libc_r.
  	    test "X$arg" = "X-lc" && continue
  	    ;;
-@@ -1278,13 +1568,19 @@
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
  	    # Rhapsody C and math libraries are in the System framework
- 	    deplibs="$deplibs -framework System"
+-	    deplibs="$deplibs System.ltframework"
++	    deplibs="$deplibs -framework System"
  	    continue
 +	    ;;
 +	  *-*-sco3.2v5* | *-*-sco5v6*)
@@ -4584,15 +4818,12 @@
  	  esac
  	elif test "X$arg" = "X-lc_r"; then
  	 case $host in
--	 *-*-freebsd*-gnu*)
--	   # prevent being parsed by the freebsd regexp below
--	   ;;
 -	 *-*-openbsd*)
 +	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
  	   # Do not include libc_r directly, use -pthread flag.
  	   continue
  	   ;;
-@@ -1294,18 +1590,41 @@
+@@ -1301,18 +1590,41 @@
  	continue
  	;;
  
@@ -4641,7 +4872,7 @@
  	# 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"`
-@@ -1316,9 +1635,7 @@
+@@ -1323,9 +1635,7 @@
  	esac
          compile_command="$compile_command $arg"
          finalize_command="$finalize_command $arg"
@@ -4652,7 +4883,7 @@
          continue
          ;;
  
-@@ -1358,6 +1675,11 @@
+@@ -1365,6 +1675,11 @@
  
        -o) prev=output ;;
  
@@ -4664,7 +4895,7 @@
        -release)
  	prev=release
  	continue
-@@ -1380,7 +1702,7 @@
+@@ -1387,7 +1702,7 @@
  	[\\/]* | [A-Za-z]:[\\/]*) ;;
  	*)
  	  $echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -4673,7 +4904,19 @@
  	  ;;
  	esac
  	case "$xrpath " in
-@@ -1476,7 +1798,6 @@
+@@ -1473,11 +1788,6 @@
+ 	continue
+ 	;;
+ 
+-      -framework)
+-        prev=framework
+-	continue
+-	;;
+-
+       # Some other compiler flag.
+       -* | +*)
+ 	# Unknown arguments in both finalize_command and compile_command need
+@@ -1488,7 +1798,6 @@
  	  arg="\"$arg\""
  	  ;;
  	esac
@@ -4681,7 +4924,7 @@
  	;;
  
        *.$objext)
-@@ -1504,7 +1825,7 @@
+@@ -1516,7 +1825,7 @@
  	     test "$pic_object" = none && \
  	     test "$non_pic_object" = none; then
  	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -4690,7 +4933,7 @@
  	  fi
  
  	  # Extract subdirectory from the argument.
-@@ -1552,12 +1873,17 @@
+@@ -1564,12 +1873,17 @@
  	    if test -z "$pic_object" || test "$pic_object" = none ; then
  	      arg="$non_pic_object"
  	    fi
@@ -4709,7 +4952,7 @@
  	  else
  	    # Dry-run case.
  
-@@ -1611,7 +1937,6 @@
+@@ -1623,7 +1937,6 @@
  	  arg="\"$arg\""
  	  ;;
  	esac
@@ -4717,7 +4960,7 @@
  	;;
        esac # arg
  
-@@ -1625,48 +1950,7 @@
+@@ -1637,48 +1950,7 @@
      if test -n "$prev"; then
        $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
        $echo "$help" 1>&2
@@ -4767,7 +5010,7 @@
      fi
  
      if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1699,9 +1983,9 @@
+@@ -1711,9 +1983,9 @@
      if test ! -d "$output_objdir"; then
        $show "$mkdir $output_objdir"
        $run $mkdir $output_objdir
@@ -4780,7 +5023,7 @@
        fi
      fi
  
-@@ -1710,7 +1994,7 @@
+@@ -1722,7 +1994,7 @@
      "")
        $echo "$modename: you must specify an output file" 1>&2
        $echo "$help" 1>&2
@@ -4789,7 +5032,7 @@
        ;;
      *.$libext) linkmode=oldlib ;;
      *.lo | *.$objext) linkmode=obj ;;
-@@ -1720,7 +2004,7 @@
+@@ -1732,7 +2004,7 @@
  
      case $host in
      *cygwin* | *mingw* | *pw32*)
@@ -4798,7 +5041,7 @@
        duplicate_compiler_generated_deps=yes
        ;;
      *)
-@@ -1764,7 +2048,6 @@
+@@ -1776,7 +2048,6 @@
      newlib_search_path=
      need_relink=no # whether we're linking any uninstalled libtool libraries
      notinst_deplibs= # not-installed libtool libraries
@@ -4806,7 +5049,7 @@
      case $linkmode in
      lib)
  	passes="conv link"
-@@ -1773,7 +2056,7 @@
+@@ -1785,7 +2056,7 @@
  	  *.la) ;;
  	  *)
  	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
@@ -4815,7 +5058,7 @@
  	    ;;
  	  esac
  	done
-@@ -1811,18 +2094,23 @@
+@@ -1823,18 +2094,23 @@
  	lib=
  	found=no
  	case $deplib in
@@ -4844,7 +5087,26 @@
  	      # Search the libtool library
  	      lib="$searchdir/lib${name}${search_ext}"
  	      if test -f "$lib"; then
-@@ -1898,11 +2186,11 @@
+@@ -1895,18 +2171,6 @@
+ 	    fi
+ 	  fi
+ 	  ;; # -l
+-	*.ltframework)
+-	  if test "$linkmode,$pass" = "prog,link"; then
+-	    compile_deplibs="$deplib $compile_deplibs"
+-	    finalize_deplibs="$deplib $finalize_deplibs"
+-	  else
+-	    deplibs="$deplib $deplibs"
+-	    if test "$linkmode" = lib ; then
+-	      newdependency_libs="$deplib $newdependency_libs"
+-	    fi
+-	  fi
+-	  continue
+-	  ;;
+ 	-L*)
+ 	  case $linkmode in
+ 	  lib)
+@@ -1922,11 +2186,11 @@
  	    fi
  	    if test "$pass" = scan; then
  	      deplibs="$deplib $deplibs"
@@ -4857,7 +5119,7 @@
  	    ;;
  	  *)
  	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-@@ -1930,7 +2218,22 @@
+@@ -1954,7 +2218,22 @@
  	  fi
  	  case $linkmode in
  	  lib)
@@ -4881,7 +5143,7 @@
  	      $echo
  	      $echo "*** Warning: Trying to link with static lib archive $deplib."
  	      $echo "*** I have the capability to make that library automatically link in when"
-@@ -1980,15 +2283,15 @@
+@@ -2004,15 +2283,15 @@
  	esac # case $deplib
  	if test "$found" = yes || test -f "$lib"; then :
  	else
@@ -4900,7 +5162,7 @@
  	fi
  
  	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -2004,6 +2307,8 @@
+@@ -2028,6 +2307,8 @@
  	# it will not redefine variables installed, or shouldnotlink
  	installed=yes
  	shouldnotlink=no
@@ -4909,10 +5171,26 @@
  
  	# Read the .la file
  	case $lib in
-@@ -2021,33 +2326,32 @@
+@@ -2035,13 +2316,6 @@
+ 	*) . ./$lib ;;
+ 	esac
+ 
+-	case $host in
+-	*-*-darwin*)
+-	  # Convert "-framework foo" to "foo.ltframework" in dependency_libs
+-	  test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+-	  ;;
+-	esac
+-
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+ 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -2050,35 +2324,34 @@
+ 	fi
+ 
  	if test "$pass" = conv; then
- 	  # Only check for convenience libraries
- 	  deplibs="$lib $deplibs"
+-	  # Only check for convenience libraries
+-	  deplibs="$lib $deplibs"
 -	  tmp_libs=
 -	  for deplib in $dependency_libs; do
 -	    #echo "Adding $deplib to \$deplibs"
@@ -4924,6 +5202,8 @@
 -            fi
 -	    tmp_libs="$tmp_libs $deplib"
 -	  done
++	  # Only check for convenience libraries
++	  deplibs="$lib $deplibs"
  	  if test -z "$libdir"; then
  	    if test -z "$old_library"; then
  	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
@@ -4956,7 +5236,7 @@
  	# Get the name of the library we link against.
  	linklib=
  	for l in $old_library $library_names; do
-@@ -2055,16 +2359,18 @@
+@@ -2086,16 +2359,18 @@
  	done
  	if test -z "$linklib"; then
  	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
@@ -4978,7 +5258,7 @@
  	    # 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
-@@ -2101,11 +2407,19 @@
+@@ -2132,11 +2407,19 @@
  	    dir="$libdir"
  	    absdir="$libdir"
  	  fi
@@ -5002,7 +5282,7 @@
  	fi # $installed = yes
  	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
  
-@@ -2113,7 +2427,7 @@
+@@ -2144,7 +2427,7 @@
  	if test "$pass" = dlpreopen; then
  	  if test -z "$libdir"; then
  	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
@@ -5011,7 +5291,7 @@
  	  fi
  	  # Prefer using a static library (so that no silly _DYNAMIC symbols
  	  # are required to link).
-@@ -2140,7 +2454,7 @@
+@@ -2171,7 +2454,7 @@
  	  continue
  	fi
  
@@ -5020,7 +5300,7 @@
  	if test "$linkmode" = prog && test "$pass" != link; then
  	  newlib_search_path="$newlib_search_path $ladir"
  	  deplibs="$lib $deplibs"
-@@ -2178,12 +2492,12 @@
+@@ -2209,12 +2492,12 @@
  	  if test -n "$library_names" &&
  	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
  	    # We need to hardcode the library path
@@ -5035,7 +5315,7 @@
  	      esac
  	    fi
  
-@@ -2220,24 +2534,29 @@
+@@ -2251,24 +2534,29 @@
  	fi
  
  	link_static=no # Whether the deplib will be linked statically
@@ -5071,7 +5351,7 @@
  	  if test "$linkmode" = lib &&
  	     test "$hardcode_into_libs" = yes; then
  	    # Hardcode the library path.
-@@ -2295,9 +2614,10 @@
+@@ -2326,9 +2614,10 @@
  	    else
  	      $show "extracting exported symbol list from \`$soname'"
  	      save_ifs="$IFS"; IFS='~'
@@ -5083,7 +5363,7 @@
  		$show "$cmd"
  		$run eval "$cmd" || exit $?
  	      done
-@@ -2308,9 +2628,10 @@
+@@ -2339,9 +2628,10 @@
  	    if test -f "$output_objdir/$newlib"; then :; else
  	      $show "generating import library for \`$soname'"
  	      save_ifs="$IFS"; IFS='~'
@@ -5095,7 +5375,7 @@
  		$show "$cmd"
  		$run eval "$cmd" || exit $?
  	      done
-@@ -2331,11 +2652,15 @@
+@@ -2362,11 +2652,15 @@
  	      if test "$hardcode_direct" = no; then
  		add="$dir/$linklib"
  		case $host in
@@ -5115,7 +5395,7 @@
  		      $echo "** Warning, lib $linklib is a module, not a shared library"
  		      if test -z "$old_library" ; then
  		        $echo
-@@ -2343,7 +2668,7 @@
+@@ -2374,7 +2668,7 @@
  		        $echo "** The link will probably fail, sorry"
  		      else
  		        add="$dir/$old_library"
@@ -5124,7 +5404,7 @@
  		    fi
  		esac
  	      elif test "$hardcode_minus_L" = no; then
-@@ -2366,9 +2691,9 @@
+@@ -2397,9 +2691,9 @@
  		add_dir="-L$dir"
  		# Try looking first in the location we're being installed to.
  		if test -n "$inst_prefix_dir"; then
@@ -5136,7 +5416,7 @@
  		      ;;
  		  esac
  		fi
-@@ -2385,7 +2710,7 @@
+@@ -2416,7 +2710,7 @@
  
  	    if test "$lib_linked" != yes; then
  	      $echo "$modename: configuration error: unsupported hardcode properties"
@@ -5145,7 +5425,7 @@
  	    fi
  
  	    if test -n "$add_shlibpath"; then
-@@ -2428,7 +2753,8 @@
+@@ -2459,7 +2753,8 @@
  	      esac
  	      add="-l$name"
  	    elif test "$hardcode_automatic" = yes; then
@@ -5155,7 +5435,7 @@
  	        add="$inst_prefix_dir$libdir/$linklib"
  	      else
  	        add="$libdir/$linklib"
-@@ -2438,9 +2764,9 @@
+@@ -2469,9 +2764,9 @@
  	      add_dir="-L$libdir"
  	      # Try looking first in the location we're being installed to.
  	      if test -n "$inst_prefix_dir"; then
@@ -5167,7 +5447,7 @@
  		    ;;
  		esac
  	      fi
-@@ -2499,17 +2825,16 @@
+@@ -2530,17 +2825,16 @@
  	      fi
  	    fi
  	  else
@@ -5189,7 +5469,7 @@
  	    # Extract -R from dependency_libs
  	    temp_deplibs=
  	    for libdir in $dependency_libs; do
-@@ -2523,7 +2848,7 @@
+@@ -2554,7 +2848,7 @@
  	      esac
  	    done
  	    dependency_libs="$temp_deplibs"
@@ -5198,7 +5478,7 @@
  
  	  newlib_search_path="$newlib_search_path $absdir"
  	  # Link against this library
-@@ -2565,20 +2890,18 @@
+@@ -2596,20 +2890,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
@@ -5223,7 +5503,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
-@@ -2586,46 +2909,45 @@
+@@ -2617,55 +2909,45 @@
  		    done
  		    if test -f "$path/$depdepl" ; then
  		      depdepl="$path/$depdepl"
@@ -5272,8 +5552,16 @@
  		  ;;
  		*) continue ;;
 -		esac  		  
-+		esac
+-		;;
+-
+-	      *.ltframework)
+-		case $host in
+-		  *-*-darwin*)
+-		    depdepl="$deplib"
+-		    ;;
+ 		esac
  		;;
+-
  	      *) continue ;;
  	      esac
  	      case " $deplibs " in
@@ -5291,7 +5579,7 @@
  	      esac
  	    done
  	  fi # link_all_deplibs != no
-@@ -2712,7 +3034,8 @@
+@@ -2752,7 +3034,8 @@
  	  eval $var=\"$tmp_libs\"
  	done # for var
        fi
@@ -5301,7 +5589,7 @@
        tmp_libs=
        for i in $dependency_libs ; do
  	case " $predeps $postdeps $compiler_lib_search_path " in
-@@ -2772,19 +3095,19 @@
+@@ -2812,19 +3095,19 @@
        case $outputname in
        lib*)
  	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -5324,7 +5612,7 @@
  	  eval libname=\"$libname_spec\"
  	else
  	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2795,7 +3118,7 @@
+@@ -2835,7 +3118,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
@@ -5333,7 +5621,7 @@
  	else
  	  $echo
  	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-@@ -2843,13 +3166,13 @@
+@@ -2883,13 +3166,13 @@
  	if test -n "$8"; then
  	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
  	  $echo "$help" 1>&2
@@ -5349,7 +5637,7 @@
  	case $vinfo_number in
  	yes)
  	  number_major="$2"
-@@ -2889,36 +3212,36 @@
+@@ -2929,36 +3212,36 @@
  
  	# Check that each of the things are valid numbers.
  	case $current in
@@ -5396,7 +5684,7 @@
  	fi
  
  	# Calculate the version variables.
-@@ -2935,7 +3258,7 @@
+@@ -2975,7 +3258,7 @@
  	  versuffix="$major.$age.$revision"
  	  # Darwin ld doesn't like 0 for these options...
  	  minor_current=`expr $current + 1`
@@ -5405,7 +5693,7 @@
  	  ;;
  
  	freebsd-aout)
-@@ -3007,7 +3330,7 @@
+@@ -3047,7 +3330,7 @@
  	*)
  	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
  	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
@@ -5414,8 +5702,12 @@
  	  ;;
  	esac
  
-@@ -3061,6 +3384,12 @@
- 	    *.$objext)
+@@ -3098,9 +3381,15 @@
+ 	tempremovelist=`$echo "$output_objdir/*"`
+ 	for p in $tempremovelist; do
+ 	  case $p in
+-	    *.$objext | *$exeext)
++	    *.$objext)
  	       ;;
  	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
 +	       if test "X$precious_files_regex" != "X"; then
@@ -5427,7 +5719,7 @@
  	       removelist="$removelist $p"
  	       ;;
  	    *) ;;
-@@ -3082,9 +3411,9 @@
+@@ -3122,9 +3411,9 @@
  
        # Eliminate all temporary directories.
        for path in $notinst_path; do
@@ -5440,7 +5732,7 @@
        done
  
        if test -n "$xrpath"; then
-@@ -3097,7 +3426,7 @@
+@@ -3137,7 +3426,7 @@
  	  *) finalize_rpath="$finalize_rpath $libdir" ;;
  	  esac
  	done
@@ -5449,16 +5741,16 @@
  	  dependency_libs="$temp_xrpath $dependency_libs"
  	fi
        fi
-@@ -3135,15 +3464,14 @@
+@@ -3170,14 +3459,19 @@
+ 	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+ 	    # Rhapsody C library is in the System framework
+-	    deplibs="$deplibs System.ltframework"
++	    deplibs="$deplibs -framework System"
+ 	    ;;
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
--	  *-*-freebsd*-gnu*)
--	    # Prevent $arg from being parsed by the freebsd regexp below.
--	    if test "$build_libtool_need_lc" = "yes"; then
--	      deplibs="$deplibs -lc"
--	    fi
--	    ;;
 -	  *-*-openbsd* | *-*-freebsd*)
 +	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
  	    # Do not include libc due to us having libc/libc_r.
@@ -5472,7 +5764,7 @@
  	    ;;
   	  *)
  	    # Add libc to deplibs on all other systems if necessary.
-@@ -3187,11 +3515,11 @@
+@@ -3221,11 +3515,11 @@
  	  int main() { return 0; }
  EOF
  	  $rm conftest
@@ -5486,7 +5778,7 @@
  	      # 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
-@@ -3228,11 +3556,11 @@
+@@ -3262,11 +3556,11 @@
  	    # 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
@@ -5500,7 +5792,7 @@
  		# Did it work?
  		if test "$?" -eq 0 ; then
  		  ldd_output=`ldd conftest`
-@@ -3280,7 +3608,7 @@
+@@ -3314,7 +3608,7 @@
  	  set dummy $deplibs_check_method
  	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
  	  for a_deplib in $deplibs; do
@@ -5509,7 +5801,7 @@
  	    # 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
-@@ -3349,7 +3677,7 @@
+@@ -3383,7 +3677,7 @@
  	  set dummy $deplibs_check_method
  	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
  	  for a_deplib in $deplibs; do
@@ -5518,7 +5810,27 @@
  	    # 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
-@@ -3479,6 +3807,35 @@
+@@ -3463,7 +3757,7 @@
+ 	case $host in
+ 	*-*-rhapsody* | *-*-darwin1.[012])
+ 	  # On Rhapsody replace the C library is the System framework
+-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	  ;;
+ 	esac
+ 
+@@ -3509,17 +3803,39 @@
+ 	    fi
+ 	  fi
+ 	fi
+-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+-	case $host in
+-	  *-*-darwin*)
+-	    newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	    dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	    ;;
+-	esac
+ 	# Done checking deplibs!
  	deplibs=$newdeplibs
        fi
  
@@ -5554,7 +5866,7 @@
        # All the library-specific variables (install_libdir is set above).
        library_names=
        old_library=
-@@ -3491,7 +3848,7 @@
+@@ -3532,7 +3848,7 @@
  	  hardcode_libdirs=
  	  dep_rpath=
  	  rpath="$finalize_rpath"
@@ -5563,7 +5875,7 @@
  	  for libdir in $rpath; do
  	    if test -n "$hardcode_libdir_flag_spec"; then
  	      if test -n "$hardcode_libdir_separator"; then
-@@ -3546,7 +3903,7 @@
+@@ -3587,7 +3903,7 @@
  	fi
  
  	# Get the real and link names of the library.
@@ -5572,7 +5884,7 @@
  	eval library_names=\"$library_names_spec\"
  	set dummy $library_names
  	realname="$2"
-@@ -3562,6 +3919,7 @@
+@@ -3603,6 +3919,7 @@
  	fi
  
  	lib="$output_objdir/$realname"
@@ -5580,7 +5892,7 @@
  	for link
  	do
  	  linknames="$linknames $link"
-@@ -3576,10 +3934,11 @@
+@@ -3617,10 +3934,11 @@
  	    $show "generating symbol list for \`$libname.la'"
  	    export_symbols="$output_objdir/$libname.exp"
  	    $run $rm $export_symbols
@@ -5593,7 +5905,7 @@
  	      if len=`expr "X$cmd" : ".*"` &&
  	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
  	        $show "$cmd"
-@@ -3589,6 +3948,9 @@
+@@ -3630,6 +3948,9 @@
  	        # The command line is too long to execute in one step.
  	        $show "using reloadable object file for export list..."
  	        skipped_export=:
@@ -5603,7 +5915,7 @@
  	      fi
  	    done
  	    IFS="$save_ifs"
-@@ -3609,12 +3971,12 @@
+@@ -3650,12 +3971,12 @@
  	for test_deplib in $deplibs; do
  		case " $convenience " in
  		*" $test_deplib "*) ;;
@@ -5618,7 +5930,7 @@
  
  	if test -n "$convenience"; then
  	  if test -n "$whole_archive_flag_spec"; then
-@@ -3622,67 +3984,13 @@
+@@ -3663,67 +3984,13 @@
  	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
  	  else
  	    gentop="$output_objdir/${outputname}x"
@@ -5689,7 +6001,7 @@
  	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
  	  eval flag=\"$thread_safe_flag_spec\"
  	  linker_flags="$linker_flags $flag"
-@@ -3693,31 +4001,27 @@
+@@ -3734,31 +4001,27 @@
  	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
  	fi
  
@@ -5731,7 +6043,7 @@
  	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
  	  :
  	else
-@@ -3736,6 +4040,7 @@
+@@ -3777,6 +4040,7 @@
  	    save_libobjs=$libobjs
  	  fi
  	  save_output=$output
@@ -5739,7 +6051,7 @@
  
  	  # Clear the reloadable object creation command queue and
  	  # initialize k to one.
-@@ -3745,13 +4050,13 @@
+@@ -3786,13 +4050,13 @@
  	  delfiles=
  	  last_robj=
  	  k=1
@@ -5755,7 +6067,7 @@
  		 test "$len" -le "$max_cmd_len"; }; then
  	      objlist="$objlist $obj"
  	    else
-@@ -3765,9 +4070,9 @@
+@@ -3806,9 +4070,9 @@
  		# the last one created.
  		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
  	      fi
@@ -5767,7 +6079,7 @@
  	      objlist=$obj
  	      len=1
  	    fi
-@@ -3787,13 +4092,13 @@
+@@ -3828,13 +4092,13 @@
  	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
            fi
  
@@ -5783,7 +6095,7 @@
  	  done
  
  	  $echo "creating a temporary reloadable object file: $output"
-@@ -3818,28 +4123,54 @@
+@@ -3859,28 +4123,54 @@
  	  # value of $libobjs for piecewise linking.
  
  	  # Do each of the archive commands.
@@ -5843,7 +6155,7 @@
  	fi
  
  	# Create links to the real library.
-@@ -3887,7 +4218,7 @@
+@@ -3928,7 +4218,7 @@
        *.lo)
  	if test -n "$objs$old_deplibs"; then
  	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
@@ -5852,7 +6164,7 @@
  	fi
  	libobj="$output"
  	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -3916,64 +4247,10 @@
+@@ -3957,64 +4247,10 @@
  	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
  	else
  	  gentop="$output_objdir/${obj}x"
@@ -5919,7 +6231,7 @@
  	fi
        fi
  
-@@ -3981,10 +4258,11 @@
+@@ -4022,10 +4258,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"
@@ -5932,7 +6244,7 @@
  	$show "$cmd"
  	$run eval "$cmd" || exit $?
        done
-@@ -3997,7 +4275,7 @@
+@@ -4038,7 +4275,7 @@
  	  $run ${rm}r $gentop
  	fi
  
@@ -5941,7 +6253,7 @@
        fi
  
        if test "$build_libtool_libs" != yes; then
-@@ -4010,17 +4288,18 @@
+@@ -4051,17 +4288,18 @@
  	# accidentally link it into a program.
  	# $show "echo timestamp > $libobj"
  	# $run eval "echo timestamp > $libobj" || exit $?
@@ -5962,7 +6274,7 @@
  	  $show "$cmd"
  	  $run eval "$cmd" || exit $?
  	done
-@@ -4032,7 +4311,7 @@
+@@ -4073,7 +4311,7 @@
  	$run ${rm}r $gentop
        fi
  
@@ -5971,7 +6283,28 @@
        ;;
  
      prog)
-@@ -4072,6 +4351,35 @@
+@@ -4098,24 +4336,50 @@
+       case $host in
+       *-*-rhapsody* | *-*-darwin1.[012])
+ 	# On Rhapsody replace the C library is the System framework
+-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
++	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	;;
+       esac
+ 
+       case $host in
+-      *-*-darwin*)
++      *darwin*)
+         # Don't allow lazy linking, it breaks C++ global constructors
+         if test "$tagname" = CXX ; then
+         compile_command="$compile_command ${wl}-bind_at_load"
+         finalize_command="$finalize_command ${wl}-bind_at_load"
+         fi
+-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
          ;;
        esac
  
@@ -6007,7 +6340,7 @@
        compile_command="$compile_command $compile_deplibs"
        finalize_command="$finalize_command $finalize_deplibs"
  
-@@ -4116,10 +4424,15 @@
+@@ -4160,10 +4424,15 @@
  	fi
  	case $host in
  	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -6023,7 +6356,7 @@
  	  ;;
  	esac
        done
-@@ -4233,13 +4546,25 @@
+@@ -4277,13 +4546,25 @@
  
  	    # Prepare the list of exported symbols
  	    if test -z "$export_symbols"; then
@@ -6053,7 +6386,7 @@
  	    fi
  	  fi
  
-@@ -4290,7 +4615,26 @@
+@@ -4334,7 +4615,26 @@
  #endif
  
  /* The mapping between symbol names and symbols. */
@@ -6080,7 +6413,7 @@
    const char *name;
    lt_ptr address;
  }
-@@ -4337,20 +4681,33 @@
+@@ -4381,20 +4681,33 @@
  	  esac
  
  	  # Now compile the dynamic symbol file.
@@ -6119,7 +6452,7 @@
  	  ;;
  	esac
        else
-@@ -4363,17 +4720,6 @@
+@@ -4407,17 +4720,6 @@
  	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
        fi
  
@@ -6137,7 +6470,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'`
-@@ -4382,7 +4728,7 @@
+@@ -4426,7 +4728,7 @@
  	# We have no uninstalled library dependencies, so finalize right now.
  	$show "$link_command"
  	$run eval "$link_command"
@@ -6146,7 +6479,7 @@
  
  	# Delete the generated files.
  	if test -n "$dlsyms"; then
-@@ -4390,7 +4736,7 @@
+@@ -4434,7 +4736,7 @@
  	  $run $rm "$output_objdir/${outputname}S.${objext}"
  	fi
  
@@ -6155,7 +6488,7 @@
        fi
  
        if test -n "$shlibpath_var"; then
-@@ -4449,7 +4795,7 @@
+@@ -4493,7 +4795,7 @@
  	# Link the executable and exit
  	$show "$link_command"
  	$run eval "$link_command" || exit $?
@@ -6164,7 +6497,7 @@
        fi
  
        if test "$hardcode_action" = relink; then
-@@ -4504,10 +4850,10 @@
+@@ -4548,10 +4850,10 @@
        fi
  
        # Quote $echo for shipping.
@@ -6179,14 +6512,16 @@
  	esac
  	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
        else
-@@ -4530,10 +4876,12 @@
+@@ -4573,11 +4875,13 @@
+ 	  *) exeext= ;;
  	esac
  	case $host in
- 	  *cygwin* | *mingw* )
--	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
+-	  *mingw* )
+-	    cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
 -	    cwrapper=`$echo ${output}.exe`
 -	    $rm $cwrappersource $cwrapper
 -	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
++	  *cygwin* | *mingw* )
 +            output_name=`basename $output`
 +            output_path=`dirname $output`
 +            cwrappersource="$output_path/$objdir/lt-$output_name.c"
@@ -6196,7 +6531,7 @@
  
  	    cat > $cwrappersource <<EOF
  
-@@ -4542,7 +4890,7 @@
+@@ -4586,7 +4890,7 @@
  
     The $output program cannot be directly executed until all the libtool
     libraries that it depends on are installed.
@@ -6205,7 +6540,7 @@
     This wrapper executable should never be moved out of the build directory.
     If it is, it will not operate correctly.
  
-@@ -4558,6 +4906,9 @@
+@@ -4602,6 +4906,9 @@
  #include <malloc.h>
  #include <stdarg.h>
  #include <assert.h>
@@ -6215,7 +6550,7 @@
  
  #if defined(PATH_MAX)
  # define LT_PATHMAX PATH_MAX
-@@ -4568,15 +4919,19 @@
+@@ -4612,15 +4919,19 @@
  #endif
  
  #ifndef DIR_SEPARATOR
@@ -6240,7 +6575,7 @@
  #endif
  
  #ifndef DIR_SEPARATOR_2
-@@ -4586,17 +4941,32 @@
+@@ -4630,17 +4941,32 @@
          (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
  #endif /* DIR_SEPARATOR_2 */
  
@@ -6275,7 +6610,7 @@
  char * strendzap(char *str, const char *pat);
  void lt_fatal (const char *message, ...);
  
-@@ -4605,30 +4975,52 @@
+@@ -4649,30 +4975,52 @@
  {
    char **newargz;
    int i;
@@ -6337,7 +6672,7 @@
  }
  
  void *
-@@ -4641,59 +5033,159 @@
+@@ -4685,59 +5033,159 @@
    return p;
  }
  
@@ -6374,9 +6709,7 @@
 -fnqualify(const char *path)
 +int
 +check_executable(const char * path)
- {
--  size_t size;
--  char *p;
++{
 +  struct stat st;
 +
 +  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
@@ -6403,7 +6736,9 @@
 +   newly allocated full path name if found, NULL otherwise */
 +char *
 +find_executable (const char* wrapper)
-+{
+ {
+-  size_t size;
+-  char *p;
 +  int has_slash = 0;
 +  const char* p;
 +  const char* p_next;
@@ -6420,9 +6755,7 @@
  
 -  /* Is it qualified already? */
 +  /* Absolute path? */
- #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
--  if (isalpha (path[0]) && path[1] == ':')
--    return xstrdup (path);
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
 +  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
 +  {
 +    concat_name = xstrdup (wrapper);
@@ -6440,7 +6773,9 @@
 +        return concat_name;
 +      XFREE(concat_name);
 +    }
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+-  if (isalpha (path[0]) && path[1] == ':')
+-    return xstrdup (path);
 +  }
  #endif
 -  if (IS_DIR_SEPARATOR (path[0]))
@@ -6519,7 +6854,7 @@
  {
    size_t len, patlen;
  
-@@ -4713,7 +5205,7 @@
+@@ -4757,7 +5205,7 @@
  }
  
  static void
@@ -6528,7 +6863,7 @@
            const char * message, va_list ap)
  {
    fprintf (stderr, "%s: %s: ", program_name, mode);
-@@ -4733,16 +5225,16 @@
+@@ -4777,16 +5225,16 @@
    va_end (ap);
  }
  EOF
@@ -6555,7 +6890,7 @@
  
  	$echo > $output "\
  #! $SHELL
-@@ -4763,7 +5255,7 @@
+@@ -4807,7 +5255,7 @@
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
@@ -6564,7 +6899,7 @@
  
  relink_command=\"$relink_command\"
  
-@@ -4842,7 +5334,7 @@
+@@ -4886,7 +5334,7 @@
        else
  	$echo \"\$relink_command_output\" >&2
  	$rm \"\$progdir/\$file\"
@@ -6573,7 +6908,7 @@
        fi
      fi
  
-@@ -4892,32 +5384,32 @@
+@@ -4936,34 +5384,32 @@
  	# Backslashes separate directories on plain windows
  	*-*-mingw | *-*-os2*)
  	  $echo >> $output "\
@@ -6583,8 +6918,10 @@
  	  ;;
  
  	*)
+-	  # Need to set LD_LIBRARY_PATH, to the value already
+-	  # computed within libtool.
  	  $echo >> $output "\
--      exec \$progdir/\$program \${1+\"\$@\"}
+-      LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"}
 +      exec \"\$progdir/\$program\" \${1+\"\$@\"}
  "
  	  ;;
@@ -6612,7 +6949,7 @@
        ;;
      esac
  
-@@ -4940,78 +5432,78 @@
+@@ -4986,78 +5432,78 @@
  
        if test -n "$addlibs"; then
  	gentop="$output_objdir/${outputname}x"
@@ -6752,7 +7089,7 @@
  	else
  	  # the command line is too long to link in one step, link in parts
  	  $echo "using piecewise archive linking..."
-@@ -5020,31 +5512,18 @@
+@@ -5066,31 +5512,18 @@
  	  objlist=
  	  concat_cmds=
  	  save_oldobjs=$oldobjs
@@ -6787,7 +7124,7 @@
  	       test "$len" -le "$max_cmd_len"; then
  	      :
  	    else
-@@ -5052,7 +5531,7 @@
+@@ -5098,7 +5531,7 @@
  	      oldobjs=$objlist
  	      if test "$obj" = "$last_oldobj" ; then
  	        RANLIB=$save_RANLIB
@@ -6796,7 +7133,7 @@
  	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
  	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
  	      objlist=
-@@ -5063,12 +5542,13 @@
+@@ -5109,12 +5542,13 @@
  	  if test "X$oldobjs" = "X" ; then
  	    eval cmds=\"\$concat_cmds\"
  	  else
@@ -6811,7 +7148,7 @@
  	IFS="$save_ifs"
  	$show "$cmd"
  	$run eval "$cmd" || exit $?
-@@ -5100,11 +5580,13 @@
+@@ -5146,11 +5580,13 @@
  	fi
        done
        # Quote the link command for shipping.
@@ -6828,7 +7165,7 @@
        # Only create the output if not a dry run.
        if test -z "$run"; then
  	for installed in no yes; do
-@@ -5122,7 +5604,7 @@
+@@ -5168,7 +5604,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
@@ -6837,7 +7174,7 @@
  		fi
  		newdependency_libs="$newdependency_libs $libdir/$name"
  		;;
-@@ -5136,7 +5618,7 @@
+@@ -5182,7 +5618,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
@@ -6846,7 +7183,7 @@
  	      fi
  	      newdlfiles="$newdlfiles $libdir/$name"
  	    done
-@@ -5147,11 +5629,30 @@
+@@ -5193,11 +5629,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
@@ -6878,7 +7215,7 @@
  	  fi
  	  $rm $output
  	  # place dlname in correct position for cygwin
-@@ -5195,7 +5696,7 @@
+@@ -5241,7 +5696,7 @@
  
  # Directory that this library needs to be installed in:
  libdir='$install_libdir'"
@@ -6887,7 +7224,7 @@
  	    $echo >> $output "\
  relink_command=\"$relink_command\""
  	  fi
-@@ -5208,7 +5709,7 @@
+@@ -5254,7 +5709,7 @@
        $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
        ;;
      esac
@@ -6896,7 +7233,7 @@
      ;;
  
    # libtool install mode
-@@ -5219,11 +5720,11 @@
+@@ -5265,11 +5720,11 @@
      # install_prog (especially on Windows NT).
      if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
         # Allow the use of GNU shtool's install command.
@@ -6910,7 +7247,7 @@
  	arg="\"$arg\""
  	;;
        esac
-@@ -5232,14 +5733,14 @@
+@@ -5278,14 +5733,14 @@
        shift
      else
        install_prog=
@@ -6927,7 +7264,7 @@
        arg="\"$arg\""
        ;;
      esac
-@@ -5257,28 +5758,31 @@
+@@ -5303,28 +5758,31 @@
      do
        if test -n "$dest"; then
  	files="$files $dest"
@@ -6967,7 +7304,7 @@
  	  continue
  	fi
  	;;
-@@ -5287,7 +5791,7 @@
+@@ -5333,7 +5791,7 @@
        # Aesthetically quote the argument.
        arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
        case $arg in
@@ -6976,7 +7313,7 @@
  	arg="\"$arg\""
  	;;
        esac
-@@ -5297,13 +5801,13 @@
+@@ -5343,13 +5801,13 @@
      if test -z "$install_prog"; then
        $echo "$modename: you must specify an install program" 1>&2
        $echo "$help" 1>&2
@@ -6992,7 +7329,7 @@
      fi
  
      if test -z "$files"; then
-@@ -5313,7 +5817,7 @@
+@@ -5359,7 +5817,7 @@
  	$echo "$modename: you must specify a destination" 1>&2
        fi
        $echo "$help" 1>&2
@@ -7001,7 +7338,7 @@
      fi
  
      # Strip any trailing slash from the destination.
-@@ -5334,7 +5838,7 @@
+@@ -5380,7 +5838,7 @@
        if test "$#" -gt 2; then
  	$echo "$modename: \`$dest' is not a directory" 1>&2
  	$echo "$help" 1>&2
@@ -7010,7 +7347,7 @@
        fi
      fi
      case $destdir in
-@@ -5346,7 +5850,7 @@
+@@ -5392,7 +5850,7 @@
  	*)
  	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
  	  $echo "$help" 1>&2
@@ -7019,7 +7356,7 @@
  	  ;;
  	esac
        done
-@@ -5375,7 +5879,7 @@
+@@ -5421,7 +5879,7 @@
  	else
  	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
  	  $echo "$help" 1>&2
@@ -7028,7 +7365,7 @@
  	fi
  
  	library_names=
-@@ -5417,7 +5921,7 @@
+@@ -5463,7 +5921,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
@@ -7037,7 +7374,7 @@
  	  fi
  
  	  if test -n "$inst_prefix_dir"; then
-@@ -5432,7 +5936,7 @@
+@@ -5478,7 +5936,7 @@
  	  if $run eval "$relink_command"; then :
  	  else
  	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
@@ -7046,7 +7383,7 @@
  	  fi
  	fi
  
-@@ -5456,23 +5960,36 @@
+@@ -5502,23 +5960,36 @@
  
  	  if test "$#" -gt 0; then
  	    # Delete the old symlinks, and create new ones.
@@ -7087,7 +7424,7 @@
  	  done
  	  IFS="$save_ifs"
  	fi
-@@ -5510,7 +6027,7 @@
+@@ -5556,7 +6027,7 @@
  	*)
  	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
  	  $echo "$help" 1>&2
@@ -7096,7 +7433,7 @@
  	  ;;
  	esac
  
-@@ -5528,7 +6045,7 @@
+@@ -5574,7 +6045,7 @@
  	  $show "$install_prog $staticobj $staticdest"
  	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
  	fi
@@ -7105,7 +7442,7 @@
  	;;
  
        *)
-@@ -5566,23 +6083,21 @@
+@@ -5612,23 +6083,21 @@
  	  notinst_deplibs=
  	  relink_command=
  
@@ -7138,7 +7475,7 @@
  	  fi
  
  	  finalize=yes
-@@ -5604,30 +6119,21 @@
+@@ -5650,30 +6119,21 @@
  	  done
  
  	  relink_command=
@@ -7169,7 +7506,7 @@
 -	      tmpdir="/tmp"
 -	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
 -	      tmpdir="$tmpdir/libtool-$$"
--	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
+-	      if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
 -	      else
 -		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
 -		continue
@@ -7178,7 +7515,7 @@
  	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
  	      outputname="$tmpdir/$file"
  	      # Replace the output file specification.
-@@ -5651,7 +6157,7 @@
+@@ -5697,7 +6157,7 @@
  	fi
  
  	# remove .exe since cygwin /usr/bin/install will append another
@@ -7187,7 +7524,7 @@
  	case $install_prog,$host in
  	*/usr/bin/install*,*cygwin*)
  	  case $file:$destfile in
-@@ -5683,16 +6189,17 @@
+@@ -5729,16 +6189,17 @@
        $show "$install_prog $file $oldlib"
        $run eval "$install_prog \$file \$oldlib" || exit $?
  
@@ -7207,7 +7544,7 @@
  	$show "$cmd"
  	$run eval "$cmd" || exit $?
        done
-@@ -5706,9 +6213,9 @@
+@@ -5752,9 +6213,9 @@
      if test -n "$current_libdirs"; then
        # Maybe just do a dry run.
        test -n "$run" && current_libdirs=" -n$current_libdirs"
@@ -7219,7 +7556,7 @@
      fi
      ;;
  
-@@ -5727,10 +6234,11 @@
+@@ -5773,10 +6234,11 @@
        for libdir in $libdirs; do
  	if test -n "$finish_cmds"; then
  	  # Do each command in the finish commands.
@@ -7232,7 +7569,7 @@
  	    $show "$cmd"
  	    $run eval "$cmd" || admincmds="$admincmds
         $cmd"
-@@ -5747,9 +6255,9 @@
+@@ -5793,9 +6255,9 @@
      fi
  
      # Exit here if they wanted silent mode.
@@ -7244,7 +7581,7 @@
      $echo "Libraries have been installed in:"
      for libdir in $libdirs; do
        $echo "   $libdir"
-@@ -5782,8 +6290,8 @@
+@@ -5828,8 +6290,8 @@
      $echo
      $echo "See any operating system documentation about shared libraries for"
      $echo "more information, such as the ld(1) and ld.so(8) manual pages."
@@ -7255,7 +7592,7 @@
      ;;
  
    # libtool execute mode
-@@ -5795,7 +6303,7 @@
+@@ -5841,7 +6303,7 @@
      if test -z "$cmd"; then
        $echo "$modename: you must specify a COMMAND" 1>&2
        $echo "$help"
@@ -7264,7 +7601,7 @@
      fi
  
      # Handle -dlopen flags immediately.
-@@ -5803,7 +6311,7 @@
+@@ -5849,7 +6311,7 @@
        if test ! -f "$file"; then
  	$echo "$modename: \`$file' is not a file" 1>&2
  	$echo "$help" 1>&2
@@ -7273,7 +7610,7 @@
        fi
  
        dir=
-@@ -5814,7 +6322,7 @@
+@@ -5860,7 +6322,7 @@
  	else
  	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
  	  $echo "$help" 1>&2
@@ -7282,7 +7619,7 @@
  	fi
  
  	# Read the libtool library.
-@@ -5841,7 +6349,7 @@
+@@ -5887,7 +6349,7 @@
  	  dir="$dir/$objdir"
  	else
  	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
@@ -7291,7 +7628,7 @@
  	fi
  	;;
  
-@@ -5921,7 +6429,7 @@
+@@ -5967,7 +6429,7 @@
  	$echo "export $shlibpath_var"
        fi
        $echo "$cmd$args"
@@ -7300,7 +7637,7 @@
      fi
      ;;
  
-@@ -5949,7 +6457,7 @@
+@@ -5995,7 +6457,7 @@
      if test -z "$rm"; then
        $echo "$modename: you must specify an RM program" 1>&2
        $echo "$help" 1>&2
@@ -7309,7 +7646,7 @@
      fi
  
      rmdirs=
-@@ -5999,15 +6507,24 @@
+@@ -6045,15 +6507,24 @@
  	    rmfiles="$rmfiles $objdir/$n"
  	  done
  	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
@@ -7337,7 +7674,7 @@
  		$show "$cmd"
  		$run eval "$cmd"
  		if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6019,10 +6536,11 @@
+@@ -6065,10 +6536,11 @@
  
  	    if test -n "$old_library"; then
  	      # Do each command in the old_postuninstall commands.
@@ -7350,7 +7687,7 @@
  		$show "$cmd"
  		$run eval "$cmd"
  		if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6032,7 +6550,8 @@
+@@ -6078,7 +6550,8 @@
  	      IFS="$save_ifs"
  	    fi
  	    # FIXME: should reinstall the best remaining shared library.
@@ -7360,7 +7697,7 @@
  	fi
  	;;
  
-@@ -6061,7 +6580,7 @@
+@@ -6107,7 +6580,7 @@
  	if test "$mode" = clean ; then
  	  noexename=$name
  	  case $file in
@@ -7369,7 +7706,7 @@
  	    file=`$echo $file|${SED} 's,.exe$,,'`
  	    noexename=`$echo $name|${SED} 's,.exe$,,'`
  	    # $file with .exe has already been added to rmfiles,
-@@ -6106,20 +6625,20 @@
+@@ -6152,20 +6625,20 @@
    "")
      $echo "$modename: you must specify a MODE" 1>&2
      $echo "$generic_help" 1>&2
@@ -7393,7 +7730,7 @@
  fi
  
  # We need to display help for each of the modes.
-@@ -6155,7 +6674,7 @@
+@@ -6201,7 +6674,7 @@
  a more detailed description of MODE.
  
  Report bugs to <bug-libtool@gnu.org>."
@@ -7402,7 +7739,7 @@
    ;;
  
  clean)
-@@ -6267,6 +6786,8 @@
+@@ -6313,6 +6786,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
@@ -7411,7 +7748,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
-@@ -6308,14 +6829,14 @@
+@@ -6354,14 +6829,14 @@
  *)
    $echo "$modename: invalid operation mode \`$mode'" 1>&2
    $echo "$help" 1>&2
@@ -7428,7 +7765,7 @@
  
  # The TAGs below are defined such that we never get into a situation
  # in which we disable both kinds of libraries.  Given conflicting
-@@ -6329,12 +6850,11 @@
+@@ -6375,12 +6850,11 @@
  # configuration.  But we'll never go from static-only to shared-only.
  
  # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
diff --git a/devel/kdevelop/pkg-plist b/devel/kdevelop/pkg-plist
index 0d74ade725e..130c7ae8ba4 100644
--- a/devel/kdevelop/pkg-plist
+++ b/devel/kdevelop/pkg-plist
@@ -158,9 +158,25 @@ lib/kde3/libclearcaseintegrator.so
 lib/kde3/libcvsserviceintegrator.a
 lib/kde3/libcvsserviceintegrator.la
 lib/kde3/libcvsserviceintegrator.so
+lib/kde3/libdocchmplugin.a
+lib/kde3/libdocchmplugin.la
+lib/kde3/libdocchmplugin.so
+lib/kde3/libdocchmplugin.so.0
 lib/kde3/libdoccustomplugin.a
 lib/kde3/libdoccustomplugin.la
 lib/kde3/libdoccustomplugin.so
+lib/kde3/libdocdevhelpplugin.a
+lib/kde3/libdocdevhelpplugin.la
+lib/kde3/libdocdevhelpplugin.so
+lib/kde3/libdocdevhelpplugin.so.0
+lib/kde3/libdocdoxygenplugin.a
+lib/kde3/libdocdoxygenplugin.la
+lib/kde3/libdocdoxygenplugin.so
+lib/kde3/libdocdoxygenplugin.so.0
+lib/kde3/libdockdevtocplugin.a
+lib/kde3/libdockdevtocplugin.la
+lib/kde3/libdockdevtocplugin.so
+lib/kde3/libdockdevtocplugin.so.0
 lib/kde3/libdocqtplugin.a
 lib/kde3/libdocqtplugin.la
 lib/kde3/libdocqtplugin.so
@@ -394,22 +410,6 @@ lib/libdesignerintegration.a
 lib/libdesignerintegration.la
 lib/libdesignerintegration.so
 lib/libdesignerintegration.so.0
-lib/libdocchmplugin.a
-lib/libdocchmplugin.la
-lib/libdocchmplugin.so
-lib/libdocchmplugin.so.0
-lib/libdocdevhelpplugin.a
-lib/libdocdevhelpplugin.la
-lib/libdocdevhelpplugin.so
-lib/libdocdevhelpplugin.so.0
-lib/libdocdoxygenplugin.a
-lib/libdocdoxygenplugin.la
-lib/libdocdoxygenplugin.so
-lib/libdocdoxygenplugin.so.0
-lib/libdockdevtocplugin.a
-lib/libdockdevtocplugin.la
-lib/libdockdevtocplugin.so
-lib/libdockdevtocplugin.so.0
 lib/libdocumentation_interfaces.a
 lib/libdocumentation_interfaces.la
 lib/libdocumentation_interfaces.so
@@ -698,6 +698,7 @@ share/apps/kdevappwizard/superwaba.png
 share/apps/kdevappwizard/superwaba.tar.gz
 share/apps/kdevappwizard/template-common/Artistic
 share/apps/kdevappwizard/template-common/COPYING
+share/apps/kdevappwizard/template-common/COPYING-DOCS
 share/apps/kdevappwizard/template-common/COPYING.LIB
 share/apps/kdevappwizard/template-common/LICENSE.BSD
 share/apps/kdevappwizard/template-common/LICENSE.QPL