On 3/27/07, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
I did not use --with-included-gettext. I tried with gettext 0.14.5 and
gettext 0.16. However, configure decided that I ought to use the
included gettext instead. It looks like the gettext from the "GTK+ for
Windows" site doesnt define '_nl_msg_cat_cntr', which is what configure
uses to determine if the gettext is the GNU version or not. Here's a
bit from the configure.log.
configure:7683: checking for GNU gettext in libc
configure:7707: gcc -o conftest.exe -g -O2 conftest.c -liconv >&5
C:/DOCUME~1/cnash/LOCALS~1/Temp/ccCybaaa.o: In function
`main':c:/chris/freeciv/configure:7752: undefined reference to
`_imp__libintl_bindtextdomain'
:c:/chris/freeciv/configure:7753: undefined reference to
`_imp__libintl_gettext'
:c:/chris/freeciv/configure:7753: undefined reference to
`_imp__libintl_ngettext'
:c:/chris/freeciv/configure:7753: undefined reference to
`_nl_msg_cat_cntr'
collect2: ld returned 1 exit status
configure:7710: $? = 1
configure: failed program was:
...
configure:7727: result: no
configure:7731: checking for GNU gettext in libintl
configure:7757: gcc -o conftest.exe -g -O2 conftest.c -liconv -lintl
-liconv >&5
C:/DOCUME~1/cnash/LOCALS~1/Temp/cceObaaa.o: In function
`main':c:/chris/freeciv/configure:7803: undefined reference to
`_nl_msg_cat_cntr'
collect2: ld returned 1 exit status
configure:7760: $? = 1
configure: failed program was:
...
configure:7778: result: no
Perhaps I should try again with a different gettext.
I'm always applying the attached patch to work around this problem
when building the Windows packages.
Index: m4/gettext.m4
===================================================================
--- m4/gettext.m4 (revision 12321)
+++ m4/gettext.m4 (working copy)
@@ -93,7 +93,7 @@
AC_TRY_LINK([#include <libintl.h>
extern int _nl_msg_cat_cntr;],
[bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
+return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], []),
gt_cv_func_gnugettext_libintl=yes,
gt_cv_func_gnugettext_libintl=no)
LIBS="$gt_save_LIBS"])
Index: manual/Makefile.am
===================================================================
--- manual/Makefile.am (revision 12321)
+++ manual/Makefile.am (working copy)
@@ -22,7 +22,7 @@
civmanual_LDFLAGS = $(GGZDMOD_LDFLAGS)
civmanual_LDADD = ../utility/libcivutility.a ../common/libcivcommon.a \
../ai/libcivai.a ../utility/libcivutility.a ../server/libcivserver.a \
- $(INTLLIBS) ../client/helpdata.o \
+ ../client/helpdata.o \
../utility/libcivutility.a ../common/libcivcommon.a ../ai/libcivai.a \
../utility/libcivutility.a ../server/libcivserver.a \
../utility/libcivutility.a ../common/aicore/libaicore.a \
@@ -31,4 +31,4 @@
../dependencies/lua/src/lib/liblualib.a \
../dependencies/tolua/libtolua.a \
../server/generator/libgenerator.a \
- $(SERVER_LIBS) $(AUTH_LIBS) $(LIB_GGZDMOD)
+ $(SERVER_LIBS) $(AUTH_LIBS) $(INTLLIBS) $(LIB_GGZDMOD)
Index: po/Makefile.in.in
===================================================================
--- po/Makefile.in.in (revision 12321)
+++ po/Makefile.in.in (working copy)
@@ -69,7 +69,7 @@
.po.gmo:
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) -c --statistics -o $$file $<
+ && rm -f $$file && $(GMSGFMT) --statistics -o $$file $<
all: [EMAIL PROTECTED]@
_______________________________________________
Freeciv-dev mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-dev