TomF changes for Gnome-2 branch
Thomas Frayne
TomF at sjpc.org
Tue Feb 18 21:48:28 CST 2003
Here are my changes for the Gnome-2 branch. I had to put them in an
attached file because something is wrong with my clipboard when copying
large selections.
-------------- next part --------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.1
diff -u -r1.1487.2.1 ChangeLog
--- ChangeLog 15 Feb 2003 16:08:06 -0000 1.1487.2.1
+++ ChangeLog 19 Feb 2003 05:11:09 -0000
@@ -1,9 +1,27 @@
+2003-02-18 TomF changes for Gnome-2 branch
+
+ * autogen.sh: Use Gnome2 libraries
+ * configure.in: Initial changes to make autogen.sh work and have make use the correct glib_2_0. Many changes still needed for make to complete without errors.
+ * acconfig.h: Use GETTEXT_PACKAGE
+
+2003-02-17 gettextize <bug-gnu-gettext at gnu.org>
+
+ * configure.in (AC_OUTPUT): Add intl/Makefile.
+
+2003-02-17 gettextize <bug-gnu-gettext at gnu.org>
+
+ * Makefile.am (SUBDIRS): Remove intl.
+
+2003-02-17 gettextize <bug-gnu-gettext at gnu.org>
+
+ * configure.in (AC_OUTPUT): Remove intl/Makefile.
+
2003-02-15 Derek Atkins <derek at ihtfp.com>
* Start changes for Gnome-2.
* remove macros/gnome*.m4, so we can use gnome's installed versions.
-2003-02-14 Benoit Grégoire <bock at step.polymtl.ca>
+2003-02-14 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/import-backend.c:
-Remove unused code.
@@ -45,13 +63,13 @@
gnc_import_TransInfo_refresh_destacc move g_assert before first
assignment, otherwise I get a syntax error
-2003-02-10 Benoit Grégoire <bock at step.polymtl.ca>
+2003-02-10 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/import-main-matcher.c: Patch by cmorgan to
restrict iterative destination account matching to transactions
AFTER the current one in the clist.
-2003-02-10 Benoit Grégoire <bock at step.polymtl.ca>
+2003-02-10 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/import-backend.c,h:
* src/import-export/import-main-matcher.c: Apply most of cmorgan's
@@ -123,7 +141,7 @@
* src/business/business-utils/Makefile.am: make scm-links so you
can run gnucash from within the build tree
-2003-02-04 Benoit Grégoire <bock at step.polymtl.ca>
+2003-02-04 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/import-backend.c: Add heuristic for duplicate matching by check number.
* doc/README.OFX: Update
@@ -163,7 +181,7 @@
* rpm/gnucash.spec.in: add options to build ofx,hbci and postgresql
-2003-02-02 Benoit Grégoire <bock at step.polymtl.ca>
+2003-02-02 Benoit Grégoire <bock at step.polymtl.ca>
* doc/README.OFX: I've quickly put together some docs for the ofx module and transaction matching. Also includes a FAQ. Not perfect, but should closebug 99478.
* doc/Makefile.am: Add README.OFX
@@ -202,7 +220,7 @@
* src/import-export/Makefile.am:
Removed gnc-gen-transaction.[ch] "properly" for the dist.
-2003-02-01 Benoit Grégoire <bock at step.polymtl.ca>
+2003-02-01 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/gnc-ofx-import.c: No longer assume that transaction with type OFX_OTHER are investement transactions. Fixes bug reported by Rik harris.
* src/import-export/import-main-matcher.c: Fix unrelated display bug with balanced (typically investement) transactions.
@@ -221,7 +239,7 @@
string freeze -- but these strings *really* *only* apply to German
users, so I just fixed the translation myself.
-2003-02-01 Benoit Grégoire <bock at step.polymtl.ca>
+2003-02-01 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/import-utilities.c: Build on Nigel's patch.
This hopefully permanently closes
@@ -955,7 +973,7 @@
* src/engine/gnc-commodity.c: Convert from the old to new symbols
for Russian Roubles (RUB -> RUR). #102705
-2002-01-11 Benoit Grégoire <bock at step.polymtl.ca>
+2002-01-11 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/import-backend.c: Fixed the date heuristics
modifications, which had an unfortunate interaction with old
@@ -1072,7 +1090,7 @@
* src/engine/iso-currencies-to-c:
Look for auto-generated files in srcdir.
-2002-1-6 Benoit Grégoire <bock at step.polymtl.ca>
+2002-1-6 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/import-backend.c: Give a much higher importance
the date heuristics. Exact date now worth +3, date within
MATCH_DATE_THRESHOLD worth +2, and dates outside
@@ -1330,7 +1348,7 @@
the rpc-server command-line option only works if gnucash was compiled
with rpc enabled.
-2002-12-30 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-30 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/hbci/druid-hbci-initial.c
* src/import-export/hbci/gnc-hbci-utils.c:
Fix a bunch of "warning: deprecated use of label at end of
@@ -1652,7 +1670,7 @@
* rpm/gnucash.spec.in: fix for problem reports on gnucash-user
-2002-12-12 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-12 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/import-account-matcher.c: Fix "level 3 and
more subaccount not selected by default" bug.
@@ -1708,7 +1726,7 @@
* src/report/report-system/commodity-utilities.scm: Fix bug
#100463.
-2002-12-10 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-10 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/*: Add user pref to allow HBCI users
to select if they want Christian's matcher or mine.
Update OFX readme.
@@ -1726,14 +1744,14 @@
RO Txns before you delete the account. Fix for bug# 100727 (although
it requires invoice unposting to work).
-2002-12-9 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-9 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/import-main-matcher.c:
* src/import-export/generic-import.glade: Change colors, remove
imbalance column and put it's info into the "Select action column",
when appropriate. Change many strings after discussion with
Wilddev.
-2002-12-8 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-8 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/import-account-matcher.c,h: Add param to
gnc_import_select_account():
@param ok_pressed A pointer to gboolean. If non-NULL, whether or
@@ -1747,7 +1765,7 @@
above change. Shorten the strings in the "Specific action to be
taken" column.
-2002-12-8 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-8 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/import-backend.c: Make the auto-balance
split have the correct amount in all cases by using
xaccTransGetImbalance() instead of the first split's value.
@@ -1807,7 +1825,7 @@
* src/scm/main.scm: Tweak the file name normalization code.
-2002-12-7 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-7 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/generic-import.glade: Add user instructions,
get rid of apply button.
@@ -1881,7 +1899,7 @@
gnc_commodity_equal(), because the average user doesn't need
to know why commodities are not equal.
-2002-12-07 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-07 Benoit Grégoire <bock at step.polymtl.ca>
More Doxygenification. Created an Engine module, and a
Deprecated list. Unfortunately, unless we turn on EXTRACT_ALL
@@ -1919,7 +1937,7 @@
* po/nl.po: Fix use of msgid_plural by adding the appropriate
header entry.
-2002-12-06 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-06 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/ofx/gnc-ofx-import.c: Do the "right"
thing for setting split amount and value.
@@ -1935,11 +1953,11 @@
* po/nl.po -- don't use msgid_plural -- it fails to work.
-2002-12-06 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-06 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/import-backend.c: Fix for gcc2
-2002-12-06 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-06 Benoit Grégoire <bock at step.polymtl.ca>
Huge patch, this is the new generic import
architecture/transaction matcher. Many old
@@ -2329,7 +2347,7 @@
* src/import-export/generic-import.glade: Add explaining label for
importer window.
-2002-11-27 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-27 Benoit Grégoire <bock at step.polymtl.ca>
* Makefile.am configure.in src/doc/Makefile.am
src/doc/doxygen.cfg src/doc/doxygen_main_page.c: Added doxygen
@@ -2390,11 +2408,11 @@
fuzzy amount matching threshold, so that this feature can be used
from gnc-ofx-import.c.
-2002-11-25 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-25 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/hbci/gnc-hbci-gettrans.c: Remove
#include "gnc-generic-import.h"
-2002-11-25 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-25 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/Account-matcher.[c,h]: Minor changes to make
the matcher more generic: Improved text handling, default account
support, enable account description, disable showing Online ID
@@ -2427,7 +2445,7 @@
gnc-split-reg isn't changing the window-titles of windows it has
no authority over. Fixed Bug#99396.
-2002-11-25 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-25 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/*.c,h: Split gnc-generic-import.h in one
header per file.
@@ -2607,7 +2625,7 @@
* README/README.cvs -- update to reference how to "properly" use
autogen.sh
-2002-11-21 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-21 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/Transaction-matcher.c: Tweak the matching
heuristics.
-Memo and description heuristics now both have a very primitive
@@ -2619,7 +2637,7 @@
always written in the split's memo.
* src/doc/user-prefs-howto.txt: Add new file, by Christian Stimming.
-2002-11-21 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-21 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/generic-import.scm: New file, contains user
prefs for the Transaction matcher:
Display, Auto-ADD and Auto-CLEAR thresholds can be adjusted.
@@ -2639,7 +2657,7 @@
correctly with currency exchange transactions from 1.6. Fixes
reported problems with importing 1.6 data files, #91505.
-2002-11-18 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-18 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/Transaction-matcher.c: Change default "RECONCILE"
action from 'y' (reconciled) to'c' (cleared)
@@ -2658,7 +2676,7 @@
* NEWS: update to new version 1.7.3
* configure.in: update to new version 1.7.3
-2002-11-18 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-18 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/Transaction-matcher.c: Remove constant length
strings and replace with moving pointers. I wish _("string")
could be used as a could initializer like "string" can...
@@ -2843,7 +2861,7 @@
* po/nb.po: New filename for Norwegian (bokmal) translation -- it
used to be stored under no.po but that is no longer.
-2002-11-13 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-13 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/Transaction-matcher.c:
-Don't show match with probability less than 1, so we don't
end up showing the whole account.
@@ -2855,7 +2873,7 @@
online.
-Steal a better pixmap from gnome drop down menu.
-2002-11-13 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-13 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/ofx/gnc-ofx-import.c: MAJOR improvement to
investment support. All transactions created from an investment
@@ -2929,7 +2947,7 @@
* src/business/business-ledger/gncEntryLedgerControl.c: Implement
the equivalent fixes for the business ledger.
-2002-11-12 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-12 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/Transaction-matcher.c: Fix previous patch.
gcc 3.2 is too forgiving...
@@ -3167,7 +3185,7 @@
2002-10-31 Derek Atkins <derek at ihtfp.com>
* import-export/ofx/Makefile.am: add gncscm_DATA to EXTRA_DIST
-2002-10-30 Benoit Grégoire <bock at step.polymtl.ca>
+2002-10-30 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/ofx/gnc-ofx-import.c: Fix security account creation bug caused by the presence of the character ':' in the account default name. Fix compiler warnings.
2002-10-30 Derek Atkins <derek at ihtfp.com>
@@ -3440,7 +3458,7 @@
2002-10-21 Derek Atkins <derek at ihtfp.com>
* app-utils/options.scm -- fix (find-first-account) to search subaccounts
-2002-10-20 Benoit Grégoire <bock at step.polymtl.ca>
+2002-10-20 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/Trasaction-matcher.c: Fix compiler warnings.
* src/import-export/ofx/gnc-ofx-import.c: Give the user more information
for account creation.
@@ -3461,7 +3479,7 @@
Also had to remove -Werror from hbci/Makefile.am due to darn cc
warnings about order of includes.
-2002-10-20 Benoit Grégoire <bock at step.polymtl.ca>
+2002-10-20 Benoit Grégoire <bock at step.polymtl.ca>
* Investment transactions now create two accounts, one is for the stock,
the other is the account defined by the FI, where the cash is swapped.
@@ -3517,7 +3535,7 @@
* Matthew Vanecek's gncQueryPrint() patch
-2002-10-18 Benoit Grégoire <bock at step.polymtl.ca>
+2002-10-18 Benoit Grégoire <bock at step.polymtl.ca>
* Implement a working commodity matcher for the generic import
module.
@@ -3725,7 +3743,7 @@
* src/app-utils/gnc-ui-util.c: Move gnc_get_current_session() into
gnc-session.c. #94551
-2002-10-09 Benoit Grégoire <bock at step.polymtl.ca>
+2002-10-09 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/Account-matcher.c: Change "Account ID" text
to "Full account ID" and make it translatable.
@@ -3981,7 +3999,7 @@
transaction download with usage of generic transaction
import. Requires OpenHBCI CVS update.
-2002-09-29 Benoit Grégoire <bock at step.polymtl.ca>
+2002-09-29 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/Transaction-matcher.c: Fix segfault when
importing into a gnucash account which has no splits.
@@ -4006,7 +4024,7 @@
* src/report/standard-reports/balance-sheet.scm: Use the report
name from the options instead of a hard coded report title.
-2002-09-26 Benoit Grégoire <bock at step.polymtl.ca>
+2002-09-26 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/ofx/gnc-ofx-import.c: The default commodity
and account type are now preselected from OFX provided information
@@ -4017,7 +4035,7 @@
* src/import-export/Account-matcher.c, gnc-generic-import.h:
-Fix the new_account_default_type parameter of
gnc_import_select_account() not selecting default type properly.
- -Add auto_create parameter to gnc_import_select_account().
+ -Add auto_create parameter to gnc_import_select_account(). Â
If this parameter is 0 and the function is called, it will silently
return NULL if no matching account is found, instead of asking the
user to select or create an account.
@@ -4051,7 +4069,7 @@
* src/gnome/dialog-transfer.[hc]: Add set_memo access function.
-2002-09-23 Benoit Grégoire <bock at step.polymtl.ca>
+2002-09-23 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/Transaction-matcher.c, generic-import.glade:
-Transactions just downloaded are now ignored from the matchlist.
@@ -4070,7 +4088,7 @@
transaction matcher and change the look and alignment of
the action buttons.
-2002-09-22 Benoit Grégoire <bock at step.polymtl.ca>
+2002-09-22 Benoit Grégoire <bock at step.polymtl.ca>
* src/import-export/gnc-generic-import.c: Remove obsolete file now
split into Account.c Transaction.c and Utilities.c
@@ -7978,7 +7996,7 @@
* po/glossary/de.po, txt-to-pot.sh: Several updates from the
stable branch.
- * po/glossary/es.po: Added Spanish translation by Raúl Miró
+ * po/glossary/es.po: Added Spanish translation by Raúl Miró
<cotin at geocities.com>
2001-10-03 Robert Graham Merkel <rgmerk at mira.net>
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/Makefile.am,v
retrieving revision 1.55
diff -u -r1.55 Makefile.am
--- Makefile.am 21 Jan 2003 04:40:14 -0000 1.55
+++ Makefile.am 19 Feb 2003 05:11:09 -0000
@@ -1,5 +1,5 @@
-SUBDIRS = intl m4 macros debian doc lib src intl-scm po rpm accounts
+SUBDIRS = m4 macros debian doc lib src intl-scm po rpm accounts
docdir = ${GNC_DOC_INSTALL_DIR}
@@ -39,7 +39,7 @@
# Don't list any directories or you'll get *everything*, including the
# CVS dirs.
-EXTRA_DIST = config.rpath \
+EXTRA_DIST = config.rpath config.rpath \
.cvsignore \
ChangeLog.1 \
HACKING \
Index: acconfig.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/acconfig.h,v
retrieving revision 1.21
diff -u -r1.21 acconfig.h
--- acconfig.h 10 Sep 2001 07:01:33 -0000 1.21
+++ acconfig.h 19 Feb 2003 05:11:09 -0000
@@ -90,6 +90,7 @@
/* internationalization with gettext */
#undef HAVE_GETTEXT
+#undef GETTEXT_PACKAGE
/* internationalization with catgets */
#undef HAVE_CATGETS
Index: autogen.sh
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/autogen.sh,v
retrieving revision 1.1
diff -u -r1.1 autogen.sh
--- autogen.sh 13 Sep 2000 22:31:54 -0000 1.1
+++ autogen.sh 19 Feb 2003 05:11:09 -0000
@@ -14,4 +14,6 @@
exit 1
}
+USE_GNOME2_MACROS=1
. $srcdir/macros/autogen.sh
+
Index: configure.in
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/configure.in,v
retrieving revision 1.359
diff -u -r1.359 configure.in
--- configure.in 3 Feb 2003 07:44:58 -0000 1.359
+++ configure.in 19 Feb 2003 05:11:10 -0000
@@ -32,7 +32,7 @@
GNUCASH_MAJOR_VERSION=1
GNUCASH_MINOR_VERSION=9
-GNUCASH_MICRO_VERSION=0
+GNUCASH_MICRO_VERSION=10
GNUCASH_VERSION=$GNUCASH_MAJOR_VERSION.$GNUCASH_MINOR_VERSION.$GNUCASH_MICRO_VERSION
AC_SUBST(GNUCASH_MAJOR_VERSION)
@@ -51,12 +51,18 @@
dnl Set of available languages.
ALL_LINGUAS="da de el en_GB es es_NI fr hu it ja nb nl pl pt pt_BR ru sk sv uk zh_CN zh_TW"
-AM_GNU_GETTEXT([use-libtool])
+
+GETTEXT_PACKAGE=gnucash
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
+
+AM_GLIB_GNU_GETTEXT([use-libtool])
AM_MAINTAINER_MODE
AM_ACLOCAL_INCLUDE(macros)
+
AC_PROG_INSTALL
AC_LIBTOOL_DLOPEN
@@ -81,14 +87,15 @@
AC_MSG_ERROR([Cannot find ltdl.h -- libtool-devel not installed?])
fi
-AM_PATH_GLIB
+AM_PATH_GLIB_2_0
+
if test ${no_glib}x = yesx
then
AC_MSG_ERROR([Cannot find glib. Check config.log])
fi
-AC_CHECK_HEADERS(dlfcn.h dl.h ghttp_ssl.h utmp.h locale.h mcheck.h unistd.h wctype.h)
+AC_CHECK_HEADERS(dlfcn.h dl.h utmp.h locale.h mcheck.h unistd.h wctype.h)
DL_LIB=
AC_CHECK_FUNCS(dlopen,,[
@@ -275,19 +282,33 @@
AC_MSG_RESULT(yes)
fi
+### --------------------------------------------------------------------------
+### See if we have pkg-config
+
+AC_PATH_PROG(PKG_CONFIG,pkg-config)
+if test "x$PKG_CONFIG" = x; then
+ # @*%&$ Ximian programmers renamed this application
+ AC_PATH_PROG(PKG_CONFIG,pkgconfig)
+ if test "x$PKG_CONFIG" = x; then
+ AC_MSG_ERROR([Could not find the pkg-config (or pkgconfig) program.],)
+ fi
+fi
+
+
AM_CONDITIONAL(GNC_HAVE_GUILE_WWW, test "${gnc_have_guile_www}" = yes)
### --------------------------------------------------------------------------
### Gnome XML -- GNOME_XML_LIB is defined by GNOME_XML_CHECK
-GNOME_XML_CHECK
-GNOME_XML_CFLAGS=`$GNOME_CONFIG --cflags xml`
+# GNOME_XML_CHECK 2/18/03 remove to bypass autogen.sh message
+GNOME_XML_CFLAGS=`$PKG_CONFIG --cflags xml`
AS_SCRUB_INCLUDE(GNOME_XML_CFLAGS)
AC_SUBST(GNOME_XML_CFLAGS)
oLIBS="$LIBS"
LIBS="$LIBS $GNOME_XML_LIB"
+
AC_CHECK_LIB(xml, xmlElemDump, [:], [
AC_MSG_ERROR([libxml 1.8.3 or newer required for GnuCash])
])
@@ -520,7 +541,8 @@
HBCI_DIR=hbci)
if test x${HBCI_DIR} = xhbci ;
then
- AM_PATH_OPENHBCI(0.9.4)
+# Temp remove
+# AM_PATH_OPENHBCI(0.9.4)
HBCI_LIBS="${OPENHBCI_LIBS}"
HBCI_CFLAGS="${OPENHBCI_CXXFLAGS}"
@@ -750,13 +772,13 @@
if test x${gnc_build_gui} = xtrue ;
then
- GNOME_INIT
+# GNOME_INIT 2/18/03 remove
GNOME_COMPILE_WARNINGS
- GNOME_CHECK_GDK_PIXBUF
- GNOME_PRINT_CHECK
+# GNOME_CHECK_GDK_PIXBUF
+# GNOME_PRINT_CHECK
# gnome-print-check appears tobe sort of b0rked for the time being
- GNOME_PRINT_CFLAGS=`${GNOME_CONFIG} --cflags print`
+ GNOME_PRINT_CFLAGS=`${PKG_CONFIG} --cflags print`
AS_SCRUB_INCLUDE(GNOME_PRINT_CFLAGS)
### ----------------------------------------------------------------------
@@ -775,11 +797,11 @@
### ----------------------------------------------------------------------
AC_CHECK_LIB(gal, main, true,
[AC_MSG_ERROR([gal library not found. See the README and config.log for more info.])],
- `$GNOME_CONFIG --libs gal`)
+ `$PKG_CONFIG --libs gal`)
AC_MSG_CHECKING([for gtkhtml < 1.1])
- GTKHTML_LIBS=`$GNOME_CONFIG --libs gtkhtml`
- GTKHTML_CFLAGS=`$GNOME_CONFIG --cflags gtkhtml`
+ GTKHTML_LIBS=`$PKG_CONFIG --libs gtkhtml`
+ GTKHTML_CFLAGS=`$PKG_CONFIG --cflags gtkhtml`
if test "x$GTKHTML_LIBS" != x; then
# check for gtkhtml and enable it via HAVE_LIBGTKHTML
# if found
@@ -789,14 +811,6 @@
AC_MSG_ERROR([Cannot find gtkhtml. See the README and config.log for more info.]),
$GTKHTML_LIBS)
else
- AC_PATH_PROG(PKG_CONFIG,pkg-config)
- if test "x$PKG_CONFIG" = x; then
- # @*%&$ Ximian programmers renamed this application
- AC_PATH_PROG(PKG_CONFIG,pkgconfig)
- if test "x$PKG_CONFIG" = x; then
- AC_MSG_ERROR([Could not find the pkg-config (or pkgconfig) program.],)
- fi
- fi
GTKHTML_LIBS=`$PKG_CONFIG --libs gtkhtml-1.1`
GTKHTML_CFLAGS=`$PKG_CONFIG --cflags gtkhtml-1.1`
# check for gtkhtml and enable it via HAVE_LIBGTKHTML
@@ -810,48 +824,11 @@
fi
AS_SCRUB_INCLUDE(GTKHTML_CFLAGS)
- GHTTP_LIBS=`$GNOME_CONFIG --libs ghttp`
- GHTTP_CFLAGS=`$GNOME_CONFIG --cflags ghttp`
-
- # Note: this doesn't croak if GHTTP_LIBS is empty! (e.g. on RH6.2)
- AC_CHECK_LIB(ghttp, ghttp_request_new,
- GNOMEBUILDLIBS="${GNOMEBUILDLIBS} ghttp"
- AC_DEFINE(HAVE_LIBGHTTP)
- if test "x$GHTTP_LIBS" = "x" ; then
- GHTTP_LIBS=-lghttp
- fi,
- AC_MSG_ERROR([Cannot find ghttp. See the README and config.log for more info.]),
- $GHTTP_LIBS)
-
- AC_CHECK_LIB(ghttp, ghttp_enable_ssl,
- AC_DEFINE(HAVE_OPENSSL),
- AC_MSG_WARN([****** ghttp does not have SSL support.]),
- $GHTTP_LIBS)
-
- AS_SCRUB_INCLUDE(GHTTP_CFLAGS)
AC_SUBST(GTKHTML_LIBS)
AC_SUBST(GTKHTML_CFLAGS)
- AC_SUBST(GHTTP_LIBS)
- AC_SUBST(GHTTP_CFLAGS)
### ----------------------------------------------------------------------
- ### guppi
-
- AC_ARG_ENABLE( guppi,
- [ --disable-guppi compile without guppi support],
- if test $enableval = no; then
- USE_GUPPI=0
- else
- USE_GUPPI=1
- fi,
- USE_GUPPI=1 )
-
- if test ${USE_GUPPI} = 0; then
- AC_MSG_WARN([Compiling without guppi support])
- else
- AC_DEFINE(USE_GUPPI)
-
AC_ARG_ENABLE( efence,
[ --enable-efence link using efence],
@@ -864,34 +841,9 @@
EFENCE_LIBS="")
AC_SUBST(EFENCE_LIBS)
- ## Things guppi needs (actually are these guppi dependencies or gtkhtml's?)
-
- # LAME: if you ask gnome-config for the zvt libs, it doesn't include
- # imlib, though it needs it so we'll just steal gtkhtml's which does.
- AC_CHECK_LIB(zvt, main, true,
- [AC_MSG_ERROR([libzvt development files not found. See config.log.])],
- `$GNOME_CONFIG --libs zvt` $GTKHTML_LIBS)
-
- #AC_CHECK_LIB(bonobo, main, true,
- # [AC_MSG_ERROR([libbonobo development files not found. See config.log.])
- #],
- # `$GNOME_CONFIG --libs bonobo`)
-
- AC_CHECK_LIB(oaf, main, true,
- [AC_MSG_ERROR([liboaf development files not found. See config.log.])],
- `$GNOME_CONFIG --libs oaf`)
-
- ## guppi itself.
-
- GUPPI_LIBS=`$GNOME_CONFIG --libs libguppi`
- GUPPI_CFLAGS=`$GNOME_CONFIG --cflags libguppi`
- AS_SCRUB_INCLUDE(GUPPI_CFLAGS)
- LIBGUPPI_CHECK
- AC_SUBST(GUPPI_LIBS)
- AC_SUBST(GUPPI_CFLAGS)
-
- fi
+
+
### ----------------------------------------------------------------------
### XIM
AC_ARG_ENABLE(xim,
@@ -982,14 +934,14 @@
AC_SUBST(GNUCASH_APP_UTILS_CFLAGS)
AC_SUBST(GNUCASH_APP_UTILS_LIBS)
-GNUCASH_NETWORK_UTILS_CFLAGS="${GLIB_CFLAGS} ${GHTTP_CFLAGS} ${GNOME_INCLUDEDIR}"
-GNUCASH_NETWORK_UTILS_LIBS="${GHTTP_LIBS} ${GNOME_LIBDIR} ${GNOME_LIBS} ${GNOMEUI_LIBS} -lgncmod-network-utils"
+GNUCASH_NETWORK_UTILS_CFLAGS="${GLIB_CFLAGS} ${GNOME_INCLUDEDIR}"
+GNUCASH_NETWORK_UTILS_LIBS="${GNOME_LIBDIR} ${GNOME_LIBS} ${GNOMEUI_LIBS} -lgncmod-network-utils"
AC_SUBST(GNUCASH_NETWORK_UTILS_CFLAGS)
AC_SUBST(GNUCASH_NETWORK_UTILS_LIBS)
-GNUCASH_GNOME_UTILS_CFLAGS="${GNUCASH_APP_UTILS_CFLAGS} ${GNUCASH_NETWORK_UTILS_CFLAGS} ${GNOME_PRINT_CFLAGS} ${GNOME_INCLUDEDIR} ${GUPPI_CFLAGS} ${GDK_PIXBUF_CFLAGS}"
-GNUCASH_GNOME_UTILS_LIBS="${GNUCASH_APP_UTILS_LIBS} ${GNUCASH_NETWORK_UTILS_LIBS} ${GNOME_LIBDIR} ${GNOMEUI_LIBS} ${GNOME_PRINT_LIBS} ${GTKHTML_LIBS} ${GLADE_LIBS} ${GUPPI_LIBS} ${GDK_PIXBUF_LIBS} -lgncmod-gnome-utils"
+GNUCASH_GNOME_UTILS_CFLAGS="${GNUCASH_APP_UTILS_CFLAGS} ${GNUCASH_NETWORK_UTILS_CFLAGS} ${GNOME_PRINT_CFLAGS} ${GNOME_INCLUDEDIR} ${GDK_PIXBUF_CFLAGS}"
+GNUCASH_GNOME_UTILS_LIBS="${GNUCASH_APP_UTILS_LIBS} ${GNUCASH_NETWORK_UTILS_LIBS} ${GNOME_LIBDIR} ${GNOMEUI_LIBS} ${GNOME_PRINT_LIBS} ${GTKHTML_LIBS} ${GLADE_LIBS} ${GDK_PIXBUF_LIBS} -lgncmod-gnome-utils"
AC_SUBST(GNUCASH_GNOME_UTILS_CFLAGS)
AC_SUBST(GNUCASH_GNOME_UTILS_LIBS)
@@ -1067,7 +1019,7 @@
LIBOBJS_SEDSCRIPT="s,\.[[^.]]* ,$U&,g;s,\.[[^.]]*\$\$,$U&,"
AC_SUBST(LIBOBJS_SEDSCRIPT)
-AC_OUTPUT( m4/Makefile intl/Makefile po/Makefile.in
+AC_OUTPUT( m4/Makefile po/Makefile.in intl/Makefile
dnl # Makefiles
Makefile
accounts/Makefile
Index: ltmain.sh
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ltmain.sh,v
retrieving revision 1.7
diff -u -r1.7 ltmain.sh
--- ltmain.sh 29 Aug 2002 04:12:30 -0000 1.7
+++ ltmain.sh 19 Feb 2003 05:11:12 -0000
@@ -24,9 +24,6 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# turn off piecewise linking
-max_cmd_len=-2
-
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
@@ -58,8 +55,8 @@
# Constants.
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.4c
-TIMESTAMP=" (1.1054 2001/09/16 15:48:23)"
+VERSION=1.4.2
+TIMESTAMP=" (1.922.2.54 2001/09/11 03:33:37)"
default_mode=
help="Try \`$progname --help' for more information."
@@ -109,7 +106,7 @@
o2lo="s/\\.${objext}\$/.lo/"
# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
+while test $# -gt 0
do
arg="$1"
shift
@@ -125,33 +122,6 @@
execute_dlfiles)
execute_dlfiles="$execute_dlfiles $arg"
;;
- tag)
- tagname="$arg"
-
- # Check whether tagname contains only valid characters
- case $tagname in
- *[!-_A-Za-z0-9,/]*)
- echo "$progname: invalid tag name: $tagname" 1>&2
- exit 1
- ;;
- esac
-
- case $tagname in
- CC)
- # Don't test for the "default" C tag, as we know, it's there, but
- # not specially marked.
- ;;
- *)
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
- taglist="$taglist $tagname"
- # Evaluate the configuration.
- eval "`sed -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
- else
- echo "$progname: ignoring unknown tag $tagname" 1>&2
- fi
- ;;
- esac
- ;;
*)
eval "$prev=\$arg"
;;
@@ -170,20 +140,11 @@
--version)
echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
- echo
- echo "Copyright 1996, 1997, 1998, 1999, 2000, 2001"
- echo "Free Software Foundation, Inc."
- echo "This is free software; see the source for copying conditions. There is NO"
- echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
exit 0
;;
--config)
sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
- # Now print the configurations for the tags.
- for tagname in $taglist; do
- sed -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
- done
exit 0
;;
@@ -216,17 +177,12 @@
--mode) prevopt="--mode" prev=mode ;;
--mode=*) mode="$optarg" ;;
+ --preserve-dup-deps) duplicate_deps="yes" ;;
+
--quiet | --silent)
show=:
;;
- --tag) prevopt="--tag" prev=tag ;;
- --tag=*)
- set tag "$optarg" ${1+"$@"}
- shift
- prev=tag
- ;;
-
-dlopen)
prevopt="-dlopen"
prev=execute_dlfiles
@@ -467,7 +423,7 @@
# Recognize several different file suffixes.
# If the user specifies -o file.o, it is replaced with file.lo
- xform='[cCFSifmso]'
+ xform='[cCFSfmso]'
case $libobj in
*.ada) xform=ada ;;
*.adb) xform=adb ;;
@@ -475,13 +431,10 @@
*.asm) xform=asm ;;
*.c++) xform=c++ ;;
*.cc) xform=cc ;;
- *.ii) xform=ii ;;
- *.class) xform=class ;;
*.cpp) xform=cpp ;;
*.cxx) xform=cxx ;;
*.f90) xform=f90 ;;
*.for) xform=for ;;
- *.java) xform=java ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -494,59 +447,6 @@
;;
esac
- # Infer tagged configuration to use if any are available and
- # if one wasn't chosen via the "--tag" command line option.
- # Only attempt this if the compiler in the base compile
- # command doesn't match the default compiler.
- if test -n "$available_tags" && test -z "$tagname"; then
- case $base_compile in
- "$CC "*) ;;
- # Blanks in the command may have been stripped by the calling shell,
- # but not from the CC environment variable when ltconfig was run.
- "`$echo $CC` "*) ;;
- *)
- for z in $available_tags; do
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
- # Evaluate the configuration.
- eval "`sed -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
- case $base_compile in
- "$CC "*)
- # The compiler in the base compile command matches
- # the one in the tagged configuration.
- # Assume this is the tagged configuration we want.
- tagname=$z
- break
- ;;
- "`$echo $CC` "*)
- tagname=$z
- break
- ;;
- esac
- fi
- done
- # If $tagname still isn't set, then no tagged configuration
- # was found and let the user know that the "--tag" command
- # line option must be used.
- if test -z "$tagname"; then
- echo "$modename: unable to infer tagged configuration"
- echo "$modename: specify a tag with \`--tag'" 1>&2
- exit 1
-# else
-# echo "$modename: using $tagname tagged configuration"
- fi
- ;;
- esac
- fi
-
- objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
- xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$xdir" = "X$obj"; then
- xdir=
- else
- xdir=$xdir/
- fi
- lobj=${xdir}$objdir/$objname
-
if test -z "$base_compile"; then
$echo "$modename: you must specify a compilation command" 1>&2
$echo "$help" 1>&2
@@ -555,9 +455,9 @@
# Delete any leftover library objects.
if test "$build_old_libs" = yes; then
- removelist="$obj $lobj $libobj ${libobj}T"
+ removelist="$obj $libobj"
else
- removelist="$lobj $libobj ${libobj}T"
+ removelist="$libobj"
fi
$run $rm $removelist
@@ -582,7 +482,6 @@
removelist="$removelist $output_obj $lockfile"
trap "$run $rm $removelist; exit 1" 1 2 15
else
- output_obj=
need_locks=no
lockfile=
fi
@@ -617,48 +516,49 @@
eval srcfile=\"$fix_srcfile_path\"
fi
- $run $rm "$libobj" "${libobj}T"
-
- # Create a libtool object file (analogous to a ".la" file),
- # but don't create it if we're doing a dry run.
- test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
# Only build a PIC object if we are building libtool libraries.
if test "$build_libtool_libs" = yes; then
# Without this assignment, base_compile gets emptied.
fbsd_hideous_sh_bug=$base_compile
if test "$pic_mode" != no; then
- command="$base_compile $srcfile $pic_flag"
+ # All platforms use -DPIC, to notify preprocessed assembler code.
+ command="$base_compile $srcfile $pic_flag -DPIC"
else
# Don't build PIC code
command="$base_compile $srcfile"
fi
+ if test "$build_old_libs" = yes; then
+ lo_libobj="$libobj"
+ dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$dir" = "X$libobj"; then
+ dir="$objdir"
+ else
+ dir="$dir/$objdir"
+ fi
+ libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
- if test ! -d "${xdir}$objdir"; then
- $show "$mkdir ${xdir}$objdir"
- $run $mkdir ${xdir}$objdir
- status=$?
- if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
- exit $status
+ if test -d "$dir"; then
+ $show "$rm $libobj"
+ $run $rm $libobj
+ else
+ $show "$mkdir $dir"
+ $run $mkdir $dir
+ status=$?
+ if test $status -ne 0 && test ! -d $dir; then
+ exit $status
+ fi
fi
fi
-
- if test -z "$output_obj"; then
- # Place PIC objects in $objdir
- command="$command -o $lobj"
+ if test "$compiler_o_lo" = yes; then
+ output_obj="$libobj"
+ command="$command -o $output_obj"
+ elif test "$compiler_c_o" = yes; then
+ output_obj="$obj"
+ command="$command -o $output_obj"
fi
- $run $rm "$lobj" "$output_obj"
-
+ $run $rm "$output_obj"
$show "$command"
if $run eval "$command"; then :
else
@@ -667,7 +567,7 @@
fi
if test "$need_locks" = warn &&
- test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+ test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
echo "\
*** ERROR, $lockfile contains:
`cat $lockfile 2>/dev/null`
@@ -687,9 +587,9 @@
fi
# Just move the object if needed, then go on to compile the next one
- if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
- $show "$mv $output_obj $lobj"
- if $run $mv $output_obj $lobj; then :
+ if test x"$output_obj" != x"$libobj"; then
+ $show "$mv $output_obj $libobj"
+ if $run $mv $output_obj $libobj; then :
else
error=$?
$run $rm $removelist
@@ -697,21 +597,48 @@
fi
fi
- # Append the name of the PIC object to the libtool object file.
- test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
+ # If we have no pic_flag, then copy the object into place and finish.
+ if (test -z "$pic_flag" || test "$pic_mode" != default) &&
+ test "$build_old_libs" = yes; then
+ # Rename the .lo from within objdir to obj
+ if test -f $obj; then
+ $show $rm $obj
+ $run $rm $obj
+ fi
-EOF
+ $show "$mv $libobj $obj"
+ if $run $mv $libobj $obj; then :
+ else
+ error=$?
+ $run $rm $removelist
+ exit $error
+ fi
+
+ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$obj"; then
+ xdir="."
+ else
+ xdir="$xdir"
+ fi
+ baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
+ libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
+ # Now arrange that obj and lo_libobj become the same file
+ $show "(cd $xdir && $LN_S $baseobj $libobj)"
+ if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
+ # Unlock the critical section if it was locked
+ if test "$need_locks" != no; then
+ $run $rm "$lockfile"
+ fi
+ exit 0
+ else
+ error=$?
+ $run $rm $removelist
+ exit $error
+ fi
+ fi
# Allow error messages only from the first compilation.
suppress_output=' >/dev/null 2>&1'
- else
- # No PIC object so indicate it doesn't exist in the libtool
- # object file.
- test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
fi
# Only build a position-dependent object if we build old libraries.
@@ -720,15 +647,17 @@
# Don't build PIC code
command="$base_compile $srcfile"
else
- command="$base_compile $srcfile $pic_flag"
+ # All platforms use -DPIC, to notify preprocessed assembler code.
+ command="$base_compile $srcfile $pic_flag -DPIC"
fi
if test "$compiler_c_o" = yes; then
command="$command -o $obj"
+ output_obj="$obj"
fi
# Suppress compiler output if we already did a PIC compilation.
command="$command$suppress_output"
- $run $rm "$obj" "$output_obj"
+ $run $rm "$output_obj"
$show "$command"
if $run eval "$command"; then :
else
@@ -737,7 +666,7 @@
fi
if test "$need_locks" = warn &&
- test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+ test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
echo "\
*** ERROR, $lockfile contains:
`cat $lockfile 2>/dev/null`
@@ -757,7 +686,7 @@
fi
# Just move the object if needed
- if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+ if test x"$output_obj" != x"$obj"; then
$show "$mv $output_obj $obj"
if $run $mv $output_obj $obj; then :
else
@@ -767,25 +696,23 @@
fi
fi
- # Append the name of the non-PIC object the libtool object file.
- # Only append if the libtool object file exists.
- test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
- else
- # Append the name of the non-PIC object the libtool object file.
- # Only append if the libtool object file exists.
- test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
+ # Create an invalid libtool object if no PIC, so that we do not
+ # accidentally link it into a program.
+ if test "$build_libtool_libs" != yes; then
+ $show "echo timestamp > $libobj"
+ $run eval "echo timestamp > \$libobj" || exit $?
+ else
+ # Move the .lo from within objdir
+ $show "$mv $libobj $lo_libobj"
+ if $run $mv $libobj $lo_libobj; then :
+ else
+ error=$?
+ $run $rm $removelist
+ exit $error
+ fi
+ fi
fi
- $run $mv "${libobj}T" "${libobj}"
-
# Unlock the critical section if it was locked
if test "$need_locks" != no; then
$run $rm "$lockfile"
@@ -817,7 +744,6 @@
;;
esac
libtool_args="$nonopt"
- base_compile="$nonopt"
compile_command="$nonopt"
finalize_command="$nonopt"
@@ -833,6 +759,7 @@
linker_flags=
dllsearchpath=
lib_search_path=`pwd`
+ inst_prefix_dir=
avoid_version=no
dlfiles=
@@ -847,7 +774,6 @@
module=no
no_install=no
objs=
- non_pic_objects=
prefer_static_libs=no
preload=no
prev=
@@ -889,9 +815,8 @@
test -n "$old_archive_from_new_cmds" && build_old_libs=yes
# Go through the arguments, transforming them on the way.
- while test "$#" -gt 0; do
+ while test $# -gt 0; do
arg="$1"
- base_compile="$base_compile $arg"
shift
case $arg in
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
@@ -965,115 +890,13 @@
prev=
continue
;;
- release)
- release="-$arg"
+ inst_prefix)
+ inst_prefix_dir="$arg"
prev=
continue
;;
- objectlist)
- if test -f "$arg"; then
- save_arg=$arg
- moreargs=
- for fil in `cat $save_arg`
- do
-# moreargs="$moreargs $fil"
- arg=$fil
- # A libtool-controlled object.
-
- # Check to see that this really is a libtool object.
- if (sed -e '2q' $arg | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
- pic_object=
- non_pic_object=
-
- # Read the .lo file
- # If there is no directory component, then add one.
- case $arg in
- */* | *\\*) . $arg ;;
- *) . ./$arg ;;
- esac
-
- if test -z "$pic_object" || \
- test -z "$non_pic_object" ||
- test "$pic_object" = none && \
- test "$non_pic_object" = none; then
- $echo "$modename: cannot find name of object for \`$arg'" 1>&2
- exit 1
- fi
-
- # Extract subdirectory from the argument.
- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$xdir" = "X$arg"; then
- xdir=
- else
- xdir="$xdir/"
- fi
-
- if test "$pic_object" != none; then
- # Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
-
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- dlfiles="$dlfiles $pic_object"
- prev=
- continue
- else
- # If libtool objects are unsupported, then we need to preload.
- prev=dlprefiles
- fi
- fi
-
- # CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
- # Preload the old-style object.
- dlprefiles="$dlprefiles $pic_object"
- prev=
- fi
-
- # A PIC object.
- libobjs="$libobjs $pic_object"
- arg="$pic_object"
- fi
-
- # Non-PIC object.
- if test "$non_pic_object" != none; then
- # Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
-
- # A standard non-PIC object
- non_pic_objects="$non_pic_objects $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
- fi
- fi
- else
- # Only an error if not doing a dry-run.
- if test -z "$run"; then
- $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
- exit 1
- else
- # Dry-run case.
-
- # Extract subdirectory from the argument.
- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$xdir" = "X$arg"; then
- xdir=
- else
- xdir="$xdir/"
- fi
-
- pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
- non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
- libobjs="$libobjs $pic_object"
- non_pic_objects="$non_pic_objects $non_pic_object"
- fi
- fi
- done
- else
- $echo "$modename: link input file \`$save_arg' does not exist"
- exit 1
- fi
- arg=$save_arg
+ release)
+ release="-$arg"
prev=
continue
;;
@@ -1121,7 +944,7 @@
continue
;;
esac
- fi # test -n "$prev"
+ fi # test -n $prev
prevarg="$arg"
@@ -1173,11 +996,16 @@
continue
;;
+ -inst-prefix-dir)
+ prev=inst_prefix
+ continue
+ ;;
+
# The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
# so, if we see these flags be careful not to treat them like -L
-L[A-Z][A-Z]*:*)
case $with_gcc/$host in
- no/*-*-irix* | /*-*-irix*)
+ no/*-*-irix*)
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
;;
@@ -1232,18 +1060,14 @@
# Do not include libc due to us having libc/libc_r.
test "X$arg" = "X-lc" && continue
;;
- *-*-rhapsody* | *-*-darwin1.[012])
- # Rhapsody C and math libraries are in the System framework
- deplibs="$deplibs -framework System"
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
continue
+ ;;
esac
- elif test "X$arg" = "X-lc_r"; then
- case $host in
- *-*-openbsd*)
- # Do not include libc_r directly, use -pthread flag.
- continue
- ;;
- esac
fi
deplibs="$deplibs $arg"
continue
@@ -1278,11 +1102,6 @@
continue
;;
- -objectlist)
- prev=objectlist
- continue
- ;;
-
-o) prev=output ;;
-release)
@@ -1395,101 +1214,29 @@
esac
;;
- *.$objext)
- # A standard object.
- objs="$objs $arg"
- ;;
-
- *.lo)
- # A libtool-controlled object.
-
- # Check to see that this really is a libtool object.
- if (sed -e '2q' $arg | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
- pic_object=
- non_pic_object=
-
- # Read the .lo file
- # If there is no directory component, then add one.
- case $arg in
- */* | *\\*) . $arg ;;
- *) . ./$arg ;;
- esac
-
- if test -z "$pic_object" || \
- test -z "$non_pic_object" ||
- test "$pic_object" = none && \
- test "$non_pic_object" = none; then
- $echo "$modename: cannot find name of object for \`$arg'" 1>&2
- exit 1
- fi
-
- # Extract subdirectory from the argument.
- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$xdir" = "X$arg"; then
- xdir=
- else
- xdir="$xdir/"
- fi
-
- if test "$pic_object" != none; then
- # Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
-
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- dlfiles="$dlfiles $pic_object"
- prev=
- continue
- else
- # If libtool objects are unsupported, then we need to preload.
- prev=dlprefiles
- fi
- fi
-
- # CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
- # Preload the old-style object.
- dlprefiles="$dlprefiles $pic_object"
- prev=
- fi
-
- # A PIC object.
- libobjs="$libobjs $pic_object"
- arg="$pic_object"
+ *.lo | *.$objext)
+ # A library or standard object.
+ if test "$prev" = dlfiles; then
+ # This file was specified with -dlopen.
+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ dlfiles="$dlfiles $arg"
+ prev=
+ continue
+ else
+ # If libtool objects are unsupported, then we need to preload.
+ prev=dlprefiles
fi
+ fi
- # Non-PIC object.
- if test "$non_pic_object" != none; then
- # Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
-
- # A standard non-PIC object
- non_pic_objects="$non_pic_objects $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
- fi
- fi
+ if test "$prev" = dlprefiles; then
+ # Preload the old-style object.
+ dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
+ prev=
else
- # Only an error if not doing a dry-run.
- if test -z "$run"; then
- $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
- exit 1
- else
- # Dry-run case.
-
- # Extract subdirectory from the argument.
- xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
- if test "X$xdir" = "X$arg"; then
- xdir=
- else
- xdir="$xdir/"
- fi
-
- pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
- non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
- libobjs="$libobjs $pic_object"
- non_pic_objects="$non_pic_objects $non_pic_object"
- fi
+ case $arg in
+ *.lo) libobjs="$libobjs $arg" ;;
+ *) objs="$objs $arg" ;;
+ esac
fi
;;
@@ -1543,57 +1290,12 @@
exit 1
fi
- # Infer tagged configuration to use if any are available and
- # if one wasn't chosen via the "--tag" command line option.
- # Only attempt this if the compiler in the base link
- # command doesn't match the default compiler.
- if test -n "$available_tags" && test -z "$tagname"; then
- case $base_compile in
- "$CC "*) ;;
- # Blanks in the command may have been stripped by the calling shell,
- # but not from the CC environment variable when ltconfig was run.
- "`$echo $CC` "*) ;;
- *)
- for z in $available_tags; do
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
- # Evaluate the configuration.
- eval "`sed -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
- case $base_compile in
- "$CC "*)
- # The compiler in $compile_command matches
- # the one in the tagged configuration.
- # Assume this is the tagged configuration we want.
- tagname=$z
- break
- ;;
- "`$echo $CC` "*)
- tagname=$z
- break
- ;;
- esac
- fi
- done
- # If $tagname still isn't set, then no tagged configuration
- # was found and let the user know that the "--tag" command
- # line option must be used.
- if test -z "$tagname"; then
- echo "$modename: unable to infer tagged configuration"
- echo "$modename: specify a tag with \`--tag'" 1>&2
- exit 1
-# else
-# echo "$modename: using $tagname tagged configuration"
- fi
- ;;
- esac
- fi
-
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
eval arg=\"$export_dynamic_flag_spec\"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
fi
- oldlibs=
# calculate the name of the file, without its directory
outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
libobjs_save="$libobjs"
@@ -1641,12 +1343,13 @@
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
- case "$libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
libs="$libs $deplib"
done
- specialdeplibs=
if test "$linkmode" = lib; then
libs="$predeps $libs $compiler_lib_search_path $postdeps"
@@ -1655,12 +1358,14 @@
# $postdeps and mark them as special (i.e., whose duplicates are
# not to be eliminated).
pre_post_deps=
-# for pre_post_dep in $predeps $postdeps; do
-# case "$pre_post_deps " in
-# *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-# esac
-# pre_post_deps="$pre_post_deps $pre_post_dep"
-# done
+ if test "X$duplicate_deps" = "Xyes" ; then
+ for pre_post_dep in $predeps $postdeps; do
+ case "$pre_post_deps " in
+ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+ esac
+ pre_post_deps="$pre_post_deps $pre_post_dep"
+ done
+ fi
pre_post_deps=
fi
@@ -1695,30 +1400,25 @@
;;
esac
for pass in $passes; do
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan"; then
- libs="$deplibs"
- deplibs=
- fi
if test "$linkmode" = prog; then
+ # Determine which files to process
case $pass in
- dlopen) libs="$dlfiles" ;;
+ dlopen)
+ libs="$dlfiles"
+ save_deplibs="$deplibs" # Collect dlpreopened libraries
+ deplibs=
+ ;;
dlpreopen) libs="$dlprefiles" ;;
link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
- if test "$pass" = dlopen; then
- # Collect dlpreopened libraries
- save_deplibs="$deplibs"
- deplibs=
- fi
for deplib in $libs; do
lib=
found=no
case $deplib in
-l*)
- if test "$linkmode" != lib && test "$linkmode" != prog; then
- $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ if test "$linkmode" = oldlib && test "$linkmode" = obj; then
+ $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
continue
fi
if test "$pass" = conv; then
@@ -1768,7 +1468,7 @@
fi
;;
*)
- $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+ $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2
;;
esac # linkmode
continue
@@ -1795,12 +1495,10 @@
lib)
if test "$deplibs_check_method" != pass_all; then
echo
- echo "*** Warning: Trying to link with static lib archive $deplib."
+ echo "*** Warning: This library needs some functionality provided by $deplib."
echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which you do not appear to have"
- echo "*** because the file extensions .$libext of this argument makes me believe"
- echo "*** that it is just a static archive that I should not used here."
+ echo "*** shared version of the library, which you do not appear to have."
else
echo
echo "*** Warning: Linking the shared library $output against the"
@@ -1821,18 +1519,14 @@
esac # linkmode
;; # *.$libext
*.lo | *.$objext)
- if test "$pass" = conv; then
- deplibs="$deplib $deplibs"
- elif test "$linkmode" = prog; then
- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
- # If there is no dlopen support or we're linking statically,
- # we need to preload.
- newdlprefiles="$newdlprefiles $deplib"
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- newdlfiles="$newdlfiles $deplib"
- fi
+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ # If there is no dlopen support or we're linking statically,
+ # we need to preload.
+ newdlprefiles="$newdlprefiles $deplib"
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ newdlfiles="$newdlfiles $deplib"
fi
continue
;;
@@ -1875,7 +1569,8 @@
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan" ||
- { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
+ # Add dl[pre]opened files of deplib
test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
fi
@@ -1894,12 +1589,13 @@
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
tmp_libs="$tmp_libs $deplib"
done
- specialdeplibs=
elif test "$linkmode" != prog && test "$linkmode" != lib; then
$echo "$modename: \`$lib' is not a convenience library" 1>&2
exit 1
@@ -1925,10 +1621,8 @@
fi
if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
# 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
- # bomb out in the load deplibs phase.
- dlprefiles="$dlprefiles $lib $dependency_libs"
+ # statically, we need to preload.
+ dlprefiles="$dlprefiles $lib"
else
newdlfiles="$newdlfiles $lib"
fi
@@ -1994,7 +1688,7 @@
compile_deplibs="$dir/$old_library $compile_deplibs"
finalize_deplibs="$dir/$old_library $finalize_deplibs"
else
- deplibs="$lib $deplibs" # used for prog,scan pass
+ deplibs="$lib $deplibs"
fi
continue
fi
@@ -2022,28 +1716,23 @@
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- specialdeplibs=
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
tmp_libs="$tmp_libs $deplib"
done # for deplib
continue
fi # $linkmode = prog...
- if test "$linkmode,$pass" = "prog,link"; then
- if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
- # We need to hardcode the library path
- if test -n "$shlibpath_var"; then
- # Make sure the rpath contains only unique directories.
- case "$temp_rpath " in
- *" $dir "*) ;;
- *" $absdir "*) ;;
- *) temp_rpath="$temp_rpath $dir" ;;
- esac
- fi
+ link_static=no # Whether the deplib will be linked statically
+ if test -n "$library_names" &&
+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ # Link against this shared library
+ if test "$linkmode,$pass" = "prog,link" ||
+ { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
# Hardcode the library path.
# Skip directories that are in the system default run-time
# search path.
@@ -2065,6 +1754,17 @@
esac
;;
esac
+ if test "$linkmode" = prog; then
+ # We need to hardcode the library path
+ if test -n "$shlibpath_var"; then
+ # Make sure the rpath contains only unique directories.
+ case "$temp_rpath " in
+ *" $dir "*) ;;
+ *" $absdir "*) ;;
+ *) temp_rpath="$temp_rpath $dir" ;;
+ esac
+ fi
+ fi
fi # $linkmode,$pass = prog,link...
if test "$alldeplibs" = yes &&
@@ -2074,40 +1774,11 @@
# We only need to search for static libraries
continue
fi
- fi
- link_static=no # Whether the deplib will be linked statically
- if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
need_relink=yes
fi
- # This is a shared library
- if test "$linkmode" = lib &&
- test "$hardcode_into_libs" = yes; then
- # Hardcode the library path.
- # Skip directories that are in the system default run-time
- # search path.
- case " $sys_lib_dlsearch_path " in
- *" $absdir "*) ;;
- *)
- case "$compile_rpath " in
- *" $absdir "*) ;;
- *) compile_rpath="$compile_rpath $absdir"
- esac
- ;;
- esac
- case " $sys_lib_dlsearch_path " in
- *" $libdir "*) ;;
- *)
- case "$finalize_rpath " in
- *" $libdir "*) ;;
- *) finalize_rpath="$finalize_rpath $libdir"
- esac
- ;;
- esac
- fi
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
@@ -2241,7 +1912,16 @@
if test "$hardcode_direct" = yes; then
add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$libdir"
+ # Try looking first in the location we're being installed to.
+ add_dir=
+ if test -n "$inst_prefix_dir"; then
+ case "$libdir" in
+ [\\/]*)
+ add_dir="-L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+ add_dir="$add_dir -L$libdir"
add="-l$name"
elif test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
@@ -2251,11 +1931,17 @@
add="-l$name"
else
# We cannot seem to hardcode it, guess we'll fake it.
- add_dir="-L$libdir"
+ # Try looking first in the location we're being installed to.
+ add_dir=
+ if test -n "$inst_prefix_dir"; then
+ case "$libdir" in
+ [\\/]*)
+ add_dir="-L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+ add_dir="$add_dir -L$libdir"
add="-l$name"
- # Cope with "make install --prefix=<xxx>" where <xxx> changed:
- # use this instead....
- # add="$ladir/$objdir/$linklib"
fi
if test "$linkmode" = prog; then
@@ -2267,6 +1953,15 @@
fi
fi
elif test "$linkmode" = prog; then
+ if test "$alldeplibs" = yes &&
+ { test "$deplibs_check_method" = pass_all ||
+ { test "$build_libtool_libs" = yes &&
+ test -n "$library_names"; }; }; then
+ # We only need to search for static libraries
+ continue
+ fi
+
+ # Try to link the static library
# Here we assume that one of hardcode_direct or hardcode_minus_L
# is not unsupported. This is valid on all known static and
# shared platforms.
@@ -2287,14 +1982,13 @@
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
echo
- echo "*** Warning: This system can not link to static lib archive $lib."
+ echo "*** Warning: This library needs some functionality provided by $lib."
echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have."
if test "$module" = yes; then
- echo "*** But as you try to build a module library, libtool will still create "
- echo "*** a static module, that should work as long as the dlopening application"
- echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ echo "*** Therefore, libtool will create a static module, that should work "
+ echo "*** as long as the dlopening application is linked with the -dlopen flag."
if test -z "$global_symbol_pipe"; then
echo
echo "*** However, this would only work if libtool was able to extract symbol"
@@ -2343,10 +2037,11 @@
tmp_libs=
for deplib in $dependency_libs; do
newdependency_libs="$deplib $newdependency_libs"
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
- specialdeplibs=
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
tmp_libs="$tmp_libs $deplib"
done
@@ -2393,7 +2088,6 @@
fi # link_all_deplibs != no
fi # linkmode = lib
done # for deplib in $libs
- dependency_libs="$newdependency_libs"
if test "$pass" = dlpreopen; then
# Link the dlpreopened libraries before other libraries
for deplib in $save_deplibs; do
@@ -2401,6 +2095,7 @@
done
fi
if test "$pass" != dlopen; then
+ test "$pass" != scan && dependency_libs="$newdependency_libs"
if test "$pass" != conv; then
# Make sure lib_search_path contains only unique directories.
lib_search_path=
@@ -2418,35 +2113,14 @@
else
vars="compile_deplibs finalize_deplibs"
fi
- specialdeplibs=
for var in $vars dependency_libs; do
# Add libraries to $var in reverse order
eval tmp_libs=\"\$$var\"
new_libs=
for deplib in $tmp_libs; do
- # FIXME: Pedantically, this is the right thing to do, so
- # that some nasty dependency loop isn't accidentally
- # broken:
- #new_libs="$deplib $new_libs"
- # Pragmatically, this seems to cause very few problems in
- # practice:
case $deplib in
-L*) new_libs="$deplib $new_libs" ;;
*)
- # And here is the reason: when a library appears more
- # than once as an explicit dependence of a library, or
- # is implicitly linked in more than once by the
- # compiler, it is considered special, and multiple
- # occurrences thereof are not removed. Compare this
- # with having the same library being listed as a
- # dependency of multiple other libraries: in this case,
- # we know (pedantically, we assume) the library does not
- # need to be listed more than once, so we keep only the
- # last copy. This is not always right, but it is rare
- # enough that we require users that really mean to play
- # such unportable linking tricks to link the library
- # using -Wl,-lname, so that libtool does not consider it
- # for duplicate removal.
case " $specialdeplibs " in
*" $deplib "*) new_libs="$deplib $new_libs" ;;
*)
@@ -2474,6 +2148,11 @@
eval $var=\"$tmp_libs\"
done # for var
fi
+ if test "$pass" = "conv" &&
+ { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then
+ libs="$deplibs" # reset libs
+ deplibs=
+ fi
done # for pass
if test "$linkmode" = prog; then
dlfiles="$newdlfiles"
@@ -2482,10 +2161,6 @@
case $linkmode in
oldlib)
- if test -n "$deplibs"; then
- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
- fi
-
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
fi
@@ -2565,9 +2240,7 @@
if test -z "$rpath"; then
if test "$build_libtool_libs" = yes; then
# Building a libtool convenience library.
- # Some compilers have problems with a `.al' extension so
- # convenience libraries should have the same extension an
- # archive normally would.
+ libext=al
oldlibs="$output_objdir/$libname.$libext $oldlibs"
build_libtool_libs=convenience
build_old_libs=yes
@@ -2599,7 +2272,7 @@
# Check that each of the things are valid numbers.
case $current in
- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ [0-9]*) ;;
*)
$echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@ -2608,7 +2281,7 @@
esac
case $revision in
- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ [0-9]*) ;;
*)
$echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@ -2617,7 +2290,7 @@
esac
case $age in
- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+ [0-9]*) ;;
*)
$echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
@@ -2719,11 +2392,12 @@
# Clear the version info if we defaulted, and they specified a release.
if test -z "$vinfo" && test -n "$release"; then
major=
+ verstring="0.0"
case $version_type in
darwin)
# we can't check for "0.0" in archive_cmds due to quoting
# problems, so we reset it completely
- verstring=
+ verstring=""
;;
*)
verstring="0.0"
@@ -2757,24 +2431,9 @@
fi
if test "$mode" != relink; then
- # Remove our outputs, but don't remove object files since they
- # may have been created when compiling PIC objects.
- removelist=
- tempremovelist=`echo "$output_objdir/*"`
- for p in $tempremovelist; do
- case $p in
- *.$objext)
- ;;
- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
- removelist="$removelist $p"
- ;;
- *) ;;
- esac
- done
- if test -n "$removelist"; then
- $show "${rm}r $removelist"
- $run ${rm}r $removelist
- fi
+ # Remove our outputs.
+ $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
+ $run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
fi
# Now set the variables for building old libraries.
@@ -2842,9 +2501,8 @@
;;
*-*-openbsd*)
# Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
;;
- *)
+ *)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
deplibs="$deplibs -lc"
@@ -2886,13 +2544,13 @@
int main() { return 0; }
EOF
$rm conftest
- $LTCC -o conftest conftest.c $deplibs
+ $CC -o conftest conftest.c $deplibs
if test "$?" -eq 0 ; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name="`expr $i : '-l\(.*\)'`"
# If $name is empty we are operating on a -L argument.
- if test "$name" != "" -a "$name" -ne "0"; then
+ if test -n "$name" && test "$name" != "0"; then
libname=`eval \\$echo \"$libname_spec\"`
deplib_matches=`eval \\$echo \"$library_names_spec\"`
set dummy $deplib_matches
@@ -2902,12 +2560,10 @@
else
droppeddeps=yes
echo
- echo "*** Warning: dynamic linker does not accept needed library $i."
+ echo "*** Warning: This library needs some functionality provided by $i."
echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which I believe you do not have"
- echo "*** because a test_compile did reveal that the linker did not use it for"
- echo "*** its dynamic dependency list that programs get resolved with at runtime."
+ echo "*** shared version of the library, which you do not appear to have."
fi
else
newdeplibs="$newdeplibs $i"
@@ -2919,9 +2575,9 @@
for i in $deplibs; do
name="`expr $i : '-l\(.*\)'`"
# If $name is empty we are operating on a -L argument.
- if test "$name" != "" -a "$name" != "0"; then
+ if test -n "$name" && test "$name" != "0"; then
$rm conftest
- $LTCC -o conftest conftest.c $i
+ $CC -o conftest conftest.c $i
# Did it work?
if test "$?" -eq 0 ; then
ldd_output=`ldd conftest`
@@ -2934,12 +2590,10 @@
else
droppeddeps=yes
echo
- echo "*** Warning: dynamic linker does not accept needed library $i."
+ echo "*** Warning: This library needs some functionality provided by $i."
echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which you do not appear to have"
- echo "*** because a test_compile did reveal that the linker did not use this one"
- echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+ echo "*** shared version of the library, which you do not appear to have."
fi
else
droppeddeps=yes
@@ -2961,7 +2615,7 @@
for a_deplib in $deplibs; do
name="`expr $a_deplib : '-l\(.*\)'`"
# If $name is empty we are operating on a -L argument.
- if test "$name" != "" -a "$name" != "0"; then
+ if test -n "$name" && test "$name" != "0"; then
libname=`eval \\$echo \"$libname_spec\"`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
@@ -2996,17 +2650,10 @@
if test -n "$a_deplib" ; then
droppeddeps=yes
echo
- echo "*** Warning: linker path does not have real file for library $a_deplib."
+ echo "*** Warning: This library needs some functionality provided by $a_deplib."
echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which you do not appear to have"
- echo "*** because I did check the linker path looking for a file starting"
- if test -z "$potlib" ; then
- echo "*** with $libname but no candidates were found. (...for file magic test)"
- else
- echo "*** with $libname and none of the candidates passed a file format test"
- echo "*** using a file magic. Last file checked: $potlib"
- fi
+ echo "*** shared version of the library, which you do not appear to have."
fi
else
# Add a -L argument.
@@ -3025,7 +2672,6 @@
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
- potlib="$potent_lib" # see symlink-check above in file_magic test
if eval echo \"$potent_lib\" 2>/dev/null \
| sed 10q \
| egrep "$match_pattern_regex" > /dev/null; then
@@ -3038,17 +2684,10 @@
if test -n "$a_deplib" ; then
droppeddeps=yes
echo
- echo "*** Warning: linker path does not have real file for library $a_deplib."
+ echo "*** Warning: This library needs some functionality provided by $a_deplib."
echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a"
- echo "*** shared version of the library, which you do not appear to have"
- echo "*** because I did check the linker path looking for a file starting"
- if test -z "$potlib" ; then
- echo "*** with $libname but no candidates were found. (...for regex pattern test)"
- else
- echo "*** with $libname and none of the candidates passed a file format test"
- echo "*** using a regex pattern. Last file checked: $potlib"
- fi
+ echo "*** shared version of the library, which you do not appear to have."
fi
else
# Add a -L argument.
@@ -3204,9 +2843,7 @@
else
soname="$realname"
fi
- if test -z "$dlname"; then
- dlname=$soname
- fi
+ test -z "$dlname" && dlname=$soname
lib="$output_objdir/$realname"
for link
@@ -3214,6 +2851,23 @@
linknames="$linknames $link"
done
+ # Ensure that we have .o objects for linkers which dislike .lo
+ # (e.g. aix) in case we are running --disable-static
+ for obj in $libobjs; do
+ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$obj"; then
+ xdir="."
+ else
+ xdir="$xdir"
+ fi
+ baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+ oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
+ if test ! -f $xdir/$oldobj; then
+ $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
+ $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
+ fi
+ done
+
# Use standard objects if they are pic
test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
@@ -3246,14 +2900,13 @@
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
- save_libobjs=$libobjs
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
else
gentop="$output_objdir/${outputname}x"
$show "${rm}r $gentop"
$run ${rm}r "$gentop"
- $show "$mkdir $gentop"
- $run $mkdir "$gentop"
+ $show "mkdir $gentop"
+ $run mkdir "$gentop"
status=$?
if test "$status" -ne 0 && test ! -d "$gentop"; then
exit $status
@@ -3271,8 +2924,8 @@
$show "${rm}r $xdir"
$run ${rm}r "$xdir"
- $show "$mkdir $xdir"
- $run $mkdir "$xdir"
+ $show "mkdir $xdir"
+ $run mkdir "$xdir"
status=$?
if test "$status" -ne 0 && test ! -d "$xdir"; then
exit $status
@@ -3280,7 +2933,7 @@
$show "(cd $xdir && $AR x $xabs)"
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
done
fi
fi
@@ -3299,121 +2952,7 @@
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
eval cmds=\"$archive_expsym_cmds\"
else
- save_deplibs="$deplibs"
- for conv in $convenience; do
- tmp_deplibs=
- for test_deplib in $deplibs; do
- if test "$test_deplib" != "$conv"; then
- tmp_deplibs="$tmp_deplibs $test_deplib"
- fi
- done
- deplibs="$tmp_deplibs"
- done
eval cmds=\"$archive_cmds\"
- deplibs="$save_deplibs"
- fi
-
- if len=`expr "X$cmds" : ".*"` &&
- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- :
- else
- # The command line is too long to link in one step, link piecewise.
- $echo "creating reloadable object files..."
-
- # Save the value of $output and $libobjs because we want to
- # use them later. If we have whole_archive_flag_spec, we
- # want to use save_libobjs as it was before
- # whole_archive_flag_spec was expanded, because we can't
- # assume the linker understands whole_archive_flag_spec.
- # This may have to be revisited, in case too many
- # convenience libraries get linked in and end up exceeding
- # the spec.
- if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
- save_libobjs=$libobjs
- fi
- save_output=$output
-
- # Clear the reloadable object creation command queue and
- # initialize k to one.
- test_cmds=
- concat_cmds=
- objlist=
- delfiles=
- last_robj=
- k=1
- output=$output_objdir/$save_output-${k}.$objext
- # Loop over the list of objects to be linked.
- for obj in $save_libobjs
- do
- eval test_cmds=\"$reload_cmds $objlist $last_robj\"
- if test "X$objlist" = X ||
- { len=`expr "X$test_cmds" : ".*"` &&
- test "$len" -le "$max_cmd_len"; }; then
- objlist="$objlist $obj"
- else
- # The command $test_cmds is almost too long, add a
- # command to the queue.
- if test "$k" -eq 1 ; then
- # The first file doesn't have a previous command to add.
- eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
- else
- # All subsequent reloadable object files will link in
- # the last one created.
- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
- fi
- last_robj=$output_objdir/$save_output-${k}.$objext
- k=`expr $k + 1`
- output=$output_objdir/$save_output-${k}.$objext
- objlist=$obj
- len=1
- fi
- done
- # Handle the remaining objects by creating one last
- # reloadable object file. All subsequent reloadable object
- # files will link in the last one created.
- test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
- # Set up a command to remove the reloadale object files
- # after they are used.
- i=0
- while test "$i" -lt "$k"
- do
- i=`expr $i + 1`
- delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
- done
-
- $echo "creating a temporary reloadable object file: $output"
-
- # Loop through the commands generated above and execute them.
- save_ifs="$IFS"; IFS='~'
- for cmd in $concat_cmds; do
- IFS="$save_ifs"
- $show "$cmd"
- $run eval "$cmd" || exit $?
- done
- IFS="$save_ifs"
-
- libobjs=$output
- # Restore the value of output.
- output=$save_output
-
- if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
- eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
- fi
- # Expand the library linking commands again to reset the
- # value of $libobjs for piecewise linking.
-
- # Do each of the archive commands.
- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- eval cmds=\"$archive_expsym_cmds\"
- else
- eval cmds=\"$archive_cmds\"
- fi
-
- # Append the command to remove the reloadable object files
- # to the just-reset $cmds.
- eval cmds=\"\$cmds~$rm $delfiles\"
fi
save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do
@@ -3505,8 +3044,8 @@
gentop="$output_objdir/${obj}x"
$show "${rm}r $gentop"
$run ${rm}r "$gentop"
- $show "$mkdir $gentop"
- $run $mkdir "$gentop"
+ $show "mkdir $gentop"
+ $run mkdir "$gentop"
status=$?
if test "$status" -ne 0 && test ! -d "$gentop"; then
exit $status
@@ -3524,8 +3063,8 @@
$show "${rm}r $xdir"
$run ${rm}r "$xdir"
- $show "$mkdir $xdir"
- $run $mkdir "$xdir"
+ $show "mkdir $xdir"
+ $run mkdir "$xdir"
status=$?
if test "$status" -ne 0 && test ! -d "$xdir"; then
exit $status
@@ -3533,7 +3072,7 @@
$show "(cd $xdir && $AR x $xabs)"
$run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
done
fi
fi
@@ -3569,8 +3108,8 @@
# Create an invalid libtool object if no PIC, so that we don't
# accidentally link it into a program.
- # $show "echo timestamp > $libobj"
- # $run eval "echo timestamp > $libobj" || exit $?
+ $show "echo timestamp > $libobj"
+ $run eval "echo timestamp > $libobj" || exit $?
exit 0
fi
@@ -3586,6 +3125,20 @@
$run eval "$cmd" || exit $?
done
IFS="$save_ifs"
+ else
+ # Just create a symlink.
+ $show $rm $libobj
+ $run $rm $libobj
+ xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$libobj"; then
+ xdir="."
+ else
+ xdir="$xdir"
+ fi
+ baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
+ oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
+ $show "(cd $xdir && $LN_S $oldobj $baseobj)"
+ $run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
fi
if test -n "$gentop"; then
@@ -3872,18 +3425,18 @@
*-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
case "$compile_command " in
*" -static "*) ;;
- *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
+ *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
esac;;
*-*-hpux*)
case "$compile_command " in
*" -static "*) ;;
- *) pic_flag_for_symtable=" $pic_flag";;
+ *) pic_flag_for_symtable=" $pic_flag -DPIC";;
esac
esac
# Now compile the dynamic symbol file.
- $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
- $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+ $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+ $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
# Clean up the generated files.
$show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
@@ -4033,7 +3586,7 @@
relink_command="$var=\"$var_value\"; export $var; $relink_command"
fi
done
- relink_command="cd `pwd`; $relink_command"
+ relink_command="(cd `pwd`; $relink_command)"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
fi
@@ -4264,7 +3817,7 @@
oldobjs="$libobjs_save"
build_libtool_libs=no
else
- oldobjs="$objs$old_deplibs $non_pic_objects"
+ oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
fi
addlibs="$old_convenience"
fi
@@ -4273,8 +3826,8 @@
gentop="$output_objdir/${outputname}x"
$show "${rm}r $gentop"
$run ${rm}r "$gentop"
- $show "$mkdir $gentop"
- $run $mkdir "$gentop"
+ $show "mkdir $gentop"
+ $run mkdir "$gentop"
status=$?
if test "$status" -ne 0 && test ! -d "$gentop"; then
exit $status
@@ -4293,8 +3846,8 @@
$show "${rm}r $xdir"
$run ${rm}r "$xdir"
- $show "$mkdir $xdir"
- $run $mkdir "$xdir"
+ $show "mkdir $xdir"
+ $run mkdir "$xdir"
status=$?
if test "$status" -ne 0 && test ! -d "$xdir"; then
exit $status
@@ -4310,39 +3863,25 @@
if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
eval cmds=\"$old_archive_from_new_cmds\"
else
- eval cmds=\"$old_archive_cmds\"
-
- if len=`expr "X$cmds" : ".*"` &&
- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- :
- else
- # the command line is too long to link in one step, link in parts
- $echo "using piecewise archive linking..."
- save_RANLIB=$RANLIB
- RANLIB=:
- objlist=
- concat_cmds=
- save_oldobjs=$oldobjs
- for obj in $save_oldobjs
- do
- oldobjs="$objlist $obj"
- objlist="$objlist $obj"
- eval test_cmds=\"$old_archive_cmds\"
- if len=`expr "X$test_cmds" : ".*"` &&
- test "$len" -le "$max_cmd_len"; then
- :
+ # Ensure that we have .o objects in place in case we decided
+ # not to build a shared library, and have fallen back to building
+ # static libs even though --disable-static was passed!
+ for oldobj in $oldobjs; do
+ if test ! -f $oldobj; then
+ xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$oldobj"; then
+ xdir="."
else
- # the above command should be used before it gets too long
- oldobjs=$objlist
- test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
- objlist=
+ xdir="$xdir"
fi
- done
- RANLIB=$save_RANLIB
- oldobjs=$objlist
- eval cmds=\"\$concat_cmds~$old_archive_cmds\"
- fi
+ baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
+ obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
+ $show "(cd $xdir && ${LN_S} $obj $baseobj)"
+ $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
+ fi
+ done
+
+ eval cmds=\"$old_archive_cmds\"
fi
save_ifs="$IFS"; IFS='~'
for cmd in $cmds; do
@@ -4377,7 +3916,7 @@
fi
done
# Quote the link command for shipping.
- relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
+ relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
# Only create the output if not a dry run.
@@ -4678,12 +4217,30 @@
dir="$dir$objdir"
if test -n "$relink_command"; then
+ # Determine the prefix the user has applied to our future dir.
+ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
+
+ # Don't allow the user to place us outside of our expected
+ # location b/c this prevents finding dependent libraries that
+ # are installed to the same prefix.
+ if test "$inst_prefix_dir" = "$destdir"; then
+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+ exit 1
+ fi
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ else
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
+ fi
+
$echo "$modename: warning: relinking \`$file'" 1>&2
$show "$relink_command"
if $run eval "$relink_command"; then :
else
$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
- continue
+ exit 1
fi
fi
@@ -4838,7 +4395,11 @@
if test "$finalize" = yes && test -z "$run"; then
tmpdir="/tmp"
test -n "$TMPDIR" && tmpdir="$TMPDIR"
- tmpdir="$tmpdir/libtool-$$"
+ tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
+ if test $? = 0 ; then :
+ else
+ tmpdir="$tmpdir/libtool-$$"
+ fi
if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
else
$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
@@ -4869,7 +4430,7 @@
# remove .exe since cygwin /usr/bin/install will append another
# one anyways
case $install_prog,$host in
- */usr/bin/install*,*cygwin*)
+ /usr/bin/install*,*cygwin*)
case $file:$destfile in
*.exe:*.exe)
# this is ok
@@ -5252,23 +4813,9 @@
;;
*.lo)
- # Possibly a libtool object, so verify it.
- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
- # Read the .lo file
- . $dir/$name
-
- # Add PIC object to the list of files to remove.
- if test -n "$pic_object" \
- && test "$pic_object" != none; then
- rmfiles="$rmfiles $dir/$pic_object"
- fi
-
- # Add non-PIC object to the list of files to remove.
- if test -n "$non_pic_object" \
- && test "$non_pic_object" != none; then
- rmfiles="$rmfiles $dir/$non_pic_object"
- fi
+ if test "$build_old_libs" = yes; then
+ oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
+ rmfiles="$rmfiles $dir/$oldobj"
fi
;;
@@ -5336,7 +4883,6 @@
--mode=MODE use operation mode MODE [default=inferred from MODE-ARGS]
--quiet same as \`--silent'
--silent don't print informational messages
- --tag=TAG use configuration variables from tag TAG
--version print version information
MODE must be one of the following:
@@ -5462,7 +5008,6 @@
-no-install link a not-installable executable
-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
-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
@@ -5512,26 +5057,6 @@
$echo "Try \`$modename --help' for more information about other modes."
exit 0
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries. Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them. This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration. But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
# Local Variables:
# mode:shell-script
Index: mkinstalldirs
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/mkinstalldirs,v
retrieving revision 1.1
diff -u -r1.1 mkinstalldirs
--- mkinstalldirs 10 Jan 2000 03:32:50 -0000 1.1
+++ mkinstalldirs 19 Feb 2003 05:11:12 -0000
@@ -1,26 +1,34 @@
-#!/bin/sh
+#! /bin/sh
# mkinstalldirs --- make directory hierarchy
# Author: Noah Friedman <friedman at prep.ai.mit.edu>
# Created: 1993-05-16
-# Last modified: 1994-03-25
# Public domain
+# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
+
errstatus=0
-for file in ${1+"$@"} ; do
+for file
+do
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
pathcomp=
- for d in ${1+"$@"} ; do
+ for d
+ do
pathcomp="$pathcomp$d"
case "$pathcomp" in
-* ) pathcomp=./$pathcomp ;;
esac
if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp" 1>&2
- mkdir "$pathcomp" || errstatus=$?
+ echo "mkdir $pathcomp"
+
+ mkdir "$pathcomp" || lasterr=$?
+
+ if test ! -d "$pathcomp"; then
+ errstatus=$lasterr
+ fi
fi
pathcomp="$pathcomp/"
Index: m4/ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/m4/ChangeLog,v
retrieving revision 1.2
diff -u -r1.2 ChangeLog
--- m4/ChangeLog 16 Nov 2002 23:16:56 -0000 1.2
+++ m4/ChangeLog 19 Feb 2003 05:11:16 -0000
@@ -1,3 +1,23 @@
+2003-02-14 gettextize <bug-gnu-gettext at gnu.org>
+
+ * codeset.m4: New file, from gettext-0.11.4.
+ * gettext.m4: New file, from gettext-0.11.4.
+ * glibc21.m4: New file, from gettext-0.11.4.
+ * iconv.m4: New file, from gettext-0.11.4.
+ * intdiv0.m4: New file, from gettext-0.11.4.
+ * inttypes.m4: New file, from gettext-0.11.4.
+ * inttypes_h.m4: New file, from gettext-0.11.4.
+ * inttypes-pri.m4: New file, from gettext-0.11.4.
+ * isc-posix.m4: New file, from gettext-0.11.4.
+ * lcmessage.m4: New file, from gettext-0.11.4.
+ * lib-ld.m4: New file, from gettext-0.11.4.
+ * lib-link.m4: New file, from gettext-0.11.4.
+ * lib-prefix.m4: New file, from gettext-0.11.4.
+ * progtest.m4: New file, from gettext-0.11.4.
+ * stdint_h.m4: New file, from gettext-0.11.4.
+ * uintmax_t.m4: New file, from gettext-0.11.4.
+ * Makefile.am (EXTRA_DIST): Add the new files.
+
2002-11-16 gettextize <bug-gnu-gettext at gnu.org>
* codeset.m4: New file, from gettext-0.11.1.
Index: m4/Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/m4/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- m4/Makefile.am 24 Jun 2002 17:49:34 -0000 1.4
+++ m4/Makefile.am 19 Feb 2003 05:11:16 -0000
@@ -1 +1 @@
-EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 gettext.m4
+EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 gettext.m4
Index: macros/gnome-guile-checks.m4
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/macros/gnome-guile-checks.m4,v
retrieving revision 1.1.12.2
diff -u -r1.1.12.2 gnome-guile-checks.m4
--- macros/gnome-guile-checks.m4 17 Feb 2003 18:58:05 -0000 1.1.12.2
+++ macros/gnome-guile-checks.m4 19 Feb 2003 05:11:16 -0000
@@ -30,6 +30,7 @@
fi
AC_CHECK_PROG(BUILD_GUILE, $name_build_guile, yes, no)
+ echo gnome-guile-checks set "BUILD_GUILE" to $BUILD_GUILE
if test "x$BUILD_GUILE" = "xyes"; then
AC_MSG_CHECKING(whether $name_build_guile works)
More information about the gnucash-patches
mailing list