[Midnightbsd-cvs] mports: devel/kdevelop: update kdevelop to 3.5.0.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Dec 30 16:35:27 EST 2007
Log Message:
-----------
update kdevelop to 3.5.0.
Modified Files:
--------------
mports/devel/kdevelop:
Makefile (r1.1 -> r1.2)
distinfo (r1.1 -> r1.2)
pkg-descr (r1.1 -> r1.2)
pkg-message (r1.1 -> r1.2)
pkg-plist (r1.1 -> r1.2)
mports/devel/kdevelop/files:
patch-appwizard-libtool (r1.1 -> r1.2)
Added Files:
-----------
mports/devel/kdevelop/files:
patch-admin-detect-autoconf.pl (r1.1)
patch-languages_cpp_cppsupportpart.cpp (r1.1)
patch-post-3.5.8-kdevelop-qmake-scope (r1.1)
patch-vcs_clearcase-clearcasemanipulator (r1.1)
-------------- next part --------------
Index: pkg-message
===================================================================
RCS file: /home/cvs/mports/devel/kdevelop/pkg-message,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/kdevelop/pkg-message -L devel/kdevelop/pkg-message -u -r1.1 -r1.2
--- devel/kdevelop/pkg-message
+++ devel/kdevelop/pkg-message
@@ -1,4 +1,3 @@
-*****************************************************
The following ports are optional, but the suggested
programs to complement KDevelop.
@@ -7,5 +6,3 @@
- textproc/glimpse
- print/a2ps-*
- print/enscript-*
-
-*****************************************************
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/devel/kdevelop/pkg-descr,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/kdevelop/pkg-descr -L devel/kdevelop/pkg-descr -u -r1.1 -r1.2
--- devel/kdevelop/pkg-descr
+++ devel/kdevelop/pkg-descr
@@ -1,10 +1,4 @@
-KDevelop is a complete IDE, made primarily for
-the K Desktop Environment. It seems to be quite
-comparable to CodeWarrior Pro on Windows/MacOS.
-Paired with kdbg, ktranslator, and other helper
-apps, it makes one heck of a powerful KDE/Qt
-application developer.
+KDevelop is an integrated evelopment environment for a wide variety of
+programming tasks with a special focus on Qt and KDE applications.
WWW: http://www.kdevelop.org/
-
-- Will <andrews at technologist.com>
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/devel/kdevelop/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/kdevelop/pkg-plist -L devel/kdevelop/pkg-plist -u -r1.1 -r1.2
--- devel/kdevelop/pkg-plist
+++ devel/kdevelop/pkg-plist
@@ -5,15 +5,10 @@
bin/kdevelop-htdig
bin/kdevprj2kdevelop
bin/kdevprofileeditor
-bin/r++
include/kdevelop/buildtools/base/kdevbuildtool.h
include/kdevelop/buildtools/parsers/qmake/qmakeast.h
include/kdevelop/buildtools/parsers/qmake/qmakeastvisitor.h
include/kdevelop/buildtools/parsers/qmake/qmakedriver.h
-include/kdevelop/buildtools/projectmanager/interfaces/kdevprojectbuilder.h
-include/kdevelop/buildtools/projectmanager/interfaces/kdevprojecteditor.h
-include/kdevelop/buildtools/projectmanager/interfaces/kdevprojectimporter.h
-include/kdevelop/buildtools/projectmanager/interfaces/kdevprojectmodel.h
include/kdevelop/buildtools/widgets/addenvvardlg.h
include/kdevelop/buildtools/widgets/addfilesdialog.h
include/kdevelop/buildtools/widgets/environmentvariableswidget.h
@@ -30,10 +25,13 @@
include/kdevelop/catalog/catalog.h
include/kdevelop/catalog/tag.h
include/kdevelop/cppparser/ast.h
+include/kdevelop/cppparser/cachemanager.h
include/kdevelop/cppparser/driver.h
include/kdevelop/cppparser/errors.h
include/kdevelop/cppparser/lexer.h
+include/kdevelop/cppparser/lexercache.h
include/kdevelop/cppparser/lookup.h
+include/kdevelop/cppparser/macro.h
include/kdevelop/cppparser/parser.h
include/kdevelop/cppparser/tree_parser.h
include/kdevelop/interfaces/KDevCoreIface.h
@@ -41,16 +39,19 @@
include/kdevelop/interfaces/codemodel.h
include/kdevelop/interfaces/codemodel_treeparser.h
include/kdevelop/interfaces/codemodel_utils.h
+include/kdevelop/interfaces/extensions/codebrowserfrontend.h
include/kdevelop/interfaces/extensions/dcop/KDevAppFrontendIface.h
include/kdevelop/interfaces/extensions/dcop/KDevMakeFrontendIface.h
include/kdevelop/interfaces/extensions/kdevappfrontend.h
include/kdevelop/interfaces/extensions/kdevcreatefile.h
include/kdevelop/interfaces/extensions/kdevdifffrontend.h
include/kdevelop/interfaces/extensions/kdevmakefrontend.h
+include/kdevelop/interfaces/extensions/kdevquickopen.h
include/kdevelop/interfaces/extensions/kdevsourceformatter.h
include/kdevelop/interfaces/extensions/kdevversioncontrol.h
include/kdevelop/interfaces/extras/kdevcompileroptions.h
include/kdevelop/interfaces/extras/kdevvcsintegrator.h
+include/kdevelop/interfaces/hashedstring.h
include/kdevelop/interfaces/katedocumentmanagerinterface.h
include/kdevelop/interfaces/kdevapi.h
include/kdevelop/interfaces/kdevcoderepository.h
@@ -111,9 +112,8 @@
include/kdevelop/shell/languageselectwidget.h
include/kdevelop/shell/mainwindowshare.h
include/kdevelop/shell/mimewarningdialog.h
-include/kdevelop/shell/newmainwindow.h
+include/kdevelop/shell/multibuffer.h
include/kdevelop/shell/partcontroller.h
-include/kdevelop/shell/partselectwidget.h
include/kdevelop/shell/plugincontroller.h
include/kdevelop/shell/profileengine/profile.h
include/kdevelop/shell/profileengine/profileengine.h
@@ -132,6 +132,7 @@
include/kdevelop/util/kscriptactionmanager.h
include/kdevelop/util/rurl.h
include/kdevelop/util/urlutil.h
+include/kdevelop/widgets/fancylistviewitem.h
include/kdevelop/widgets/flagboxes.h
include/kdevelop/widgets/kcomboview.h
include/kdevelop/widgets/kdevhtmlpart.h
@@ -143,9 +144,18 @@
include/kdevelop/widgets/resizablecombo.h
include/kinterfacedesigner/designer.h
lib/kconf_update_bin/kdev-gen-settings-kconf_update
+lib/kde3/kded_kdevsvnd.a
+lib/kde3/kded_kdevsvnd.la
+lib/kde3/kded_kdevsvnd.so
lib/kde3/kio_chm.a
lib/kde3/kio_chm.la
lib/kde3/kio_chm.so
+lib/kde3/kio_csharpdoc.a
+lib/kde3/kio_csharpdoc.la
+lib/kde3/kio_csharpdoc.so
+lib/kde3/kio_kdevsvn.a
+lib/kde3/kio_kdevsvn.la
+lib/kde3/kio_kdevsvn.so
lib/kde3/kio_perldoc.a
lib/kde3/kio_perldoc.la
lib/kde3/kio_perldoc.so
@@ -158,9 +168,21 @@
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/libdoccustomplugin.a
lib/kde3/libdoccustomplugin.la
lib/kde3/libdoccustomplugin.so
+lib/kde3/libdocdevhelpplugin.a
+lib/kde3/libdocdevhelpplugin.la
+lib/kde3/libdocdevhelpplugin.so
+lib/kde3/libdocdoxygenplugin.a
+lib/kde3/libdocdoxygenplugin.la
+lib/kde3/libdocdoxygenplugin.so
+lib/kde3/libdockdevtocplugin.a
+lib/kde3/libdockdevtocplugin.la
+lib/kde3/libdockdevtocplugin.so
lib/kde3/libdocqtplugin.a
lib/kde3/libdocqtplugin.la
lib/kde3/libdocqtplugin.so
@@ -206,9 +228,15 @@
lib/kde3/libkdevcppsupport.a
lib/kde3/libkdevcppsupport.la
lib/kde3/libkdevcppsupport.so
+lib/kde3/libkdevcsharpsupport.a
+lib/kde3/libkdevcsharpsupport.la
+lib/kde3/libkdevcsharpsupport.so
lib/kde3/libkdevctags2.a
lib/kde3/libkdevctags2.la
lib/kde3/libkdevctags2.so
+lib/kde3/libkdevcustompcsimporter.a
+lib/kde3/libkdevcustompcsimporter.la
+lib/kde3/libkdevcustompcsimporter.so
lib/kde3/libkdevcustomproject.a
lib/kde3/libkdevcustomproject.la
lib/kde3/libkdevcustomproject.so
@@ -269,24 +297,15 @@
lib/kde3/libkdevgccoptions.a
lib/kde3/libkdevgccoptions.la
lib/kde3/libkdevgccoptions.so
-lib/kde3/libkdevghcoptions.a
-lib/kde3/libkdevghcoptions.la
-lib/kde3/libkdevghcoptions.so
lib/kde3/libkdevgrepview.a
lib/kde3/libkdevgrepview.la
lib/kde3/libkdevgrepview.so
-lib/kde3/libkdevhaskellproject.a
-lib/kde3/libkdevhaskellproject.la
-lib/kde3/libkdevhaskellproject.so
-lib/kde3/libkdevhaskellsupport.a
-lib/kde3/libkdevhaskellsupport.la
-lib/kde3/libkdevhaskellsupport.so
-lib/kde3/libkdevjavadebugger.a
-lib/kde3/libkdevjavadebugger.la
-lib/kde3/libkdevjavadebugger.so
lib/kde3/libkdevjavasupport.a
lib/kde3/libkdevjavasupport.la
lib/kde3/libkdevjavasupport.so
+lib/kde3/libkdevkdelibsimporter.a
+lib/kde3/libkdevkdelibsimporter.la
+lib/kde3/libkdevkdelibsimporter.so
lib/kde3/libkdevkonsoleview.a
lib/kde3/libkdevkonsoleview.la
lib/kde3/libkdevkonsoleview.so
@@ -317,12 +336,15 @@
lib/kde3/libkdevphpsupport.a
lib/kde3/libkdevphpsupport.la
lib/kde3/libkdevphpsupport.so
-lib/kde3/libkdevprojectmanager.a
-lib/kde3/libkdevprojectmanager.la
-lib/kde3/libkdevprojectmanager.so
lib/kde3/libkdevpythonsupport.a
lib/kde3/libkdevpythonsupport.la
lib/kde3/libkdevpythonsupport.so
+lib/kde3/libkdevqt4importer.a
+lib/kde3/libkdevqt4importer.la
+lib/kde3/libkdevqt4importer.so
+lib/kde3/libkdevqtimporter.a
+lib/kde3/libkdevqtimporter.la
+lib/kde3/libkdevqtimporter.so
lib/kde3/libkdevquickopen.a
lib/kde3/libkdevquickopen.la
lib/kde3/libkdevquickopen.so
@@ -344,9 +366,6 @@
lib/kde3/libkdevscriptproject.a
lib/kde3/libkdevscriptproject.la
lib/kde3/libkdevscriptproject.so
-lib/kde3/libkdevsecurity.a
-lib/kde3/libkdevsecurity.la
-lib/kde3/libkdevsecurity.so
lib/kde3/libkdevsnippet.a
lib/kde3/libkdevsnippet.la
lib/kde3/libkdevsnippet.so
@@ -380,9 +399,6 @@
lib/kde3/libperforceintegrator.a
lib/kde3/libperforceintegrator.la
lib/kde3/libperforceintegrator.so
-lib/kde3/libqeditorpart.a
-lib/kde3/libqeditorpart.la
-lib/kde3/libqeditorpart.so
lib/kde3/libsubversionintegrator.a
lib/kde3/libsubversionintegrator.la
lib/kde3/libsubversionintegrator.so
@@ -394,29 +410,14 @@
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
lib/libdocumentation_interfaces.so.0
-lib/libkdevautomakeimporter.a
-lib/libkdevautomakeimporter.la
-lib/libkdevautomakeimporter.so
+lib/libgdbmi_parser.a
+lib/libgdbmi_parser.la
+lib/libgdbmi_parser.so
+lib/libgdbmi_parser.so.0
lib/libkdevbuildbase.a
lib/libkdevbuildbase.la
lib/libkdevbuildbase.so
@@ -433,12 +434,6 @@
lib/libkdevcppparser.la
lib/libkdevcppparser.so
lib/libkdevcppparser.so.0
-lib/libkdevcustomimporter.a
-lib/libkdevcustomimporter.la
-lib/libkdevcustomimporter.so
-lib/libkdevcustompcsimporter.a
-lib/libkdevcustompcsimporter.la
-lib/libkdevcustompcsimporter.so
lib/libkdevelop.a
lib/libkdevelop.la
lib/libkdevelop.so
@@ -447,12 +442,6 @@
lib/libkdevextras.la
lib/libkdevextras.so
lib/libkdevextras.so.0
-lib/libkdevkdelibsimporter.a
-lib/libkdevkdelibsimporter.la
-lib/libkdevkdelibsimporter.so
-lib/libkdevmakebuilder.a
-lib/libkdevmakebuilder.la
-lib/libkdevmakebuilder.so
lib/libkdevpropertyeditor.a
lib/libkdevpropertyeditor.la
lib/libkdevpropertyeditor.so
@@ -461,9 +450,6 @@
lib/libkdevqmakeparser.la
lib/libkdevqmakeparser.so
lib/libkdevqmakeparser.so.0
-lib/libkdevqtimporter.a
-lib/libkdevqtimporter.la
-lib/libkdevqtimporter.so
lib/libkdevshell.a
lib/libkdevshell.la
lib/libkdevshell.so
@@ -488,13 +474,6 @@
lib/libprofileengine.la
lib/libprofileengine.so
lib/libprofileengine.so.0
-lib/libprojectmanager_interfaces.a
-lib/libprojectmanager_interfaces.la
-lib/libprojectmanager_interfaces.so
-lib/libprojectmanager_interfaces.so.1
-lib/libqmakeimporter.a
-lib/libqmakeimporter.la
-lib/libqmakeimporter.so
share/applications/kde/kdevassistant.desktop
share/applications/kde/kdevdesigner.desktop
share/applications/kde/kdevelop.desktop
@@ -509,12 +488,15 @@
share/apps/kdevabbrev/templates/cpptemplates
share/apps/kdevabbrev/templates/pascaltemplates
share/apps/kdevabbrev/templates/phptemplates
+share/apps/kdevabbrev/templates/rubytemplates
share/apps/kdevadaproject/kdevadaproject.rc
share/apps/kdevadasupport/kdevadasupport.rc
share/apps/kdevantproject/kdevantproject.rc
share/apps/kdevappoutputview/kdevmakeview.rc
share/apps/kdevappwizard/adahello.png
share/apps/kdevappwizard/adahello.tar.gz
+share/apps/kdevappwizard/automakeempty.png
+share/apps/kdevappwizard/automakeempty.tar.gz
share/apps/kdevappwizard/bashhello.png
share/apps/kdevappwizard/bashhello.tar.gz
share/apps/kdevappwizard/chello.png
@@ -549,12 +531,8 @@
share/apps/kdevappwizard/fpchello.tar.gz
share/apps/kdevappwizard/fpcsharedlib.png
share/apps/kdevappwizard/fpcsharedlib.tar.gz
-share/apps/kdevappwizard/gnomeapp.png
-share/apps/kdevappwizard/gnomeapp.tar.gz
share/apps/kdevappwizard/gtk2mmapp.png
share/apps/kdevappwizard/gtk2mmapp.tar.gz
-share/apps/kdevappwizard/haskellhello.png
-share/apps/kdevappwizard/haskellhello.tar.gz
share/apps/kdevappwizard/importfiles/ada.kdevelop
share/apps/kdevappwizard/importfiles/c-auto.kdevelop
share/apps/kdevappwizard/importfiles/c.kdevelop
@@ -571,6 +549,7 @@
share/apps/kdevappwizard/importfiles/perl.kdevelop
share/apps/kdevappwizard/importfiles/php.kdevelop
share/apps/kdevappwizard/importfiles/python.kdevelop
+share/apps/kdevappwizard/importfiles/qt4qmake.kdevelop
share/apps/kdevappwizard/importfiles/qtqmake.kdevelop
share/apps/kdevappwizard/importfiles/qttmake.kdevelop
share/apps/kdevappwizard/importfiles/ruby.kdevelop
@@ -590,6 +569,7 @@
share/apps/kdevappwizard/imports/perl
share/apps/kdevappwizard/imports/php
share/apps/kdevappwizard/imports/python
+share/apps/kdevappwizard/imports/qt4qmake
share/apps/kdevappwizard/imports/qtqmake
share/apps/kdevappwizard/imports/qttmake
share/apps/kdevappwizard/imports/ruby
@@ -605,12 +585,12 @@
share/apps/kdevappwizard/kateplugin.tar.gz
share/apps/kdevappwizard/kateplugin2.png
share/apps/kdevappwizard/kateplugin2.tar.gz
-share/apps/kdevappwizard/kbearimportfilter.png
-share/apps/kdevappwizard/kbearimportfilter.tar.gz
-share/apps/kdevappwizard/kbearplugin.png
-share/apps/kdevappwizard/kbearplugin.tar.gz
share/apps/kdevappwizard/kcmodule.png
share/apps/kdevappwizard/kcmodule.tar.gz
+share/apps/kdevappwizard/kconfig35.png
+share/apps/kdevappwizard/kconfig35.tar.gz
+share/apps/kdevappwizard/kde4app.png
+share/apps/kdevappwizard/kde4app.tar.gz
share/apps/kdevappwizard/kdedcop.png
share/apps/kdevappwizard/kdedcop.tar.gz
share/apps/kdevappwizard/kdevappwizard.rc
@@ -650,6 +630,8 @@
share/apps/kdevappwizard/kxt.tar.gz
share/apps/kdevappwizard/kxtruby.png
share/apps/kdevappwizard/kxtruby.tar.gz
+share/apps/kdevappwizard/makefileempty.png
+share/apps/kdevappwizard/makefileempty.tar.gz
share/apps/kdevappwizard/noatunui.png
share/apps/kdevappwizard/noatunui.tar.gz
share/apps/kdevappwizard/noatunvisual.png
@@ -680,8 +662,16 @@
share/apps/kdevappwizard/pytk.tar.gz
share/apps/kdevappwizard/qmakeapp.png
share/apps/kdevappwizard/qmakeapp.tar.gz
+share/apps/kdevappwizard/qmakeempty.png
+share/apps/kdevappwizard/qmakeempty.tar.gz
share/apps/kdevappwizard/qmakesimple.png
share/apps/kdevappwizard/qmakesimple.tar.gz
+share/apps/kdevappwizard/qt4hello.png
+share/apps/kdevappwizard/qt4hello.tar.gz
+share/apps/kdevappwizard/qt4makeapp.png
+share/apps/kdevappwizard/qt4makeapp.tar.gz
+share/apps/kdevappwizard/qtopia4app.png
+share/apps/kdevappwizard/qtopia4app.tar.gz
share/apps/kdevappwizard/qtopiaapp.png
share/apps/kdevappwizard/qtopiaapp.tar.gz
share/apps/kdevappwizard/qtruby.png
@@ -735,6 +725,7 @@
share/apps/kdevappwizard/template-common/wx-configure.in
share/apps/kdevappwizard/template-common/wxwidgets.tar.gz
share/apps/kdevappwizard/templates/adahello.kdevtemplate
+share/apps/kdevappwizard/templates/automakeempty.kdevtemplate
share/apps/kdevappwizard/templates/bashhello.kdevtemplate
share/apps/kdevappwizard/templates/chello.kdevtemplate
share/apps/kdevappwizard/templates/chellogba.kdevtemplate
@@ -752,18 +743,16 @@
share/apps/kdevappwizard/templates/fpcgtk.kdevtemplate
share/apps/kdevappwizard/templates/fpchello.kdevtemplate
share/apps/kdevappwizard/templates/fpcsharedlib.kdevtemplate
-share/apps/kdevappwizard/templates/gnomeapp.kdevtemplate
share/apps/kdevappwizard/templates/gtk2mmapp.kdevtemplate
-share/apps/kdevappwizard/templates/haskellhello.kdevtemplate
share/apps/kdevappwizard/templates/javahello.kdevtemplate
share/apps/kdevappwizard/templates/kapp.kdevtemplate
share/apps/kdevappwizard/templates/kappjava.kdevtemplate
share/apps/kdevappwizard/templates/kappruby.kdevtemplate
share/apps/kdevappwizard/templates/kateplugin.kdevtemplate
share/apps/kdevappwizard/templates/kateplugin2.kdevtemplate
-share/apps/kdevappwizard/templates/kbearimportfilter.kdevtemplate
-share/apps/kdevappwizard/templates/kbearplugin.kdevtemplate
share/apps/kdevappwizard/templates/kcmodule.kdevtemplate
+share/apps/kdevappwizard/templates/kconfig35.kdevtemplate
+share/apps/kdevappwizard/templates/kde4app.kdevtemplate
share/apps/kdevappwizard/templates/kdedcop.kdevtemplate
share/apps/kdevappwizard/templates/kdevlang.kdevtemplate
share/apps/kdevappwizard/templates/kdevpart.kdevtemplate
@@ -783,6 +772,7 @@
share/apps/kdevappwizard/templates/kscreensaver.kdevtemplate
share/apps/kdevappwizard/templates/kxt.kdevtemplate
share/apps/kdevappwizard/templates/kxtruby.kdevtemplate
+share/apps/kdevappwizard/templates/makefileempty.kdevtemplate
share/apps/kdevappwizard/templates/noatunui.kdevtemplate
share/apps/kdevappwizard/templates/noatunvisual.kdevtemplate
share/apps/kdevappwizard/templates/opieapp.kdevtemplate
@@ -798,7 +788,11 @@
share/apps/kdevappwizard/templates/pythonhello.kdevtemplate
share/apps/kdevappwizard/templates/pytk.kdevtemplate
share/apps/kdevappwizard/templates/qmakeapp.kdevtemplate
+share/apps/kdevappwizard/templates/qmakeempty.kdevtemplate
share/apps/kdevappwizard/templates/qmakesimple.kdevtemplate
+share/apps/kdevappwizard/templates/qt4hello.kdevtemplate
+share/apps/kdevappwizard/templates/qt4makeapp.kdevtemplate
+share/apps/kdevappwizard/templates/qtopia4app.kdevtemplate
share/apps/kdevappwizard/templates/qtopiaapp.kdevtemplate
share/apps/kdevappwizard/templates/qtruby.kdevtemplate
share/apps/kdevappwizard/templates/qtrubyapp.kdevtemplate
@@ -857,10 +851,13 @@
share/apps/kdevcppsupport/newclass/gtk_source
share/apps/kdevcppsupport/newclass/objc_header
share/apps/kdevcppsupport/newclass/objc_source
+share/apps/kdevcppsupport/subclassing/subclass_qt4_template.cpp
+share/apps/kdevcppsupport/subclassing/subclass_qt4_template.h
share/apps/kdevcppsupport/subclassing/subclass_template.cpp
share/apps/kdevcppsupport/subclassing/subclass_template.h
share/apps/kdevcppsupport/templates/default.cpp
share/apps/kdevcppsupport/templates/default.h
+share/apps/kdevcsharpsupport/kdevcsharpsupport.rc
share/apps/kdevctags2/kdevpart_ctags2.rc
share/apps/kdevcustomproject/kdevcustomproject.rc
share/apps/kdevcvsservice/buildcvs.sh
@@ -1122,11 +1119,10 @@
share/apps/kdevdocumentation/tocs/gnome1.toc
share/apps/kdevdocumentation/tocs/gnustep.toc
share/apps/kdevdocumentation/tocs/gtk_bugs.toc
-share/apps/kdevdocumentation/tocs/haskell.toc
-share/apps/kdevdocumentation/tocs/haskell_bugs_ghc.toc
share/apps/kdevdocumentation/tocs/java_bugs_gcc.toc
share/apps/kdevdocumentation/tocs/java_bugs_sun.toc
share/apps/kdevdocumentation/tocs/kde2book.toc
+share/apps/kdevdocumentation/tocs/kdetemplates.toc
share/apps/kdevdocumentation/tocs/kdev3api.toc
share/apps/kdevdocumentation/tocs/libc.toc
share/apps/kdevdocumentation/tocs/libstdc++.toc
@@ -1160,10 +1156,15 @@
share/apps/kdevelop/icons/hicolor/16x16/actions/newwidget.png
share/apps/kdevelop/icons/hicolor/16x16/actions/project_open.png
share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_app.png
+share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_app_disabled.png
+share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_func_scope.png
+share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_inc_scope.png
share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_lib.png
+share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_lib_disabled.png
share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_scope.png
share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_scopenew.png
share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_sub.png
+share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_sub_disabled.png
share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_subclass.png
share/apps/kdevelop/icons/hicolor/16x16/actions/qmake_ui_h.png
share/apps/kdevelop/icons/hicolor/16x16/actions/qmakerun.png
@@ -1225,7 +1226,6 @@
share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/profile.config
share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/FortranIDE/fortran.appwizard
share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/FortranIDE/profile.config
-share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/HaskellIDE/haskell.appwizard
share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/HaskellIDE/profile.config
share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/JavaIDE/java.appwizard
share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/JavaIDE/profile.config
@@ -1234,6 +1234,7 @@
share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/profile.config
share/apps/kdevelop/profiles/IDE/DatabaseIDE/profile.config
share/apps/kdevelop/profiles/IDE/DatabaseIDE/sql.appwizard
+share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/CSharpIDE/csharp.appwizard
share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PHPIDE/php.appwizard
share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PHPIDE/profile.config
share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PerlIDE/perl.appwizard
@@ -1249,11 +1250,11 @@
share/apps/kdevelop/profiles/KDevAssistant/profile.config
share/apps/kdevelop/profiles/profile.config
share/apps/kdevelop/profiles/projectprofiles
-share/apps/kdevfilecreate/file-templates/F
share/apps/kdevfilecreate/file-templates/adb
share/apps/kdevfilecreate/file-templates/ads
share/apps/kdevfilecreate/file-templates/c
share/apps/kdevfilecreate/file-templates/cpp
+share/apps/kdevfilecreate/file-templates/css
share/apps/kdevfilecreate/file-templates/dox
share/apps/kdevfilecreate/file-templates/dpr
share/apps/kdevfilecreate/file-templates/f
@@ -1264,8 +1265,8 @@
share/apps/kdevfilecreate/file-templates/fpp
share/apps/kdevfilecreate/file-templates/ftn
share/apps/kdevfilecreate/file-templates/h
-share/apps/kdevfilecreate/file-templates/hs
share/apps/kdevfilecreate/file-templates/java
+share/apps/kdevfilecreate/file-templates/js
share/apps/kdevfilecreate/file-templates/l
share/apps/kdevfilecreate/file-templates/ll
share/apps/kdevfilecreate/file-templates/pas-program
@@ -1276,17 +1277,25 @@
share/apps/kdevfilecreate/file-templates/pp-program
share/apps/kdevfilecreate/file-templates/pp-unit
share/apps/kdevfilecreate/file-templates/py
+share/apps/kdevfilecreate/file-templates/qrc
share/apps/kdevfilecreate/file-templates/rb
share/apps/kdevfilecreate/file-templates/rhtml
+share/apps/kdevfilecreate/file-templates/rjs
+share/apps/kdevfilecreate/file-templates/rxml
share/apps/kdevfilecreate/file-templates/ts
share/apps/kdevfilecreate/file-templates/ui
share/apps/kdevfilecreate/file-templates/ui-confdialog
share/apps/kdevfilecreate/file-templates/ui-dialog
+share/apps/kdevfilecreate/file-templates/ui-dialog-qt4
share/apps/kdevfilecreate/file-templates/ui-dialogb
+share/apps/kdevfilecreate/file-templates/ui-dialogb-qt4
share/apps/kdevfilecreate/file-templates/ui-dialogr
+share/apps/kdevfilecreate/file-templates/ui-dialogr-qt4
share/apps/kdevfilecreate/file-templates/ui-mainwin
+share/apps/kdevfilecreate/file-templates/ui-mainwin-qt4
share/apps/kdevfilecreate/file-templates/ui-tabdialog
share/apps/kdevfilecreate/file-templates/ui-widget
+share/apps/kdevfilecreate/file-templates/ui-widget-qt4
share/apps/kdevfilecreate/file-templates/ui-wizard
share/apps/kdevfilecreate/file-templates/y
share/apps/kdevfilecreate/file-templates/yy
@@ -1298,9 +1307,6 @@
share/apps/kdevfullscreen/kdevpart_fullscreen.rc
share/apps/kdevgrepview/icons/hicolor/22x22/actions/grep.png
share/apps/kdevgrepview/kdevgrepview.rc
-share/apps/kdevhaskellproject/kdevhaskellproject.rc
-share/apps/kdevhaskellsupport/kdevhaskellsupport.rc
-share/apps/kdevjavadebugger/kdevjavadebugger.rc
share/apps/kdevjavasupport/kdevjavasupport.rc
share/apps/kdevmakeview/kdevmakeview.rc
share/apps/kdevpartexplorer/kdevpartexplorer.rc
@@ -1309,7 +1315,6 @@
share/apps/kdevperlsupport/kdevperlsupport.rc
share/apps/kdevphpsupport/kdevphpsupport.rc
share/apps/kdevphpsupport/phpfunctions
-share/apps/kdevprojectmanager/kdevprojectmanager.rc
share/apps/kdevpythonsupport/kdevpythonsupport.rc
share/apps/kdevquickopen/kdevpart_quickopen.rc
share/apps/kdevrbdebugger/debuggee.rb
@@ -1328,29 +1333,23 @@
share/apps/kdevrubysupport/pics/ruby_run.png
share/apps/kdevscripting/kdevscripting.rc
share/apps/kdevscriptproject/kdevscriptproject.rc
-share/apps/kdevsecurity/patterns
+share/apps/kdevsnippet/kdevpart_snippet.rc
share/apps/kdevsqlsupport/kdevsqlsupport.rc
share/apps/kdevtipofday/kdevpart_tipofday.rc
share/apps/kdevtipofday/tips
share/apps/kdevtools/kdevpart_tools.rc
share/apps/kdevtrollproject/kdevtrollproject.rc
share/apps/kdevvalgrind/kdevpart_valgrind.rc
-share/apps/kio_pydoc/kde_inspect.py
share/apps/kio_pydoc/kde_pydoc.py
-share/apps/qeditorpart/highlight/highlighting.xml
-share/apps/qeditorpart/highlight/qt.xml
-share/apps/qeditorpart/qeditor_part.rc
share/config/kdevassistantrc
share/config/kdeveloprc
share/desktop-directories/kde-development-kdevelop.directory
-share/doc/HTML/en/kde_app_devel/CMakeLists.txt
share/doc/HTML/en/kde_app_devel/appwizard.png
share/doc/HTML/en/kde_app_devel/common
share/doc/HTML/en/kde_app_devel/index.cache.bz2
share/doc/HTML/en/kde_app_devel/index.docbook
share/doc/HTML/en/kde_app_devel/kscribblefiles.png
share/doc/HTML/en/kdevelop-apidocs/common
-share/doc/HTML/en/kdevelop/CMakeLists.txt
share/doc/HTML/en/kdevelop/SF-general.png
share/doc/HTML/en/kdevelop/SF-indent.png
share/doc/HTML/en/kdevelop/SF-other.png
@@ -1366,6 +1365,10 @@
share/doc/HTML/en/kdevelop/automake-subproject-popup.png
share/doc/HTML/en/kdevelop/automake-target-popup.png
share/doc/HTML/en/kdevelop/automakemanager.png
+share/doc/HTML/en/kdevelop/build-commands.png
+share/doc/HTML/en/kdevelop/build-configurations.png
+share/doc/HTML/en/kdevelop/build-menu-automake.png
+share/doc/HTML/en/kdevelop/build-menu.png
share/doc/HTML/en/kdevelop/class-browsers.docbook
share/doc/HTML/en/kdevelop/classview.png
share/doc/HTML/en/kdevelop/commands.docbook
@@ -1384,15 +1387,25 @@
share/doc/HTML/en/kdevelop/configure-docu-dox.png
share/doc/HTML/en/kdevelop/configure-docu-edit.png
share/doc/HTML/en/kdevelop/configure-docu-general.png
+share/doc/HTML/en/kdevelop/configure-docu-indexgen.png
share/doc/HTML/en/kdevelop/configure-docu-toc.png
share/doc/HTML/en/kdevelop/configure-editor.png
share/doc/HTML/en/kdevelop/configure-file-selector.png
+share/doc/HTML/en/kdevelop/configure-file-templates.png
share/doc/HTML/en/kdevelop/configure-general.png
+share/doc/HTML/en/kdevelop/configure-project-buildconfig.png
+share/doc/HTML/en/kdevelop/configure-project-configure.png
+share/doc/HTML/en/kdevelop/configure-project-cpp.png
+share/doc/HTML/en/kdevelop/configure-project-cppoptions.png
share/doc/HTML/en/kdevelop/configure-project-doc.png
+share/doc/HTML/en/kdevelop/configure-project-make.png
+share/doc/HTML/en/kdevelop/configure-project-run.png
share/doc/HTML/en/kdevelop/configure-select.png
share/doc/HTML/en/kdevelop/configure-snippets.png
share/doc/HTML/en/kdevelop/create-new-project-cvs.png
+share/doc/HTML/en/kdevelop/create-new-project.png
share/doc/HTML/en/kdevelop/createnewproject.png
+share/doc/HTML/en/kdevelop/createnewprojectoptions.png
share/doc/HTML/en/kdevelop/credits.docbook
share/doc/HTML/en/kdevelop/cvs.docbook
share/doc/HTML/en/kdevelop/debugger.docbook
@@ -1402,18 +1415,31 @@
share/doc/HTML/en/kdevelop/doctreeview.png
share/doc/HTML/en/kdevelop/documentation.docbook
share/doc/HTML/en/kdevelop/documents-contents.png
+share/doc/HTML/en/kdevelop/documents-search.png
share/doc/HTML/en/kdevelop/edit-doctree-TOC-entry.png
share/doc/HTML/en/kdevelop/editing.docbook
+share/doc/HTML/en/kdevelop/editor-ctags-lookup.png
+share/doc/HTML/en/kdevelop/editor-ctags-menu.png
+share/doc/HTML/en/kdevelop/editor-ctags-regenerate.png
+share/doc/HTML/en/kdevelop/editor-find-menu.png
+share/doc/HTML/en/kdevelop/editor-search-doc.png
+share/doc/HTML/en/kdevelop/editor-switch-header.png
share/doc/HTML/en/kdevelop/empty-ide.png
share/doc/HTML/en/kdevelop/file-browsers.docbook
+share/doc/HTML/en/kdevelop/file-list-close-selected.png
+share/doc/HTML/en/kdevelop/file-list-session-create.png
+share/doc/HTML/en/kdevelop/file-list-session-default.png
share/doc/HTML/en/kdevelop/file-selector.png
share/doc/HTML/en/kdevelop/filetree.png
+share/doc/HTML/en/kdevelop/find-in-files.png
share/doc/HTML/en/kdevelop/folded-tabs.png
share/doc/HTML/en/kdevelop/getting-started.docbook
+share/doc/HTML/en/kdevelop/hello-world-app.png
share/doc/HTML/en/kdevelop/importdirectory.png
share/doc/HTML/en/kdevelop/index.cache.bz2
share/doc/HTML/en/kdevelop/index.docbook
share/doc/HTML/en/kdevelop/kdcop_browsing.png
+share/doc/HTML/en/kdevelop/kdevdesigner.png
share/doc/HTML/en/kdevelop/kdevelop-ideal-mode-0.png
share/doc/HTML/en/kdevelop/kdevelop-ideal-mode.png
share/doc/HTML/en/kdevelop/kdevelop-install.docbook
@@ -1428,13 +1454,26 @@
share/doc/HTML/en/kdevelop/open-project.png
share/doc/HTML/en/kdevelop/open-recent-project.png
share/doc/HTML/en/kdevelop/plugin-tools.docbook
+share/doc/HTML/en/kdevelop/problem-report-all-todos.png
+share/doc/HTML/en/kdevelop/problem-report-marks.png
+share/doc/HTML/en/kdevelop/problem-report-todo.png
share/doc/HTML/en/kdevelop/project-advanced.docbook
share/doc/HTML/en/kdevelop/project-management.docbook
+share/doc/HTML/en/kdevelop/raw-project-warning.png
+share/doc/HTML/en/kdevelop/run-button.png
share/doc/HTML/en/kdevelop/script_location.png
share/doc/HTML/en/kdevelop/select-user-interface-0.png
share/doc/HTML/en/kdevelop/select-user-interface.png
share/doc/HTML/en/kdevelop/setup.docbook
+share/doc/HTML/en/kdevelop/split-source-header-navigate.png
+share/doc/HTML/en/kdevelop/split-source-header.png
+share/doc/HTML/en/kdevelop/split-windows.png
+share/doc/HTML/en/kdevelop/split-workspace.png
share/doc/HTML/en/kdevelop/survey-manual.docbook
+share/doc/HTML/en/kdevelop/tutorial-debug-tree.png
+share/doc/HTML/en/kdevelop/tutorial-hello-new.png
+share/doc/HTML/en/kdevelop/tutorial-hello-options.png
+share/doc/HTML/en/kdevelop/tutorial-new-project.png
share/doc/HTML/en/kdevelop/unixdev.docbook
share/doc/HTML/en/kdevelop/wrong-project-location.png
share/icons/hicolor/16x16/actions/breakpoint_add.png
@@ -1458,6 +1497,7 @@
share/mimelnk/application/x-kdevelop.desktop
share/mimelnk/text/x-fortran.desktop
share/services/chm.protocol
+share/services/csharpdoc.protocol
share/services/docchmplugin.desktop
share/services/doccustomplugin.desktop
share/services/docdevhelpplugin.desktop
@@ -1465,6 +1505,7 @@
share/services/dockdevtocplugin.desktop
share/services/docqtplugin.desktop
share/services/kchmpart.desktop
+share/services/kded/kdevsvnd.desktop
share/services/kdevabbrev.desktop
share/services/kdevadaproject.desktop
share/services/kdevadasupport.desktop
@@ -1472,7 +1513,6 @@
share/services/kdevappoutputview.desktop
share/services/kdevappwizard.desktop
share/services/kdevastyle.desktop
-share/services/kdevautomakeimporter.desktop
share/services/kdevautoproject.desktop
share/services/kdevbashsupport.desktop
share/services/kdevbookmarks.desktop
@@ -1480,9 +1520,9 @@
share/services/kdevclearcase.desktop
share/services/kdevclearcaseintegrator.desktop
share/services/kdevcppsupport.desktop
+share/services/kdevcsharpsupport.desktop
share/services/kdevcsupport.desktop
share/services/kdevctags2.desktop
-share/services/kdevcustomimporter.desktop
share/services/kdevcustomproject.desktop
share/services/kdevcvsservice.desktop
share/services/kdevcvsserviceintegrator.desktop
@@ -1505,17 +1545,12 @@
share/services/kdevfullscreen.desktop
share/services/kdevg77options.desktop
share/services/kdevgccoptions.desktop
-share/services/kdevghcoptions.desktop
share/services/kdevgppoptions.desktop
share/services/kdevgrepview.desktop
-share/services/kdevhaskellproject.desktop
-share/services/kdevhaskellsupport.desktop
-share/services/kdevjavadebugger.desktop
share/services/kdevjavasupport.desktop
share/services/kdevkdeautoproject.desktop
share/services/kdevkdelibsimporter.desktop
share/services/kdevkonsoleview.desktop
-share/services/kdevmakebuilder.desktop
share/services/kdevmakeview.desktop
share/services/kdevopenwith.desktop
share/services/kdevpartexplorer.desktop
@@ -1528,9 +1563,8 @@
share/services/kdevpgf77options.desktop
share/services/kdevpghpfoptions.desktop
share/services/kdevphpsupport.desktop
-share/services/kdevprojectmanager.desktop
share/services/kdevpythonsupport.desktop
-share/services/kdevqmakeimporter.desktop
+share/services/kdevqt4importer.desktop
share/services/kdevqtimporter.desktop
share/services/kdevquickopen.desktop
share/services/kdevrbdebugger.desktop
@@ -1539,11 +1573,15 @@
share/services/kdevrubysupport.desktop
share/services/kdevscripting.desktop
share/services/kdevscriptproject.desktop
-share/services/kdevsecurity.desktop
share/services/kdevsnippet.desktop
share/services/kdevsqlsupport.desktop
share/services/kdevsubversion.desktop
share/services/kdevsubversionintegrator.desktop
+share/services/kdevsvn+file.protocol
+share/services/kdevsvn+http.protocol
+share/services/kdevsvn+https.protocol
+share/services/kdevsvn+ssh.protocol
+share/services/kdevsvn+svn.protocol
share/services/kdevtexttools.desktop
share/services/kdevtipofday.desktop
share/services/kdevtmakeproject.desktop
@@ -1554,8 +1592,8 @@
share/services/kdevvcsmanager.desktop
share/services/perldoc.protocol
share/services/pydoc.protocol
-share/services/qeditor_part.desktop
share/servicetypes/kdevelopappfrontend.desktop
+share/servicetypes/kdevelopcodebrowserfrontend.desktop
share/servicetypes/kdevelopcompileroptions.desktop
share/servicetypes/kdevelopcreatefile.desktop
share/servicetypes/kdevelopdifffrontend.desktop
@@ -1565,8 +1603,7 @@
share/servicetypes/kdeveloppcsimporter.desktop
share/servicetypes/kdevelopplugin.desktop
share/servicetypes/kdevelopproject.desktop
-share/servicetypes/kdevelopprojectbuilder.desktop
-share/servicetypes/kdevelopprojectimporter.desktop
+share/servicetypes/kdevelopquickopen.desktop
share/servicetypes/kdevelopsourceformatter.desktop
share/servicetypes/kdevelopvcsintegrator.desktop
share/servicetypes/kdevelopversioncontrol.desktop
@@ -1635,11 +1672,6 @@
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/designer_integration/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/html
- at exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces/html
- at exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces/html
- at exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/html
- at exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces/html
- at exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake/html
@@ -1666,8 +1698,6 @@
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/base/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/html
- at exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces/html
- at exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/util/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/interfaces/extensions/html
@@ -1678,6 +1708,9 @@
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/widgets/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/catalog/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/lib/html
+ at exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/src/profileengine/lib/html
+ at exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/src/profileengine/html
+ at exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/src/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/parts/documentation/interfaces/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/parts/documentation/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/parts/html
@@ -1687,17 +1720,12 @@
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/base/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/html
- at exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces/html
- at exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/buildtools/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/interfaces/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/debugger/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/designer_integration/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/lib/html
@exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/languages/html
- at exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/src/profileengine/lib/html
- at exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/src/profileengine/html
- at exec /bin/mkdir -p %D/share/doc/HTML/en/kdevelop-apidocs/src/html
@exec /bin/mkdir -p %D/share/apps/kdevvcsmanager
@dirrm share/doc/HTML/en/kdevelop-apidocs/src/profileengine/lib/html
@dirrm share/doc/HTML/en/kdevelop-apidocs/src/profileengine/lib
@@ -1739,10 +1767,6 @@
@dirrm share/doc/HTML/en/kdevelop-apidocs/languages/lib
@dirrm share/doc/HTML/en/kdevelop-apidocs/languages/html
@dirrm share/doc/HTML/en/kdevelop-apidocs/languages
- at dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces/html
- at dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/interfaces
- at dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager/html
- at dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/projectmanager
@dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets/html
@dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/widgets
@dirrm share/doc/HTML/en/kdevelop-apidocs/buildtools/lib/parsers/qmake/html
@@ -1760,8 +1784,6 @@
@dirrm share/doc/HTML/en/kdevelop-apidocs
@dirrm share/doc/HTML/en/kdevelop
@dirrm share/doc/HTML/en/kde_app_devel
- at dirrm share/apps/qeditorpart/highlight
- at dirrm share/apps/qeditorpart
@dirrm share/apps/kio_pydoc
@dirrm share/apps/kdevvcsmanager
@dirrm share/apps/kdevvalgrind
@@ -1769,7 +1791,7 @@
@dirrm share/apps/kdevtools
@dirrm share/apps/kdevtipofday
@dirrm share/apps/kdevsqlsupport
- at dirrm share/apps/kdevsecurity
+ at dirrm share/apps/kdevsnippet
@dirrm share/apps/kdevscriptproject
@dirrm share/apps/kdevscripting
@dirrm share/apps/kdevrubysupport/pics
@@ -1783,7 +1805,6 @@
@dirrm share/apps/kdevrbdebugger
@dirrm share/apps/kdevquickopen
@dirrm share/apps/kdevpythonsupport
- at dirrm share/apps/kdevprojectmanager
@dirrm share/apps/kdevphpsupport
@dirrm share/apps/kdevperlsupport
@dirrm share/apps/kdevpascalsupport
@@ -1791,9 +1812,6 @@
@dirrm share/apps/kdevpartexplorer
@dirrm share/apps/kdevmakeview
@dirrm share/apps/kdevjavasupport
- at dirrm share/apps/kdevjavadebugger
- at dirrm share/apps/kdevhaskellsupport
- at dirrm share/apps/kdevhaskellproject
@dirrm share/apps/kdevgrepview/icons/hicolor/22x22/actions
@dirrm share/apps/kdevgrepview/icons/hicolor/22x22
@dirrm share/apps/kdevgrepview/icons/hicolor
@@ -1811,6 +1829,7 @@
@dirrm share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PythonIDE
@dirrm share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PerlIDE
@dirrm share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/PHPIDE
+ at dirrm share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE/CSharpIDE
@dirrm share/apps/kdevelop/profiles/IDE/ScriptingLanguageIDE
@dirrm share/apps/kdevelop/profiles/IDE/DatabaseIDE
@dirrm share/apps/kdevelop/profiles/IDE/CompiledLanguageIDE/PascalIDE
@@ -1858,6 +1877,7 @@
@dirrm share/apps/kdevcvsservice
@dirrm share/apps/kdevcustomproject
@dirrm share/apps/kdevctags2
+ at dirrm share/apps/kdevcsharpsupport
@dirrm share/apps/kdevcppsupport/templates
@dirrm share/apps/kdevcppsupport/subclassing
@dirrm share/apps/kdevcppsupport/newclass
@@ -1907,8 +1927,6 @@
@dirrm include/kdevelop/cppparser
@dirrm include/kdevelop/catalog
@dirrm include/kdevelop/buildtools/widgets
- at dirrm include/kdevelop/buildtools/projectmanager/interfaces
- at dirrm include/kdevelop/buildtools/projectmanager
@dirrm include/kdevelop/buildtools/parsers/qmake
@dirrm include/kdevelop/buildtools/parsers
@dirrm include/kdevelop/buildtools/base
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/kdevelop/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/kdevelop/Makefile -L devel/kdevelop/Makefile -u -r1.1 -r1.2
--- devel/kdevelop/Makefile
+++ devel/kdevelop/Makefile
@@ -2,15 +2,16 @@
# Date created: 12 Aug 1999
# Whom: Will Andrews <andrews at technologist.com>
#
-# $FreeBSD: ports/devel/kdevelop/Makefile,v 1.87 2006/09/12 23:26:15 lofi Exp $
+# $FreeBSD: ports/devel/kdevelop/Makefile,v 1.96 2007/10/29 23:47:28 lofi Exp $
# $MidnightBSD$
#
PORTNAME= kdevelop
-PORTVERSION= 3.3.4
+PORTVERSION= 3.5.0
+PORTREVISION= 0
CATEGORIES?= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${KDE_VERSION:S/.0//}/src
+MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
# DISTNAME= ${KDE_DISTNAME}
DIST_SUBDIR= KDE
@@ -18,40 +19,39 @@
COMMENT= IDE for a wide variety of programming tasks
BUILD_DEPENDS= cervisia:${PORTSDIR}/devel/kdesdk3 \
+ dot:${PORTSDIR}/graphics/graphviz \
msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS= db4:${PORTSDIR}/databases/db4 \
- svn_client-1.0:${PORTSDIR}/devel/subversion
+LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion
RUN_DEPENDS= extractrc:${PORTSDIR}/devel/kdesdk3 \
- gmake:${PORTSDIR}/devel/gmake \
- ${LOCALBASE}/gnu-autotools/bin/automake:${PORTSDIR}/devel/gnu-automake \
- ${LOCALBASE}/gnu-autotools/bin/autoconf:${PORTSDIR}/devel/gnu-autoconf
+ gdb66:${PORTSDIR}/devel/gdb6 \
+ gmake:${PORTSDIR}/devel/gmake
.if defined(WITH_OPTIONAL_DEPENDS)
-RUN_DEPENDS+= kiconedit:${PORTSDIR}/graphics/kdegraphics3 \
- ark:${PORTSDIR}/misc/kdeutils3 \
+RUN_DEPENDS+= ark:${PORTSDIR}/misc/kdeutils3 \
+ a2ps:${PORTSDIR}/print/a2ps-letter \
+ dot:${PORTSDIR}/graphics/graphviz \
glimpse:${PORTSDIR}/textproc/glimpse \
- a2ps:${PORTSDIR}/print/a2ps-letter
+ kiconedit:${PORTSDIR}/graphics/kdegraphics3
.endif
# KDE_DISTNAME= ${PORTNAME}-${PORTVERSION}_for_KDE_3.1
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
USE_KDELIBS_VER=3
USE_BZIP2= yes
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
+USE_BDB= yes
+USE_AUTOTOOLS= libtool:15 autotools:run
+_NO_KDE_FINAL= yes
CONFIGURE_ARGS+=--with-qtdoc-dir=${X11BASE}/share/doc/qt/html \
- --with-db-includedir=${LOCALBASE}/include/db4 \
- --with-db-libdir=${LOCALBASE}/lib --with-db-lib=db4 \
+ --with-db-includedir=${BDB_INCLUDE_DIR} \
+ --with-db-libdir=${BDB_LIB_DIR} --with-db-lib=${BDB_LIB_NAME} \
--with-apr-config=${LOCALBASE}/bin/apr-1-config \
--with-apu-config=${LOCALBASE}/bin/apu-1-config \
- --with-subversion-dir=${LOCALBASE} \
- --with-svn-include=${LOCALBASE}/include \
+ --with-svn-include=${LOCALBASE}/include/subversion-1 \
--with-svn-lib=${LOCALBASE}/lib \
--with-neon-config=${LOCALBASE}/bin/neon-config
-CONFIGURE_ENV+= PATH=${LOCALBASE}/gnu-autotools/bin:${PATH}
-
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.pre.mk>
@@ -72,6 +72,13 @@
s|%%PREFIX%%|${PREFIX}|g ; \
s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' < ${FILESDIR}/kdevelop \
> ${WRKDIR}/kdevelop
+ ${REINPLACE_CMD} -e 's|<gdbpath>.*</gdbpath>|<gdbpath></gdbpath>|g' \
+ -e 's|<dbgshell>.*</dbgshell>|<dbgshell></dbgshell>|g' \
+ ${WRKSRC}/languages/cpp/app_templates/*/*.kdevelop
+ ${REINPLACE_CMD} -e 's|"gdb"|"gdb66"|g' \
+ ${WRKSRC}/languages/cpp/debugger/gdbcontroller.cpp
+ ${REINPLACE_CMD} -E -e 's|(.*shell =.*)libtool|\1libtool --mode=execute|g' \
+ ${WRKSRC}/languages/cpp/debugger/debuggerconfigwidget.cpp
post-install:
@${MV} ${PREFIX}/bin/kdevelop ${PREFIX}/bin/kdevelop-bin
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/devel/kdevelop/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/kdevelop/distinfo -L devel/kdevelop/distinfo -u -r1.1 -r1.2
--- devel/kdevelop/distinfo
+++ 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.5.0.tar.bz2) = 1101077b3a0164da463f60cad4f13e25
+SHA256 (KDE/kdevelop-3.5.0.tar.bz2) = d05afebfc9a8b61ca0fbc6dbe2341d7f6b0762cf76573abdc20d1147068c8aaa
+SIZE (KDE/kdevelop-3.5.0.tar.bz2) = 9415312
--- /dev/null
+++ devel/kdevelop/files/patch-vcs_clearcase-clearcasemanipulator
@@ -0,0 +1,11 @@
+--- vcs/clearcase/clearcasemanipulator.cpp.orig Mon Mar 5 13:06:42 2007
++++ vcs/clearcase/clearcasemanipulator.cpp Mon Mar 5 13:06:56 2007
+@@ -20,7 +20,7 @@
+ #include <libgen.h>
+ #include <errno.h>
+
+-#if defined(Q_OS_MACX) || defined(MACOSX)
++#if defined(Q_OS_MACX) || defined(MACOSX) || defined(Q_OS_FREEBSD)
+ //this function is taken from GNU libc
+ //it does not exist on macos
+ int getline(char **lineptr, size_t *n, FILE *stream)
--- /dev/null
+++ devel/kdevelop/files/patch-post-3.5.8-kdevelop-qmake-scope
@@ -0,0 +1,81 @@
+--- buildtools/qmake/scope.cpp 2007/10/07 14:39:48 722530
++++ buildtools/qmake/scope.cpp 2007/10/11 19:48:00 724231
+@@ -325,13 +325,13 @@
+ return result;
+ }
+
+-void Scope::calcValuesFromStatements( const QString& variable, QStringList& result, bool checkIncParent, QMake::AST* stopHere, bool fetchFromParent ) const
++void Scope::calcValuesFromStatements( const QString& variable, QStringList& result, bool checkIncParent, QMake::AST* stopHere, bool fetchFromParent, bool setDefault ) const
+ {
+ if( !m_root )
+ return;
+
+ /* For variables that we don't know and which are not QT/CONFIG find the default value */
+- if( m_defaultopts
++ if( setDefault && m_defaultopts
+ && m_defaultopts->variables().findIndex(variable) != -1
+ && ( variable == "TEMPLATE" || variable == "QT" || KnownVariables.findIndex(variable) == -1 || variable == "CONFIG" ) )
+ {
+@@ -379,6 +379,42 @@
+ }
+ }
+ }
++ }else if( ast->nodeType() == QMake::AST::IncludeAST )
++ {
++ QMake::IncludeAST* iast = static_cast<QMake::IncludeAST*>(ast);
++ QValueList<unsigned int> l = m_scopes.keys();
++ for( unsigned int i = 0; i < l.count(); ++i )
++ {
++ int num = l[ i ];
++ if( m_scopes.contains( num ) )
++ {
++ Scope* s = m_scopes[num];
++ if( s && s->scopeType() == IncludeScope && s->m_incast == iast )
++ {
++ s->calcValuesFromStatements( variable, result, false, 0, false, false );
++ }
++ }
++ }
++
++ }else if( ast->nodeType() == QMake::AST::ProjectAST )
++ {
++ QMake::ProjectAST* past = static_cast<QMake::ProjectAST*>(ast);
++ if( past->isFunctionScope() || past->isScope() )
++ {
++ QValueList<unsigned int> l = m_scopes.keys();
++ for( unsigned int i = 0; i < l.count(); ++i )
++ {
++ int num = l[ i ];
++ if( m_scopes.contains( num ) )
++ {
++ Scope* s = m_scopes[num];
++ if( s && s->m_root == past && s->m_root->scopedID == past->scopedID )
++ {
++ s->calcValuesFromStatements( variable, result, false, 0, false, false );
++ }
++ }
++ }
++ }
+ }
+ }
+
+--- buildtools/qmake/scope.h 2007/10/07 14:39:48 722530
++++ buildtools/qmake/scope.h 2007/10/11 19:48:00 724231
+@@ -217,7 +217,7 @@
+ // runs through the statements until stopHere is found (or the end is reached, if stopHere is 0),
+ // using the given list as startvalue
+ // Changes the list using the +=, -=, = operations accordingly
+- void calcValuesFromStatements( const QString& variable, QStringList& result, bool, QMake::AST* stopHere = 0, bool fetchFromParent = true ) const;
++ void calcValuesFromStatements( const QString& variable, QStringList& result, bool, QMake::AST* stopHere = 0, bool fetchFromParent = true, bool setDefault = true ) const;
+
+ // Check wether the two operators are compatible
+ static bool isCompatible( const QString& op1, const QString& op2);
+@@ -255,8 +255,6 @@
+
+ QString replaceWs(QString);
+
+- // All different subscopes of this scope, the key is the "position" at which the scope starts
+- QMap<QString, Scope*> m_subProjects;
+
+ // The "position" inside the parent scope that this scope starts at
+ unsigned int m_num;
--- /dev/null
+++ devel/kdevelop/files/patch-languages_cpp_cppsupportpart.cpp
@@ -0,0 +1,25 @@
+--- languages/cpp/cppsupportpart.cpp 2007/10/08 11:32:36 722993
++++ languages/cpp/cppsupportpart.cpp 2007/10/23 22:58:44 728690
+@@ -2533,6 +2533,9 @@
+ QStringList l = files.res;
+ while(!l.isEmpty() ) {
+ emit addedSourceInfo( l.front() );
++ emit aboutToRemoveSourceInfo( l.front() );
++ emit removedSourceInfo( l.front() );
++ emit addedSourceInfo( l.front() );
+ l.pop_front();
+ }
+
+@@ -2542,9 +2545,11 @@
+ QStringList l = files.res;
+ while( !l.isEmpty() ) {
+ emit codeModelUpdated( l.front() );
++ emit aboutToRemoveSourceInfo( l.front() );
++ emit removedSourceInfo( l.front() );
++ emit addedSourceInfo( l.front() );
+ l.pop_front();
+ }
+- emit updatedSourceInfo();
+ }
+ }
+ kdDebug( 9007 ) << "files in code-model after parseEmit: " << codeModel()->fileList().count() << " before: " << oldFileCount << endl;
--- /dev/null
+++ devel/kdevelop/files/patch-admin-detect-autoconf.pl
@@ -0,0 +1,161 @@
+--- admin/detect-autoconf.pl.orig 2007-10-08 13:35:17.000000000 +0200
++++ admin/detect-autoconf.pl 2007-10-20 13:42:33.000000000 +0200
+@@ -3,6 +3,9 @@
+ # Try to locate best version of auto*
+ # By Michael Pyne <michael.pyne at kdemail.net>
+ #
++# Stripped down for new FreeBSD autotools environment
++# Ade Lovett <ade at FreeBSD.org> 2007-09-10
++#
+ # Copyright (c) 2005.
+ # This code is public domain. You may use it however you like (including
+ # relicensing).
+@@ -21,75 +24,6 @@
+ return "";
+ }
+
+-# Subroutine to determine the highest installed version of the given program,
+-# searching from the given paths.
+-sub findBest
+-{
+- my ($program, @paths) = @_;
+- my $best_version_found = '0'; # Deliberately a string.
+- my %versions;
+- my %minimumVersions = (
+- 'autoconf' => '2.5',
+- 'automake' => '1.6',
+- );
+-
+- # Allow user to use environment variable to override search.
+- return $ENV{uc $program} if $ENV{uc $program};
+-
+- for $prefix (@paths)
+- {
+- @files = glob "$prefix/$program*";
+- for $file (@files)
+- {
+- # Don't check non-executable scripts.
+- next unless -x $file;
+-
+- ($version) = $file =~ /$prefix\/$program-?(.*)$/;
+- $version =~ s/-|\.//g;
+- # Don't check the -wrapper ones
+- next if $version eq "wrapper";
+-
+- # Special case some programs to make sure it has a minimum version.
+- if (not $version and exists $minimumVersions{$program})
+- {
+- my $min_version = $minimumVersions{$program};
+- my $versionOutput = `$program --version 2>/dev/null | head -n 1`;
+-
+- # If we can't run the script to get the version it likely won't work later.
+- next unless $versionOutput;
+-
+- # Use number.number for version (we don't need the excess in general).
+- ($versionOutput) = ($versionOutput =~ /(\d\.\d)/);
+-
+- # Use lt to do lexicographical comparison of strings (which should be
+- # equivalent and doesn't involve issues with floating point conversions).
+- if (not $versionOutput or $versionOutput lt $min_version)
+- {
+- next;
+- }
+- }
+-
+- # If no version suffix then use it in favor of a versioned autotool
+- # since the ever-popular WANT_AUTOFOO should then work (in theory).
+- return $file unless $version;
+-
+- # Emulate 'which', and abort if we've already seen this version.
+- next if exists $versions{$version};
+-
+- # Save filename of program.
+- $versions{$version} = $file;
+-
+- # Use string comparison so that e.g. 253a will be > 253 but < 254.
+- if ($version gt $best_version_found)
+- {
+- $best_version_found = $version;
+- }
+- }
+- }
+-
+- return $versions{$best_version_found};
+-}
+-
+ # Find an appropriate "which" program for later use by the shell script calling
+ # us.
+ sub findWhich
+@@ -103,17 +37,6 @@
+ }
+ }
+
+-# Uses which() to find a program unless the user provided its path in the
+-# environment (the upper case program name is searched).
+-sub findProgram
+-{
+- $suffix = ""; # For use if @_ has only one param.
+- my ($program, $suffix) = @_;
+-
+- return $ENV{uc $program} if $ENV{uc $program};
+- return which("$program$suffix");
+-}
+-
+ # SCRIPT STARTS.
+
+ # Search in path.
+@@ -123,49 +46,16 @@
+ unshift @paths, '/usr/local/bin' unless grep $_ eq '/usr/local/bin', @paths;
+ unshift @paths, '/usr/bin' unless grep $_ eq '/usr/bin', @paths;
+
+-$autoconf = findBest('autoconf', @paths);
+-($autoconf_suffix) = $autoconf =~ /.*autoconf(.*)$/;
+-
+-# Find matching autoconf companions.
+-$autoheader = findProgram('autoheader', $autoconf_suffix);
+-$autom4te = findProgram('autom4te', $autoconf_suffix);
+-
+-# Get best automake, and look for unsermake to possibly override it.
+-$automake = findBest('automake', @paths);
+-$unsermake = "";
+-# backward compatible: if $UNSERMAKE points to a path, use it
+-$unsermake = findProgram('unsermake') if (defined($ENV{'UNSERMAKE'}) and $ENV{'UNSERMAKE'} =~ /\//);
+-# new compatible: if it says 'yes', use the one from path
+-$unsermake = which('unsermake') if ($ENV{'UNSERMAKE'} ne 'no');
+-
+-($automake_suffix) = $automake =~ /.*automake(.*)$/;
+-
+-# Use unsermake if we found it.
+-$automake = "$unsermake -c" if $unsermake;
+-
+-# Find matching automake companions.
+-$aclocal = findProgram('aclocal', $automake_suffix);
+-
+ $which = findWhich();
+
+-# Make sure we have all of the needed programs.
+-for $i (qw'autoconf autoheader autom4te automake aclocal')
+-{
+- unless(${$i})
+- {
+- print "# Unable to find $i!!\n";
+- exit 1;
+- }
+-}
+-
+ # Print results in eval-able form.
+ print <<EOF;
+-AUTOCONF="$autoconf"
+-AUTOHEADER="$autoheader"
+-AUTOM4TE="$autom4te"
++AUTOCONF="autoconf"
++AUTOHEADER="autoheader"
++AUTOM4TE="autom4te"
+
+-AUTOMAKE="$automake"
+-ACLOCAL="$aclocal"
++AUTOMAKE="automake"
++ACLOCAL="aclocal"
+
+ WHICH="$which"
+
Index: patch-appwizard-libtool
===================================================================
RCS file: /home/cvs/mports/devel/kdevelop/files/patch-appwizard-libtool,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/kdevelop/files/patch-appwizard-libtool -L devel/kdevelop/files/patch-appwizard-libtool -u -r1.1 -r1.2
--- devel/kdevelop/files/patch-appwizard-libtool
+++ 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 Mon May 14 09:53:52 2007
++++ parts/appwizard/common/admin/libtool.m4.in Tue May 15 15:19:39 2007
@@ -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
@@ -666,36 +666,7 @@
irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
-@@ -1421,22 +1565,19 @@
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-- libsuff=
-- if test "x$LINUX_64_MODE" = x64; then
-- # Some platforms are per default 64-bit, so there's no /lib64
-- if test -d /lib64; then
-- libsuff=64
-- fi
-- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
-- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-
-+ # Append ld.so.conf contents to the search path
-+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+ fi
-+
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
-@@ -1446,6 +1587,18 @@
+@@ -1446,6 +1590,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -714,7 +685,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -1455,7 +1608,7 @@
+@@ -1455,7 +1611,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -723,7 +694,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -1483,8 +1636,13 @@
+@@ -1483,8 +1639,13 @@
openbsd*)
version_type=sunos
@@ -738,7 +709,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -1504,7 +1662,7 @@
+@@ -1504,7 +1665,7 @@
os2*)
libname_spec='$name'
@@ -747,7 +718,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -1522,13 +1680,6 @@
+@@ -1522,13 +1683,6 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -761,7 +732,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -1554,7 +1705,7 @@
+@@ -1554,7 +1708,7 @@
need_version=yes
;;
@@ -770,7 +741,7 @@
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
-@@ -1587,6 +1738,29 @@
+@@ -1587,6 +1741,29 @@
fi
;;
@@ -800,7 +771,7 @@
uts4*)
version_type=linux
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -1600,6 +1774,11 @@
+@@ -1600,6 +1777,11 @@
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -812,7 +783,7 @@
])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-@@ -1624,6 +1803,9 @@
+@@ -1624,6 +1806,9 @@
AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
fi
fi
@@ -822,7 +793,7 @@
# Extract list of available tagged configurations in $ofile.
# Note that this assumes the entire list is on one line.
-@@ -1650,7 +1832,9 @@
+@@ -1650,7 +1835,9 @@
case $tagname in
CXX)
@@ -833,7 +804,7 @@
AC_LIBTOOL_LANG_CXX_CONFIG
else
tagname=""
-@@ -1712,7 +1896,7 @@
+@@ -1712,7 +1899,7 @@
# AC_LIBTOOL_WIN32_DLL
# --------------------
@@ -842,7 +813,7 @@
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
])# AC_LIBTOOL_WIN32_DLL
-@@ -1750,7 +1934,7 @@
+@@ -1750,7 +1937,7 @@
# AC_DISABLE_SHARED
# -----------------
@@ -851,7 +822,7 @@
AC_DEFUN([AC_DISABLE_SHARED],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_ENABLE_SHARED(no)
-@@ -1886,7 +2070,7 @@
+@@ -1886,7 +2073,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -860,7 +831,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -1996,7 +2180,7 @@
+@@ -1996,7 +2183,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -869,7 +840,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -2028,7 +2212,7 @@
+@@ -2028,7 +2215,7 @@
AC_DEFUN([AC_PROG_LD_GNU],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
@@ -878,7 +849,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -2055,6 +2239,15 @@
+@@ -2055,6 +2242,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -894,7 +865,7 @@
])# AC_PROG_LD_RELOAD_FLAG
-@@ -2088,40 +2281,36 @@
+@@ -2088,44 +2284,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -905,16 +876,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 +909,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 +921,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 +2329,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -957,7 +930,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 +2345,24 @@
esac
;;
@@ -1009,7 +982,7 @@
;;
netbsd*)
-@@ -2208,32 +2381,22 @@
+@@ -2212,32 +2384,22 @@
;;
openbsd*)
@@ -1045,7 +1018,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 +2420,13 @@
siemens)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1060,7 +1033,7 @@
lt_cv_deplibs_check_method=pass_all
;;
esac
-@@ -2277,36 +2443,43 @@
+@@ -2281,36 +2446,43 @@
# Let the user override the test.
lt_cv_path_NM="$NM"
else
@@ -1128,7 +1101,7 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi])
NM="$lt_cv_path_NM"
-@@ -2338,13 +2511,13 @@
+@@ -2342,13 +2514,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 +1122,7 @@
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case $enable_ltdl_convenience in
-@@ -2363,13 +2536,13 @@
+@@ -2367,13 +2539,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 +1143,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 +2583,21 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
@@ -1193,7 +1166,7 @@
# AC_LIBTOOL_F77
# --------------
-@@ -2450,7 +2634,7 @@
+@@ -2454,7 +2637,7 @@
# AC_LIBTOOL_RC
@@ -1202,7 +1175,7 @@
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
-@@ -2483,36 +2667,9 @@
+@@ -2487,36 +2670,9 @@
_LT_AC_SYS_COMPILER
@@ -1242,7 +1215,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -2526,9 +2683,9 @@
+@@ -2530,9 +2686,9 @@
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
@@ -1254,7 +1227,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -2537,7 +2694,7 @@
+@@ -2541,7 +2697,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -1263,7 +1236,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -2546,37 +2703,11 @@
+@@ -2550,48 +2706,11 @@
fi
;;
@@ -1278,18 +1251,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 +1287,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -2601,7 +2732,7 @@
+@@ -2616,7 +2735,7 @@
AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
[AC_LANG_PUSH(C++)
AC_REQUIRE([AC_PROG_CXX])
@@ -1312,7 +1296,7 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -2613,6 +2744,7 @@
+@@ -2628,6 +2747,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 +1304,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 +2765,7 @@
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
# Source file extension for C++ test sources.
@@ -1329,7 +1313,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -2640,11 +2772,15 @@
+@@ -2655,11 +2775,15 @@
lt_simple_compile_test_code="int some_variable = 0;\n"
# Code to be used in simple link tests
@@ -1346,7 +1330,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -2655,18 +2791,18 @@
+@@ -2670,18 +2794,18 @@
if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
else
@@ -1368,7 +1352,27 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -2741,8 +2877,23 @@
+@@ -2699,8 +2823,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 +2850,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 +2880,23 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -1394,7 +1398,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -2759,7 +2910,7 @@
+@@ -2774,7 +2913,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GXX" = yes; then
@@ -1403,7 +1407,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 +2932,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -1416,7 +1420,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -2788,15 +2943,16 @@
+@@ -2803,15 +2946,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1437,23 +1441,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 +2964,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 +2978,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 +1468,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 +1489,26 @@
chorus*)
case $cc_basename in
*)
-@@ -2848,7 +3013,7 @@
+@@ -2858,12 +3011,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 +3025,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,40 +1546,11 @@
- _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'
-- ;;
-- esac
-- lt_int_apple_cc_single_mod=no
-- output_verbose_link_cmd='echo'
-- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-- lt_int_apple_cc_single_mod=yes
-- fi
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -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'
-- fi
-- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--
-- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- else
-- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- fi
-- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=no
-- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-- else
-- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- fi
-- ;;
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+ if test "$GXX" = yes ; then
+ lt_int_apple_cc_single_mod=no
+ output_verbose_link_cmd='echo'
@@ -1578,7 +1559,15 @@
+ 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
+ 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
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ fi
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
@@ -1603,7 +1592,37 @@
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ esac
-+ fi
+ fi
+- ;;
+- esac
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+- fi
+- _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 $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 $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 $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
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
+ ;;
dgux*)
@@ -1618,7 +1637,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -2920,14 +3107,14 @@
+@@ -2946,14 +3110,14 @@
;;
esac
;;
@@ -1630,12 +1649,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 +3134,12 @@
# location of the library.
case $cc_basename in
@@ -1645,11 +1664,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 +3148,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 +1679,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 +3162,22 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -1699,7 +1725,7 @@
;;
*)
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -3009,14 +3185,17 @@
+@@ -3035,17 +3188,20 @@
esac
case $cc_basename in
@@ -1721,8 +1747,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 +3217,15 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -1737,8 +1767,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 +3236,25 @@
;;
esac
;;
@@ -1761,21 +1795,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 +3265,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 +3278,14 @@
;;
linux*)
case $cc_basename in
@@ -1784,7 +1821,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 +3303,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1810,8 +1856,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 +1874,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 +3368,7 @@
;;
mvs*)
case $cc_basename in
@@ -1839,7 +1890,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
-@@ -3166,9 +3386,25 @@
+@@ -3192,15 +3389,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 +1917,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 +3423,14 @@
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -1879,21 +1937,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 +3448,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 +3467,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -1902,7 +1960,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 +3482,17 @@
# the KAI C++ compiler.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
;;
@@ -1915,25 +1980,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 +3511,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 +3532,14 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -1963,7 +2028,7 @@
# Lucid
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -3326,36 +3549,33 @@
+@@ -3352,36 +3552,33 @@
;;
solaris*)
case $cc_basename in
@@ -1972,10 +2037,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,16 +2077,43 @@
# 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 +3586,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 +3598,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 +3609,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 +3624,63 @@
;;
esac
;;
@@ -2087,7 +2179,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 +3717,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2096,7 +2188,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3462,7 +3731,7 @@
+@@ -3488,7 +3734,7 @@
])# AC_LIBTOOL_LANG_CXX_CONFIG
# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
@@ -2105,7 +2197,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 +3788,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 +2206,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -3556,7 +3825,7 @@
+@@ -3582,7 +3828,7 @@
fi
;;
@@ -2123,7 +2215,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 +3864,37 @@
$rm -f confest.$objext
@@ -2162,7 +2254,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 +3938,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2180,7 +2272,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -3657,7 +3954,7 @@
+@@ -3683,7 +3957,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -2189,7 +2281,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -3665,8 +3962,10 @@
+@@ -3691,8 +3965,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -2202,7 +2294,7 @@
;;
esac
AC_MSG_RESULT([$enable_shared])
-@@ -3676,8 +3975,6 @@
+@@ -3702,8 +3978,6 @@
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
@@ -2211,7 +2303,7 @@
_LT_AC_TAGVAR(GCC, $1)="$G77"
_LT_AC_TAGVAR(LD, $1)="$LD"
-@@ -3687,8 +3984,6 @@
+@@ -3713,8 +3987,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2220,7 +2312,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3717,20 +4012,27 @@
+@@ -3743,20 +4015,27 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -2249,7 +2341,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 +4047,6 @@
AC_LIBTOOL_PROG_LD_SHLIBS($1)
AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
@@ -2258,7 +2350,7 @@
AC_LIBTOOL_CONFIG($1)
-@@ -3753,7 +4053,7 @@
+@@ -3779,7 +4056,7 @@
# AC_LIBTOOL_LANG_RC_CONFIG
@@ -2267,7 +2359,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 +4080,16 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -2284,7 +2376,7 @@
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
AC_LIBTOOL_CONFIG($1)
-@@ -3807,11 +4112,12 @@
+@@ -3833,11 +4115,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -2299,7 +2391,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 +4170,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -2308,16 +2400,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 +4236,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -2331,7 +2414,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -3962,6 +4268,12 @@
+@@ -3988,6 +4271,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -2344,7 +2427,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -3973,6 +4285,9 @@
+@@ -3999,6 +4288,9 @@
# A C compiler.
LTCC=$lt_LTCC
@@ -2354,7 +2437,7 @@
# A language-specific compiler.
CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-@@ -3992,7 +4307,7 @@
+@@ -4018,7 +4310,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -2363,7 +2446,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -4023,7 +4338,7 @@
+@@ -4049,7 +4341,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -2372,7 +2455,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -4038,7 +4353,7 @@
+@@ -4064,7 +4356,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 +2464,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -4267,7 +4582,10 @@
+@@ -4293,7 +4585,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 +2476,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -4309,9 +4627,6 @@
+@@ -4335,9 +4630,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
@@ -2403,7 +2486,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 +4651,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 +2519,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -4358,14 +4689,17 @@
+@@ -4384,14 +4692,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -2456,7 +2539,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -4521,6 +4855,10 @@
+@@ -4547,6 +4858,10 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -2467,7 +2550,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 +4870,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2476,7 +2559,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -4554,18 +4892,28 @@
+@@ -4580,18 +4895,28 @@
;;
chorus*)
case $cc_basename in
@@ -2508,11 +2591,11 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -4573,22 +4921,22 @@
+@@ -4599,22 +4924,22 @@
;;
esac
;;
-- freebsd*)
+- freebsd* | kfreebsd*-gnu)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
@@ -2537,7 +2620,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4601,9 +4949,13 @@
+@@ -4627,9 +4952,13 @@
;;
esac
;;
@@ -2552,7 +2635,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 +4969,24 @@
;;
linux*)
case $cc_basename in
@@ -2581,7 +2664,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 +5003,7 @@
;;
mvs*)
case $cc_basename in
@@ -2590,7 +2673,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
;;
*)
-@@ -4653,14 +5011,14 @@
+@@ -4679,14 +5014,14 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -2608,7 +2691,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 +5035,15 @@
;;
psos*)
;;
@@ -2635,7 +2718,7 @@
# Green Hills C++ Compiler
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
;;
-@@ -4701,12 +5050,12 @@
+@@ -4727,12 +5053,12 @@
;;
sunos4*)
case $cc_basename in
@@ -2650,7 +2733,7 @@
# Lucid
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
;;
-@@ -4716,7 +5065,7 @@
+@@ -4742,7 +5068,7 @@
;;
tandem*)
case $cc_basename in
@@ -2659,7 +2742,7 @@
# NonStop-UX NCC 3.20
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
;;
-@@ -4724,7 +5073,14 @@
+@@ -4750,7 +5076,14 @@
;;
esac
;;
@@ -2675,7 +2758,7 @@
;;
vxworks*)
;;
-@@ -4771,6 +5127,11 @@
+@@ -4797,6 +5130,11 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -2687,7 +2770,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 +5151,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -2696,7 +2779,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4813,6 +5174,16 @@
+@@ -4839,6 +5177,16 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -2713,7 +2796,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -4824,7 +5195,7 @@
+@@ -4850,7 +5198,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 +2805,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -4848,12 +5219,19 @@
+@@ -4874,12 +5222,19 @@
;;
linux*)
@@ -2743,7 +2826,7 @@
ccc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
-@@ -4868,15 +5246,15 @@
+@@ -4894,15 +5249,15 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -2765,7 +2848,7 @@
;;
sunos4*)
-@@ -4885,7 +5263,7 @@
+@@ -4911,7 +5266,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -2774,7 +2857,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 +5279,17 @@
fi
;;
@@ -2792,7 +2875,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 +5317,7 @@
[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
fi
@@ -2801,7 +2884,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 +5326,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 +2901,7 @@
])
-@@ -4958,7 +5357,7 @@
+@@ -4984,7 +5360,7 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -2827,7 +2910,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 +5386,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -2836,7 +2919,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 +5403,8 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -2846,7 +2929,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 +5414,10 @@
with_gnu_ld=no
fi
;;
@@ -2857,7 +2940,7 @@
openbsd*)
with_gnu_ld=no
;;
-@@ -5021,6 +5425,27 @@
+@@ -5047,6 +5428,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -2885,26 +2968,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 +5486,7 @@
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+- _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 +5496,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 +5511,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 +3047,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 +5568,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 +3068,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 +5587,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 +3111,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 +5630,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 +3143,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -5158,7 +5651,7 @@
+@@ -5184,7 +5654,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 +3152,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 +5676,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 +3176,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -5199,7 +5704,7 @@
+@@ -5225,7 +5707,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes; then
@@ -3063,7 +3185,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 +5726,12 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
fi
@@ -3076,7 +3198,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5227,30 +5736,30 @@
+@@ -5253,30 +5739,30 @@
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
@@ -3104,8 +3226,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 +3235,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 +5771,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 +3251,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 +5788,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -3144,14 +3266,20 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
;;
-@@ -5292,54 +5799,65 @@
+@@ -5314,69 +5798,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 +3294,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 +3335,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 +3382,27 @@
;;
dgux*)
-@@ -5372,7 +5890,7 @@
+@@ -5409,8 +5893,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 +5902,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 +5916,62 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
@@ -3261,6 +3411,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 +3433,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 +3489,59 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-@@ -5483,6 +6016,7 @@
+@@ -5486,7 +5985,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 +6018,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 +6029,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 +6040,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 +6059,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 +3550,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 +6073,15 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -3369,16 +3565,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 +6090,18 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -3399,7 +3597,16 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -5617,36 +6155,45 @@
+@@ -5606,7 +6110,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 +6158,45 @@
fi
;;
@@ -3419,11 +3626,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 +3673,7 @@
;;
uts4*)
-@@ -5664,11 +6211,6 @@
+@@ -5701,11 +6214,6 @@
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
@@ -3478,7 +3685,7 @@
#
# Do we need to explicitly link libc?
#
-@@ -5689,13 +6231,14 @@
+@@ -5726,13 +6234,14 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -3494,7 +3701,7 @@
compiler_flags=-v
linker_flags=-v
verstring=
-@@ -5823,7 +6366,7 @@
+@@ -5860,7 +6369,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 +3710,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 Mon May 14 09:53:52 2007
++++ parts/appwizard/common/admin/ltmain.sh Thu Mar 8 22:58:41 2007
@@ -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 +3721,7 @@
# Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord at 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.
@@ -3714,7 +3913,7 @@
win32_libid_type="x86 DLL"
;;
*executable*) # but shell scripts are "executable" too...
-@@ -154,9 +217,181 @@
+@@ -154,9 +217,210 @@
$echo $win32_libid_type
}
@@ -3727,6 +3926,20 @@
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
++ # FreeBSD-specific: where we install compilers with non-standard names
++ tag_compilers_CC="*cc cc* *gcc gcc*"
++ tag_compilers_CXX="*c++ c++* *g++ g++*"
++ base_compiler=`set -- "$@"; echo $1`
++
++ # If $tagname isn't set, then try to infer if the default "CC" tag applies
++ if test -z "$tagname"; then
++ for zp in $tag_compilers_CC; do
++ case $base_compiler in
++ $zp) tagname="CC"; break;;
++ esac
++ done
++ fi
++
+ if test -n "$available_tags" && test -z "$tagname"; then
+ CC_quoted=
+ for arg in $CC; do
@@ -3767,7 +3980,22 @@
+ break
+ ;;
+ esac
-+ fi
++
++ # FreeBSD-specific: try compilers based on inferred tag
++ if test -z "$tagname"; then
++ eval "tag_compilers=\$tag_compilers_${z}"
++ if test -n "$tag_compilers"; then
++ for zp in $tag_compilers; do
++ case $base_compiler in
++ $zp) tagname=$z; break;;
++ esac
++ done
++ if test -n "$tagname"; then
++ break
++ fi
++ fi
++ fi
++ fi
+ done
+ # If $tagname still isn't set, then no tagged configuration
+ # was found and let the user know that the "--tag" command
@@ -3896,7 +4124,7 @@
# Parse our command line options once, thoroughly.
while test "$#" -gt 0
do
-@@ -176,12 +411,13 @@
+@@ -176,12 +440,13 @@
;;
tag)
tagname="$arg"
@@ -3911,7 +4139,7 @@
;;
esac
-@@ -191,10 +427,10 @@
+@@ -191,10 +456,10 @@
# not specially marked.
;;
*)
@@ -3924,7 +4152,7 @@
else
$echo "$progname: ignoring unknown tag $tagname" 1>&2
fi
-@@ -220,24 +456,25 @@
+@@ -220,24 +485,25 @@
--version)
$echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
$echo
@@ -3955,7 +4183,7 @@
;;
--dry-run | -n)
-@@ -256,7 +493,7 @@
+@@ -256,7 +522,7 @@
else
$echo "disable static libraries"
fi
@@ -3964,7 +4192,7 @@
;;
--finish) mode="finish" ;;
-@@ -268,13 +505,19 @@
+@@ -268,13 +534,19 @@
--quiet | --silent)
show=:
@@ -3985,7 +4213,7 @@
;;
-dlopen)
-@@ -285,7 +528,7 @@
+@@ -285,7 +557,7 @@
-*)
$echo "$modename: unrecognized option \`$arg'" 1>&2
$echo "$help" 1>&2
@@ -3994,7 +4222,7 @@
;;
*)
-@@ -298,9 +541,21 @@
+@@ -298,9 +570,21 @@
if test -n "$prevopt"; then
$echo "$modename: option \`$prevopt' requires an argument" 1>&2
$echo "$help" 1>&2
@@ -4017,7 +4245,7 @@
# If this variable is set in any of the actions, the command in it
# will be execed at the end. This prevents here-documents from being
# left over by shells.
-@@ -311,7 +566,7 @@
+@@ -311,7 +595,7 @@
# Infer the operation mode.
if test -z "$mode"; then
$echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
@@ -4026,7 +4254,7 @@
case $nonopt in
*cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
mode=link
-@@ -354,7 +609,7 @@
+@@ -354,7 +638,7 @@
if test -n "$execute_dlfiles" && test "$mode" != execute; then
$echo "$modename: unrecognized option \`-dlopen'" 1>&2
$echo "$help" 1>&2
@@ -4035,7 +4263,7 @@
fi
# Change the help message to a mode-specific one.
-@@ -369,13 +624,15 @@
+@@ -369,13 +653,15 @@
# Get the compilation command and the source file.
base_compile=
srcfile="$nonopt" # always keep a non-empty value in "srcfile"
@@ -4052,7 +4280,7 @@
arg )
# do not "continue". Instead, add this to base_compile
lastarg="$arg"
-@@ -394,24 +651,19 @@
+@@ -394,24 +680,19 @@
-o)
if test -n "$libobj" ; then
$echo "$modename: you cannot specify \`-o' more than once" 1>&2
@@ -4082,7 +4310,7 @@
continue
;;
-@@ -424,7 +676,7 @@
+@@ -424,7 +705,7 @@
args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
lastarg=
save_ifs="$IFS"; IFS=','
@@ -4091,7 +4319,7 @@
IFS="$save_ifs"
# Double-quote args containing other shell metacharacters.
-@@ -462,7 +714,10 @@
+@@ -462,7 +743,10 @@
case $lastarg in
# Double-quote args containing other shell metacharacters.
# Many Bourne shells cannot handle close brackets correctly
@@ -4103,7 +4331,7 @@
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
lastarg="\"$lastarg\""
;;
-@@ -474,11 +729,11 @@
+@@ -474,11 +758,11 @@
case $arg_mode in
arg)
$echo "$modename: you must specify an argument for -Xcompile"
@@ -4117,7 +4345,7 @@
;;
*)
# Get the name of the library object.
-@@ -511,51 +766,39 @@
+@@ -511,51 +795,39 @@
*.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
*)
$echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
@@ -4196,7 +4424,7 @@
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
if test "X$xdir" = "X$obj"; then
-@@ -568,7 +811,7 @@
+@@ -568,7 +840,7 @@
if test -z "$base_compile"; then
$echo "$modename: you must specify a compilation command" 1>&2
$echo "$help" 1>&2
@@ -4205,7 +4433,7 @@
fi
# Delete any leftover library objects.
-@@ -579,7 +822,7 @@
+@@ -579,7 +851,7 @@
fi
$run $rm $removelist
@@ -4214,7 +4442,7 @@
# On Cygwin there's no "real" PIC flag so we must build both object types
case $host_os in
-@@ -598,7 +841,7 @@
+@@ -598,7 +870,7 @@
output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
removelist="$removelist $output_obj $lockfile"
@@ -4223,7 +4451,7 @@
else
output_obj=
need_locks=no
-@@ -608,7 +851,7 @@
+@@ -608,7 +880,7 @@
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
if test "$need_locks" = yes; then
@@ -4232,7 +4460,7 @@
$show "Waiting for $lockfile to be removed"
sleep 2
done
-@@ -626,14 +869,19 @@
+@@ -626,14 +898,19 @@
compiler."
$run $rm $removelist
@@ -4254,7 +4482,7 @@
$run $rm "$libobj" "${libobj}T"
-@@ -655,18 +903,18 @@
+@@ -655,18 +932,18 @@
fbsd_hideous_sh_bug=$base_compile
if test "$pic_mode" != no; then
@@ -4278,7 +4506,7 @@
fi
fi
-@@ -681,7 +929,7 @@
+@@ -681,7 +958,7 @@
if $run eval "$command"; then :
else
test -n "$output_obj" && $run $rm $removelist
@@ -4287,7 +4515,7 @@
fi
if test "$need_locks" = warn &&
-@@ -701,7 +949,7 @@
+@@ -701,7 +978,7 @@
compiler."
$run $rm $removelist
@@ -4296,7 +4524,7 @@
fi
# Just move the object if needed, then go on to compile the next one
-@@ -722,7 +970,9 @@
+@@ -722,7 +999,9 @@
EOF
# Allow error messages only from the first compilation.
@@ -4307,7 +4535,7 @@
else
# No PIC object so indicate it doesn't exist in the libtool
# object file.
-@@ -736,9 +986,9 @@
+@@ -736,9 +1015,9 @@
if test "$build_old_libs" = yes; then
if test "$pic_mode" != yes; then
# Don't build PIC code
@@ -4319,7 +4547,7 @@
fi
if test "$compiler_c_o" = yes; then
command="$command -o $obj"
-@@ -751,7 +1001,7 @@
+@@ -751,7 +1030,7 @@
if $run eval "$command"; then :
else
$run $rm $removelist
@@ -4328,7 +4556,7 @@
fi
if test "$need_locks" = warn &&
-@@ -771,7 +1021,7 @@
+@@ -771,7 +1050,7 @@
compiler."
$run $rm $removelist
@@ -4337,7 +4565,7 @@
fi
# Just move the object if needed
-@@ -809,7 +1059,7 @@
+@@ -809,7 +1088,7 @@
$run $rm "$lockfile"
fi
@@ -4346,7 +4574,7 @@
;;
# libtool link mode
-@@ -835,7 +1085,7 @@
+@@ -835,7 +1114,7 @@
;;
esac
libtool_args="$nonopt"
@@ -4355,7 +4583,7 @@
compile_command="$nonopt"
finalize_command="$nonopt"
-@@ -847,7 +1097,6 @@
+@@ -847,7 +1126,6 @@
old_convenience=
deplibs=
old_deplibs=
@@ -4363,7 +4591,7 @@
compiler_flags=
linker_flags=
dllsearchpath=
-@@ -868,6 +1117,8 @@
+@@ -868,6 +1146,8 @@
no_install=no
objs=
non_pic_objects=
@@ -4372,7 +4600,7 @@
prefer_static_libs=no
preload=no
prev=
-@@ -881,6 +1132,8 @@
+@@ -881,6 +1161,8 @@
vinfo=
vinfo_number=no
@@ -4381,7 +4609,7 @@
# We need to know -static, to get the right output filenames.
for arg
do
-@@ -893,14 +1146,15 @@
+@@ -893,14 +1175,15 @@
if test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
@@ -4398,7 +4626,7 @@
break
;;
esac
-@@ -912,7 +1166,6 @@
+@@ -912,7 +1195,6 @@
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
arg="$1"
@@ -4406,7 +4634,7 @@
shift
case $arg in
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
-@@ -976,7 +1229,7 @@
+@@ -976,7 +1258,7 @@
export_symbols="$arg"
if test ! -f "$arg"; then
$echo "$modename: symbol file \`$arg' does not exist"
@@ -4415,7 +4643,7 @@
fi
prev=
continue
-@@ -991,6 +1244,11 @@
+@@ -991,6 +1273,11 @@
prev=
continue
;;
@@ -4427,7 +4655,7 @@
release)
release="-$arg"
prev=
-@@ -1023,7 +1281,7 @@
+@@ -1023,7 +1310,7 @@
test "$pic_object" = none && \
test "$non_pic_object" = none; then
$echo "$modename: cannot find name of object for \`$arg'" 1>&2
@@ -4436,7 +4664,7 @@
fi
# Extract subdirectory from the argument.
-@@ -1071,12 +1329,17 @@
+@@ -1071,12 +1358,17 @@
if test -z "$pic_object" || test "$pic_object" = none ; then
arg="$non_pic_object"
fi
@@ -4455,7 +4683,7 @@
else
# Dry-run case.
-@@ -1097,7 +1360,7 @@
+@@ -1097,7 +1389,7 @@
done
else
$echo "$modename: link input file \`$save_arg' does not exist"
@@ -4464,7 +4692,7 @@
fi
arg=$save_arg
prev=
-@@ -1109,7 +1372,7 @@
+@@ -1109,7 +1401,7 @@
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
$echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -4473,10 +4701,20 @@
;;
esac
if test "$prev" = rpath; then
-@@ -1149,6 +1412,18 @@
+@@ -1149,16 +1441,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 +4724,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 +1501,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 +4736,7 @@
fi
if test "X$arg" = "X-export-symbols"; then
prev=expsyms
-@@ -1207,6 +1482,18 @@
+@@ -1220,6 +1511,18 @@
continue
;;
@@ -4520,7 +4755,7 @@
-inst-prefix-dir)
prev=inst_prefix
continue
-@@ -1233,7 +1520,8 @@
+@@ -1246,7 +1549,8 @@
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
@@ -4530,7 +4765,7 @@
fi
dir="$absdir"
;;
-@@ -1247,10 +1535,15 @@
+@@ -1260,10 +1564,15 @@
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -4546,7 +4781,7 @@
;;
esac
continue
-@@ -1259,18 +1552,15 @@
+@@ -1272,26 +1581,35 @@
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
@@ -4555,9 +4790,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 +4800,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 +4817,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 +1619,42 @@
continue
;;
@@ -4610,6 +4840,7 @@
+ compiler_flags="$compiler_flags $arg"
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
++ deplibs="$deplibs $arg"
+ 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 +1665,7 @@
esac
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@@ -4652,7 +4883,7 @@
continue
;;
-@@ -1358,6 +1675,11 @@
+@@ -1365,6 +1705,11 @@
-o) prev=output ;;
@@ -4664,7 +4895,7 @@
-release)
prev=release
continue
-@@ -1380,7 +1702,7 @@
+@@ -1387,7 +1732,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 +1818,6 @@
+ continue
+ ;;
+
+- -framework)
+- prev=framework
+- continue
+- ;;
+-
+ # Some other compiler flag.
+ -* | +*)
+ # Unknown arguments in both finalize_command and compile_command need
+@@ -1488,7 +1828,6 @@
arg="\"$arg\""
;;
esac
@@ -4681,7 +4924,7 @@
;;
*.$objext)
-@@ -1504,7 +1825,7 @@
+@@ -1516,7 +1855,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 +1903,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 +1967,6 @@
arg="\"$arg\""
;;
esac
@@ -4717,7 +4960,7 @@
;;
esac # arg
-@@ -1625,48 +1950,7 @@
+@@ -1637,48 +1980,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 +2013,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 +2024,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 +2034,7 @@
case $host in
*cygwin* | *mingw* | *pw32*)
@@ -4798,7 +5041,7 @@
duplicate_compiler_generated_deps=yes
;;
*)
-@@ -1764,7 +2048,6 @@
+@@ -1776,7 +2078,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 +2086,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 +2124,46 @@
lib=
found=no
case $deplib in
@@ -4826,6 +5069,29 @@
+ else
+ compiler_flags="$compiler_flags $deplib"
+ fi
++
++ case $linkmode in
++ lib)
++ deplibs="$deplib $deplibs"
++ test "$pass" = conv && continue
++ newdependency_libs="$deplib $newdependency_libs"
++ ;;
++ prog)
++ if test "$pass" = conv; then
++ deplibs="$deplib $deplibs"
++ continue
++ fi
++ if test "$pass" = scan; then
++ deplibs="$deplib $deplibs"
++ else
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ fi
++ ;;
++ *)
++ ;;
++ esac # linkmode
++
+ continue
+ ;;
-l*)
@@ -4844,7 +5110,26 @@
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
if test -f "$lib"; then
-@@ -1898,11 +2186,11 @@
+@@ -1895,18 +2224,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 +2239,11 @@
fi
if test "$pass" = scan; then
deplibs="$deplib $deplibs"
@@ -4857,7 +5142,7 @@
;;
*)
$echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-@@ -1930,7 +2218,22 @@
+@@ -1954,7 +2271,22 @@
fi
case $linkmode in
lib)
@@ -4881,7 +5166,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 +2336,15 @@
esac # case $deplib
if test "$found" = yes || test -f "$lib"; then :
else
@@ -4900,7 +5185,7 @@
fi
ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -2004,6 +2307,8 @@
+@@ -2028,6 +2360,8 @@
# it will not redefine variables installed, or shouldnotlink
installed=yes
shouldnotlink=no
@@ -4909,10 +5194,25 @@
# Read the .la file
case $lib in
-@@ -2021,33 +2326,32 @@
+@@ -2035,13 +2369,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
+@@ -2051,34 +2378,33 @@
+
if test "$pass" = conv; then
# Only check for convenience libraries
- deplibs="$lib $deplibs"
+- deplibs="$lib $deplibs"
- tmp_libs=
- for deplib in $dependency_libs; do
- #echo "Adding $deplib to \$deplibs"
@@ -4924,6 +5224,7 @@
- fi
- tmp_libs="$tmp_libs $deplib"
- done
++ 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 +5257,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 +2412,18 @@
done
if test -z "$linklib"; then
$echo "$modename: cannot find name of link library for \`$lib'" 1>&2
@@ -4978,7 +5279,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 +2460,19 @@
dir="$libdir"
absdir="$libdir"
fi
@@ -5002,7 +5303,7 @@
fi # $installed = yes
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-@@ -2113,7 +2427,7 @@
+@@ -2144,7 +2480,7 @@
if test "$pass" = dlpreopen; then
if test -z "$libdir"; then
$echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
@@ -5011,7 +5312,7 @@
fi
# Prefer using a static library (so that no silly _DYNAMIC symbols
# are required to link).
-@@ -2140,7 +2454,7 @@
+@@ -2171,7 +2507,7 @@
continue
fi
@@ -5020,7 +5321,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 +2545,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 +5336,7 @@
esac
fi
-@@ -2220,24 +2534,29 @@
+@@ -2251,24 +2587,29 @@
fi
link_static=no # Whether the deplib will be linked statically
@@ -5071,7 +5372,7 @@
if test "$linkmode" = lib &&
test "$hardcode_into_libs" = yes; then
# Hardcode the library path.
-@@ -2295,9 +2614,10 @@
+@@ -2326,9 +2667,10 @@
else
$show "extracting exported symbol list from \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -5083,7 +5384,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2308,9 +2628,10 @@
+@@ -2339,9 +2681,10 @@
if test -f "$output_objdir/$newlib"; then :; else
$show "generating import library for \`$soname'"
save_ifs="$IFS"; IFS='~'
@@ -5095,7 +5396,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -2331,11 +2652,15 @@
+@@ -2362,11 +2705,15 @@
if test "$hardcode_direct" = no; then
add="$dir/$linklib"
case $host in
@@ -5115,7 +5416,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 +2721,7 @@
$echo "** The link will probably fail, sorry"
else
add="$dir/$old_library"
@@ -5124,7 +5425,7 @@
fi
esac
elif test "$hardcode_minus_L" = no; then
-@@ -2366,9 +2691,9 @@
+@@ -2397,9 +2744,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 +5437,7 @@
;;
esac
fi
-@@ -2385,7 +2710,7 @@
+@@ -2416,7 +2763,7 @@
if test "$lib_linked" != yes; then
$echo "$modename: configuration error: unsupported hardcode properties"
@@ -5145,7 +5446,7 @@
fi
if test -n "$add_shlibpath"; then
-@@ -2428,7 +2753,8 @@
+@@ -2459,7 +2806,8 @@
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
@@ -5155,7 +5456,7 @@
add="$inst_prefix_dir$libdir/$linklib"
else
add="$libdir/$linklib"
-@@ -2438,9 +2764,9 @@
+@@ -2469,9 +2817,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 +5468,7 @@
;;
esac
fi
-@@ -2499,17 +2825,16 @@
+@@ -2530,17 +2878,16 @@
fi
fi
else
@@ -5189,7 +5490,7 @@
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
-@@ -2523,7 +2848,7 @@
+@@ -2554,7 +2901,7 @@
esac
done
dependency_libs="$temp_deplibs"
@@ -5198,7 +5499,7 @@
newlib_search_path="$newlib_search_path $absdir"
# Link against this library
-@@ -2565,20 +2890,18 @@
+@@ -2596,20 +2943,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 +5524,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 +2962,45 @@
done
if test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
@@ -5272,8 +5573,16 @@
;;
*) continue ;;
- esac
-+ esac
+- ;;
+-
+- *.ltframework)
+- case $host in
+- *-*-darwin*)
+- depdepl="$deplib"
+- ;;
+ esac
;;
+-
*) continue ;;
esac
case " $deplibs " in
@@ -5291,7 +5600,7 @@
esac
done
fi # link_all_deplibs != no
-@@ -2712,7 +3034,8 @@
+@@ -2752,7 +3087,8 @@
eval $var=\"$tmp_libs\"
done # for var
fi
@@ -5301,7 +5610,7 @@
tmp_libs=
for i in $dependency_libs ; do
case " $predeps $postdeps $compiler_lib_search_path " in
-@@ -2772,19 +3095,19 @@
+@@ -2812,19 +3148,19 @@
case $outputname in
lib*)
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -5324,7 +5633,7 @@
eval libname=\"$libname_spec\"
else
libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2795,7 +3118,7 @@
+@@ -2835,7 +3171,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 +5642,7 @@
else
$echo
$echo "*** Warning: Linking the shared library $output against the non-libtool"
-@@ -2843,13 +3166,13 @@
+@@ -2883,13 +3219,13 @@
if test -n "$8"; then
$echo "$modename: too many parameters to \`-version-info'" 1>&2
$echo "$help" 1>&2
@@ -5349,7 +5658,7 @@
case $vinfo_number in
yes)
number_major="$2"
-@@ -2889,36 +3212,36 @@
+@@ -2929,36 +3265,36 @@
# Check that each of the things are valid numbers.
case $current in
@@ -5396,7 +5705,7 @@
fi
# Calculate the version variables.
-@@ -2935,7 +3258,7 @@
+@@ -2975,7 +3311,7 @@
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
@@ -5405,7 +5714,7 @@
;;
freebsd-aout)
-@@ -3007,7 +3330,7 @@
+@@ -3047,7 +3383,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 +5723,12 @@
;;
esac
-@@ -3061,6 +3384,12 @@
- *.$objext)
+@@ -3098,9 +3434,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 +5740,7 @@
removelist="$removelist $p"
;;
*) ;;
-@@ -3082,9 +3411,9 @@
+@@ -3122,9 +3464,9 @@
# Eliminate all temporary directories.
for path in $notinst_path; do
@@ -5440,7 +5753,7 @@
done
if test -n "$xrpath"; then
-@@ -3097,7 +3426,7 @@
+@@ -3137,7 +3479,7 @@
*) finalize_rpath="$finalize_rpath $libdir" ;;
esac
done
@@ -5449,16 +5762,16 @@
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
-@@ -3135,15 +3464,14 @@
+@@ -3170,14 +3512,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 +5785,7 @@
;;
*)
# Add libc to deplibs on all other systems if necessary.
-@@ -3187,11 +3515,11 @@
+@@ -3221,11 +3568,11 @@
int main() { return 0; }
EOF
$rm conftest
@@ -5486,7 +5799,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 +3609,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 +5813,7 @@
# Did it work?
if test "$?" -eq 0 ; then
ldd_output=`ldd conftest`
-@@ -3280,7 +3608,7 @@
+@@ -3314,7 +3661,7 @@
set dummy $deplibs_check_method
file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -5509,7 +5822,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 +3730,7 @@
set dummy $deplibs_check_method
match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
for a_deplib in $deplibs; do
@@ -5518,7 +5831,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 +3810,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 +3856,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 +5887,7 @@
# All the library-specific variables (install_libdir is set above).
library_names=
old_library=
-@@ -3491,7 +3848,7 @@
+@@ -3532,7 +3901,7 @@
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
@@ -5563,7 +5896,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 +3956,7 @@
fi
# Get the real and link names of the library.
@@ -5572,7 +5905,7 @@
eval library_names=\"$library_names_spec\"
set dummy $library_names
realname="$2"
-@@ -3562,6 +3919,7 @@
+@@ -3603,6 +3972,7 @@
fi
lib="$output_objdir/$realname"
@@ -5580,7 +5913,7 @@
for link
do
linknames="$linknames $link"
-@@ -3576,10 +3934,11 @@
+@@ -3617,10 +3987,11 @@
$show "generating symbol list for \`$libname.la'"
export_symbols="$output_objdir/$libname.exp"
$run $rm $export_symbols
@@ -5593,7 +5926,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 +4001,9 @@
# The command line is too long to execute in one step.
$show "using reloadable object file for export list..."
skipped_export=:
@@ -5603,7 +5936,7 @@
fi
done
IFS="$save_ifs"
-@@ -3609,12 +3971,12 @@
+@@ -3650,12 +4024,12 @@
for test_deplib in $deplibs; do
case " $convenience " in
*" $test_deplib "*) ;;
@@ -5618,7 +5951,7 @@
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
-@@ -3622,67 +3984,13 @@
+@@ -3663,67 +4037,13 @@
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${outputname}x"
@@ -5689,7 +6022,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 +4054,27 @@
$run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
fi
@@ -5731,7 +6064,7 @@
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
:
else
-@@ -3736,6 +4040,7 @@
+@@ -3777,6 +4093,7 @@
save_libobjs=$libobjs
fi
save_output=$output
@@ -5739,7 +6072,7 @@
# Clear the reloadable object creation command queue and
# initialize k to one.
-@@ -3745,13 +4050,13 @@
+@@ -3786,13 +4103,13 @@
delfiles=
last_robj=
k=1
@@ -5755,7 +6088,7 @@
test "$len" -le "$max_cmd_len"; }; then
objlist="$objlist $obj"
else
-@@ -3765,9 +4070,9 @@
+@@ -3806,9 +4123,9 @@
# the last one created.
eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
fi
@@ -5767,7 +6100,7 @@
objlist=$obj
len=1
fi
-@@ -3787,13 +4092,13 @@
+@@ -3828,13 +4145,13 @@
eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
fi
@@ -5783,7 +6116,7 @@
done
$echo "creating a temporary reloadable object file: $output"
-@@ -3818,28 +4123,54 @@
+@@ -3859,28 +4176,54 @@
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
@@ -5843,7 +6176,7 @@
fi
# Create links to the real library.
-@@ -3887,7 +4218,7 @@
+@@ -3928,7 +4271,7 @@
*.lo)
if test -n "$objs$old_deplibs"; then
$echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
@@ -5852,7 +6185,7 @@
fi
libobj="$output"
obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -3916,64 +4247,10 @@
+@@ -3957,64 +4300,10 @@
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${obj}x"
@@ -5919,7 +6252,7 @@
fi
fi
-@@ -3981,10 +4258,11 @@
+@@ -4022,10 +4311,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 +6265,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -3997,7 +4275,7 @@
+@@ -4038,7 +4328,7 @@
$run ${rm}r $gentop
fi
@@ -5941,7 +6274,7 @@
fi
if test "$build_libtool_libs" != yes; then
-@@ -4010,17 +4288,18 @@
+@@ -4051,17 +4341,18 @@
# accidentally link it into a program.
# $show "echo timestamp > $libobj"
# $run eval "echo timestamp > $libobj" || exit $?
@@ -5962,7 +6295,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -4032,7 +4311,7 @@
+@@ -4073,7 +4364,7 @@
$run ${rm}r $gentop
fi
@@ -5971,7 +6304,28 @@
;;
prog)
-@@ -4072,6 +4351,35 @@
+@@ -4098,24 +4389,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 +6361,7 @@
compile_command="$compile_command $compile_deplibs"
finalize_command="$finalize_command $finalize_deplibs"
-@@ -4116,10 +4424,15 @@
+@@ -4160,10 +4477,15 @@
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -6023,7 +6377,7 @@
;;
esac
done
-@@ -4233,13 +4546,25 @@
+@@ -4277,13 +4599,25 @@
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
@@ -6053,7 +6407,7 @@
fi
fi
-@@ -4290,7 +4615,26 @@
+@@ -4334,7 +4668,26 @@
#endif
/* The mapping between symbol names and symbols. */
@@ -6080,7 +6434,7 @@
const char *name;
lt_ptr address;
}
-@@ -4337,20 +4681,33 @@
+@@ -4381,20 +4734,36 @@
esac
# Now compile the dynamic symbol file.
@@ -6111,6 +6465,9 @@
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ ;;
+ esac
++ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
;;
*)
$echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
@@ -6119,7 +6476,7 @@
;;
esac
else
-@@ -4363,17 +4720,6 @@
+@@ -4407,17 +4776,6 @@
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
fi
@@ -6137,7 +6494,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 +4784,7 @@
# We have no uninstalled library dependencies, so finalize right now.
$show "$link_command"
$run eval "$link_command"
@@ -6146,7 +6503,7 @@
# Delete the generated files.
if test -n "$dlsyms"; then
-@@ -4390,7 +4736,7 @@
+@@ -4434,7 +4792,7 @@
$run $rm "$output_objdir/${outputname}S.${objext}"
fi
@@ -6155,7 +6512,7 @@
fi
if test -n "$shlibpath_var"; then
-@@ -4449,7 +4795,7 @@
+@@ -4493,7 +4851,7 @@
# Link the executable and exit
$show "$link_command"
$run eval "$link_command" || exit $?
@@ -6164,7 +6521,7 @@
fi
if test "$hardcode_action" = relink; then
-@@ -4504,10 +4850,10 @@
+@@ -4548,10 +4906,10 @@
fi
# Quote $echo for shipping.
@@ -6179,14 +6536,16 @@
esac
qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
else
-@@ -4530,10 +4876,12 @@
+@@ -4573,11 +4931,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 +6555,7 @@
cat > $cwrappersource <<EOF
-@@ -4542,7 +4890,7 @@
+@@ -4586,7 +4946,7 @@
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -6205,7 +6564,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 +4962,9 @@
#include <malloc.h>
#include <stdarg.h>
#include <assert.h>
@@ -6215,7 +6574,7 @@
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
-@@ -4568,15 +4919,19 @@
+@@ -4612,15 +4975,19 @@
#endif
#ifndef DIR_SEPARATOR
@@ -6240,7 +6599,7 @@
#endif
#ifndef DIR_SEPARATOR_2
-@@ -4586,17 +4941,32 @@
+@@ -4630,17 +4997,32 @@
(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
#endif /* DIR_SEPARATOR_2 */
@@ -6275,7 +6634,7 @@
char * strendzap(char *str, const char *pat);
void lt_fatal (const char *message, ...);
-@@ -4605,30 +4975,52 @@
+@@ -4649,30 +5031,52 @@
{
char **newargz;
int i;
@@ -6337,7 +6696,7 @@
}
void *
-@@ -4641,59 +5033,159 @@
+@@ -4685,59 +5089,159 @@
return p;
}
@@ -6374,9 +6733,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 +6760,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 +6779,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 +6797,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 +6878,7 @@
{
size_t len, patlen;
-@@ -4713,7 +5205,7 @@
+@@ -4757,7 +5261,7 @@
}
static void
@@ -6528,7 +6887,7 @@
const char * message, va_list ap)
{
fprintf (stderr, "%s: %s: ", program_name, mode);
-@@ -4733,16 +5225,16 @@
+@@ -4777,16 +5281,16 @@
va_end (ap);
}
EOF
@@ -6555,7 +6914,7 @@
$echo > $output "\
#! $SHELL
-@@ -4763,7 +5255,7 @@
+@@ -4807,7 +5311,7 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
@@ -6564,7 +6923,7 @@
relink_command=\"$relink_command\"
-@@ -4842,7 +5334,7 @@
+@@ -4886,7 +5390,7 @@
else
$echo \"\$relink_command_output\" >&2
$rm \"\$progdir/\$file\"
@@ -6573,7 +6932,7 @@
fi
fi
-@@ -4892,32 +5384,32 @@
+@@ -4936,34 +5440,32 @@
# Backslashes separate directories on plain windows
*-*-mingw | *-*-os2*)
$echo >> $output "\
@@ -6583,8 +6942,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 +6973,7 @@
;;
esac
-@@ -4940,78 +5432,78 @@
+@@ -4986,78 +5488,78 @@
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
@@ -6752,7 +7113,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 +5568,18 @@
objlist=
concat_cmds=
save_oldobjs=$oldobjs
@@ -6787,7 +7148,7 @@
test "$len" -le "$max_cmd_len"; then
:
else
-@@ -5052,7 +5531,7 @@
+@@ -5098,7 +5587,7 @@
oldobjs=$objlist
if test "$obj" = "$last_oldobj" ; then
RANLIB=$save_RANLIB
@@ -6796,7 +7157,7 @@
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
objlist=
-@@ -5063,12 +5542,13 @@
+@@ -5109,12 +5598,13 @@
if test "X$oldobjs" = "X" ; then
eval cmds=\"\$concat_cmds\"
else
@@ -6811,7 +7172,7 @@
IFS="$save_ifs"
$show "$cmd"
$run eval "$cmd" || exit $?
-@@ -5100,11 +5580,13 @@
+@@ -5146,11 +5636,13 @@
fi
done
# Quote the link command for shipping.
@@ -6828,7 +7189,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 +5660,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 +7198,7 @@
fi
newdependency_libs="$newdependency_libs $libdir/$name"
;;
-@@ -5136,7 +5618,7 @@
+@@ -5182,7 +5674,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 +7207,7 @@
fi
newdlfiles="$newdlfiles $libdir/$name"
done
-@@ -5147,11 +5629,30 @@
+@@ -5193,11 +5685,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 +7239,7 @@
fi
$rm $output
# place dlname in correct position for cygwin
-@@ -5195,7 +5696,7 @@
+@@ -5241,7 +5752,7 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
@@ -6887,7 +7248,7 @@
$echo >> $output "\
relink_command=\"$relink_command\""
fi
-@@ -5208,7 +5709,7 @@
+@@ -5254,7 +5765,7 @@
$run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
;;
esac
@@ -6896,7 +7257,7 @@
;;
# libtool install mode
-@@ -5219,11 +5720,11 @@
+@@ -5265,11 +5776,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 +7271,7 @@
arg="\"$arg\""
;;
esac
-@@ -5232,14 +5733,14 @@
+@@ -5278,14 +5789,14 @@
shift
else
install_prog=
@@ -6927,7 +7288,7 @@
arg="\"$arg\""
;;
esac
-@@ -5257,28 +5758,31 @@
+@@ -5303,28 +5814,31 @@
do
if test -n "$dest"; then
files="$files $dest"
@@ -6967,7 +7328,7 @@
continue
fi
;;
-@@ -5287,7 +5791,7 @@
+@@ -5333,7 +5847,7 @@
# Aesthetically quote the argument.
arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
case $arg in
@@ -6976,7 +7337,7 @@
arg="\"$arg\""
;;
esac
-@@ -5297,13 +5801,13 @@
+@@ -5343,13 +5857,13 @@
if test -z "$install_prog"; then
$echo "$modename: you must specify an install program" 1>&2
$echo "$help" 1>&2
@@ -6992,7 +7353,7 @@
fi
if test -z "$files"; then
-@@ -5313,7 +5817,7 @@
+@@ -5359,7 +5873,7 @@
$echo "$modename: you must specify a destination" 1>&2
fi
$echo "$help" 1>&2
@@ -7001,7 +7362,7 @@
fi
# Strip any trailing slash from the destination.
-@@ -5334,7 +5838,7 @@
+@@ -5380,7 +5894,7 @@
if test "$#" -gt 2; then
$echo "$modename: \`$dest' is not a directory" 1>&2
$echo "$help" 1>&2
@@ -7010,7 +7371,7 @@
fi
fi
case $destdir in
-@@ -5346,7 +5850,7 @@
+@@ -5392,7 +5906,7 @@
*)
$echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
$echo "$help" 1>&2
@@ -7019,7 +7380,7 @@
;;
esac
done
-@@ -5375,7 +5879,7 @@
+@@ -5421,7 +5935,7 @@
else
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -7028,7 +7389,7 @@
fi
library_names=
-@@ -5417,7 +5921,7 @@
+@@ -5463,7 +5977,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 +7398,7 @@
fi
if test -n "$inst_prefix_dir"; then
-@@ -5432,7 +5936,7 @@
+@@ -5478,7 +5992,7 @@
if $run eval "$relink_command"; then :
else
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
@@ -7046,7 +7407,7 @@
fi
fi
-@@ -5456,23 +5960,36 @@
+@@ -5502,23 +6016,36 @@
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
@@ -7087,7 +7448,7 @@
done
IFS="$save_ifs"
fi
-@@ -5510,7 +6027,7 @@
+@@ -5556,7 +6083,7 @@
*)
$echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
$echo "$help" 1>&2
@@ -7096,7 +7457,7 @@
;;
esac
-@@ -5528,7 +6045,7 @@
+@@ -5574,7 +6101,7 @@
$show "$install_prog $staticobj $staticdest"
$run eval "$install_prog \$staticobj \$staticdest" || exit $?
fi
@@ -7105,7 +7466,7 @@
;;
*)
-@@ -5566,23 +6083,21 @@
+@@ -5612,23 +6139,21 @@
notinst_deplibs=
relink_command=
@@ -7138,7 +7499,7 @@
fi
finalize=yes
-@@ -5604,30 +6119,21 @@
+@@ -5650,30 +6175,21 @@
done
relink_command=
@@ -7169,7 +7530,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 +7539,7 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
-@@ -5651,7 +6157,7 @@
+@@ -5697,7 +6213,7 @@
fi
# remove .exe since cygwin /usr/bin/install will append another
@@ -7187,7 +7548,7 @@
case $install_prog,$host in
*/usr/bin/install*,*cygwin*)
case $file:$destfile in
-@@ -5683,16 +6189,17 @@
+@@ -5729,16 +6245,17 @@
$show "$install_prog $file $oldlib"
$run eval "$install_prog \$file \$oldlib" || exit $?
@@ -7207,7 +7568,7 @@
$show "$cmd"
$run eval "$cmd" || exit $?
done
-@@ -5706,9 +6213,9 @@
+@@ -5752,9 +6269,9 @@
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
test -n "$run" && current_libdirs=" -n$current_libdirs"
@@ -7219,7 +7580,7 @@
fi
;;
-@@ -5727,10 +6234,11 @@
+@@ -5773,10 +6290,11 @@
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
@@ -7232,7 +7593,7 @@
$show "$cmd"
$run eval "$cmd" || admincmds="$admincmds
$cmd"
-@@ -5747,9 +6255,9 @@
+@@ -5793,9 +6311,9 @@
fi
# Exit here if they wanted silent mode.
@@ -7244,7 +7605,7 @@
$echo "Libraries have been installed in:"
for libdir in $libdirs; do
$echo " $libdir"
-@@ -5782,8 +6290,8 @@
+@@ -5828,8 +6346,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 +7616,7 @@
;;
# libtool execute mode
-@@ -5795,7 +6303,7 @@
+@@ -5841,7 +6359,7 @@
if test -z "$cmd"; then
$echo "$modename: you must specify a COMMAND" 1>&2
$echo "$help"
@@ -7264,7 +7625,7 @@
fi
# Handle -dlopen flags immediately.
-@@ -5803,7 +6311,7 @@
+@@ -5849,7 +6367,7 @@
if test ! -f "$file"; then
$echo "$modename: \`$file' is not a file" 1>&2
$echo "$help" 1>&2
@@ -7273,7 +7634,7 @@
fi
dir=
-@@ -5814,7 +6322,7 @@
+@@ -5860,7 +6378,7 @@
else
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
$echo "$help" 1>&2
@@ -7282,7 +7643,7 @@
fi
# Read the libtool library.
-@@ -5841,7 +6349,7 @@
+@@ -5887,7 +6405,7 @@
dir="$dir/$objdir"
else
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
@@ -7291,7 +7652,7 @@
fi
;;
-@@ -5921,7 +6429,7 @@
+@@ -5967,7 +6485,7 @@
$echo "export $shlibpath_var"
fi
$echo "$cmd$args"
@@ -7300,7 +7661,7 @@
fi
;;
-@@ -5949,7 +6457,7 @@
+@@ -5995,7 +6513,7 @@
if test -z "$rm"; then
$echo "$modename: you must specify an RM program" 1>&2
$echo "$help" 1>&2
@@ -7309,7 +7670,7 @@
fi
rmdirs=
-@@ -5999,15 +6507,24 @@
+@@ -6045,15 +6563,24 @@
rmfiles="$rmfiles $objdir/$n"
done
test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
@@ -7337,7 +7698,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6019,10 +6536,11 @@
+@@ -6065,10 +6592,11 @@
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
@@ -7350,7 +7711,7 @@
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
-@@ -6032,7 +6550,8 @@
+@@ -6078,7 +6606,8 @@
IFS="$save_ifs"
fi
# FIXME: should reinstall the best remaining shared library.
@@ -7360,7 +7721,7 @@
fi
;;
-@@ -6061,7 +6580,7 @@
+@@ -6107,7 +6636,7 @@
if test "$mode" = clean ; then
noexename=$name
case $file in
@@ -7369,7 +7730,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 +6681,20 @@
"")
$echo "$modename: you must specify a MODE" 1>&2
$echo "$generic_help" 1>&2
@@ -7393,7 +7754,7 @@
fi
# We need to display help for each of the modes.
-@@ -6155,7 +6674,7 @@
+@@ -6201,7 +6730,7 @@
a more detailed description of MODE.
Report bugs to <bug-libtool at gnu.org>."
@@ -7402,7 +7763,7 @@
;;
clean)
-@@ -6267,6 +6786,8 @@
+@@ -6313,6 +6842,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 +7772,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 +6885,14 @@
*)
$echo "$modename: invalid operation mode \`$mode'" 1>&2
$echo "$help" 1>&2
@@ -7428,7 +7789,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 +6906,11 @@
# configuration. But we'll never go from static-only to shared-only.
# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
More information about the Midnightbsd-cvs
mailing list