From: Bruno Haible Date: Sun, 10 Oct 2010 12:19:23 +0000 (+0200) Subject: Rely more on libtool. X-Git-Tag: v0.18.2~124 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d4c46994e1248b63aae1af4ca1b79320b19d4af;p=thirdparty%2Fgettext.git Rely more on libtool. --- diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index f65195715..bf37a1754 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,3 +1,8 @@ +2010-10-10 Bruno Haible + + Rely more on libtool. + * configure.ac (LTNOUNDEF): Remove variable. + 2010-07-31 Bruno Haible Use new ansi-c++.m4 from gnulib. diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac index 157f2e28d..845ca07da 100644 --- a/gettext-tools/configure.ac +++ b/gettext-tools/configure.ac @@ -97,14 +97,6 @@ dnl Prepares the libtool configuration for handling of Windows resources, and dnl sets the RC variable to a program that compiles Windows resource files. LT_LANG([Windows Resource]) -case "$host_os" in - # On Cygwin, without -no-undefined, a warning is emitted and only a static - # library is built. - beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;; - *) LTNOUNDEF='' ;; -esac -AC_SUBST([LTNOUNDEF]) - dnl On mingw and Cygwin, we can activate special Makefile rules which add dnl version information to the shared libraries and executables. case "$host_os" in diff --git a/gettext-tools/libgettextpo/ChangeLog b/gettext-tools/libgettextpo/ChangeLog index cd0a5c4bd..1391f4943 100644 --- a/gettext-tools/libgettextpo/ChangeLog +++ b/gettext-tools/libgettextpo/ChangeLog @@ -1,3 +1,9 @@ +2011-06-07 Bruno Haible + + Rely more on libtool. + * Makefile.am (libgettextpo_la_LDFLAGS): Use -no-undefined always. + Don't use @LTNOUNDEF@. + 2010-06-06 Bruno Haible Bug fixes in libgettextpo. diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am index a96c36de0..4b40e1ca1 100644 --- a/gettext-tools/libgettextpo/Makefile.am +++ b/gettext-tools/libgettextpo/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-tools/libgettextpo subdirectory of GNU gettext -## Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc. +## Copyright (C) 1995-1998, 2000-2011 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -102,7 +102,7 @@ libgettextpo_la_LIBADD = libgnu.la $(WOE32_LIBADD) $(LTLIBUNISTRING) libgettextpo_la_LDFLAGS = \ -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ -rpath $(libdir) \ - @LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@ + @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined # Tell the mingw or Cygwin linker which symbols to export. if WOE32DLL diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index c878f240c..87202d3f5 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,9 @@ +2011-06-07 Bruno Haible + + Rely more on libtool. + * Makefile.am (libgettextsrc_la_LDFLAGS): Use -no-undefined always. + Don't use @LTNOUNDEF@. + 2010-06-06 Bruno Haible Bug fixes in libgettextpo. diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am index d9e76464e..a37f7c725 100644 --- a/gettext-tools/src/Makefile.am +++ b/gettext-tools/src/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gettext-tools/src subdirectory of GNU gettext -## Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc. +## Copyright (C) 1995-1998, 2000-2011 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -220,7 +220,7 @@ urlget_SOURCES = urlget.c # use iconv(). libgettextsrc_la_LDFLAGS = \ -release @VERSION@ \ - ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@ + ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined # Tell the mingw or Cygwin linker which symbols to export. if WOE32DLL diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index 60c9d8790..7a8ee1449 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -1,3 +1,10 @@ +2010-10-10 Bruno Haible + + Rely more on libtool. + * modules/gettext-tools-misc (Makefile.am): Remove @LTLIBC@ flag from + libgettextlib_la_LDFLAGS, relying more on libtool. Remove @LTNOUNDEF@ + flag from libgettextlib_la_LDFLAGS, now generated by gnulib-tool. + 2010-10-10 Bruno Haible * modules/gettext-tools-misc (Makefile.am): Remove flags from diff --git a/gnulib-local/modules/gettext-tools-misc b/gnulib-local/modules/gettext-tools-misc index d90884788..0aff53f67 100644 --- a/gnulib-local/modules/gettext-tools-misc +++ b/gnulib-local/modules/gettext-tools-misc @@ -22,10 +22,7 @@ lib_LTLIBRARIES = libgettextlib.la # As of 2010-10-04, these are all added by gnulib-tool automatically. #lib_LDFLAGS += $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ @LIB_ACL@ -# Need @LTLIBC@ for -no-undefined to work on many platforms. -lib_LDFLAGS += \ - -release @VERSION@ \ - @LTLIBC@ @LTNOUNDEF@ +lib_LDFLAGS += -release @VERSION@ # Tell the mingw or Cygwin linker which symbols to export. if WOE32DLL