From: Bruno Haible <bruno@clisp.org>
Date: Mon, 4 Sep 2006 19:20:36 +0000 (+0000)
Subject: Fix build error on Solaris 7/8 with gcc >= 4.0.
X-Git-Tag: 0.16.x-branchpoint~168
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8dba672acb554769fb568ce8efd804751dbbdce6;p=thirdparty%2Fgettext.git

Fix build error on Solaris 7/8 with gcc >= 4.0.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 9c7796927..586edfa96 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-04  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.am (msginit_SOURCES): Add ../../gettext-runtime/intl/lock.c.
+	Reported by Aaron Williams <aaron_williams@net.com>.
+
 2006-08-28  Bruno Haible  <bruno@clisp.org>
 
 	* x-scheme.c (read_object): Don't call arglist_parser_remember if
diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 5a47262b0..7d57f526a 100644
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -204,7 +204,13 @@ else
 msggrep_SOURCES = ../woe32dll/c++msggrep.cc
 endif
 msginit_SOURCES = msginit.c
-msginit_SOURCES += lang-table.c plural-count.c ../../gettext-runtime/intl/localealias.c
+msginit_SOURCES += lang-table.c plural-count.c
+msginit_SOURCES += ../../gettext-runtime/intl/localealias.c
+# This is needed because on Solaris, localealias.c requires the symbol
+# libintl_thread_in_use which is defined in lock.c. The copy of lock.c inside
+# libintl.so is not sufficient, because libintl.so doesn't export the symbol
+# libintl_thread_in_use.
+msginit_SOURCES += ../../gettext-runtime/intl/lock.c
 if !WOE32DLL
 msguniq_SOURCES = msguniq.c
 else