Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2024-09-27 15:22:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Temporarily revert some of the previous commits to use an older gettext"

Browse source 
This reverts commit 361dc017a1.
This commit is contained in:
Olivier Teuliere 2020-09-15 18:37:18 +02:00
parent 361dc017a1
commit 36446e7171
9 changed files with 45 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -21,7 +21,6 @@ configure
missing
.deps
tags
intl
ABOUT-NLS
config.rpath
mkinstalldirs
@ -33,6 +32,7 @@ m4/fcntl-o.m4
m4/gettext.m4
m4/glibc2.m4
m4/glibc21.m4
m4/host-cpu-c-abi.m4
m4/iconv.m4
m4/intdiv0.m4
m4/intl.m4

2
Makefile.am
View file

@ -1,4 +1,4 @@
SUBDIRS = intl dic game utils qt po extras
SUBDIRS = dic game utils qt po extras
ACLOCAL_AMFLAGS = -I m4

4
bootstrap
View file

@ -5,6 +5,4 @@ patch -p0 < po/makefile-qt4.patch
aclocal -I m4
autoheader
automake --add-missing --foreign --copy -Wall
# It would be nice to use -Wall, but AM_GNU_GETTEXT generates
# way too many warnings in version 0.18.1
autoconf -Wno-obsolete
autoconf -Wall

8
configure.ac
View file

@ -211,11 +211,11 @@ AC_ARG_ENABLE([text],AS_HELP_STRING([--enable-text],[text interface support (def
AM_CONDITIONAL([BUILD_TEXT], [test "${enable_text}" != "no"])
dnl Internationalization macros
AM_GNU_GETTEXT_VERSION(0.19.3)
AM_GNU_GETTEXT
AM_GNU_GETTEXT_VERSION(0.20)
AM_GNU_GETTEXT([external])
dnl Iconv
dnl This test depends on AM_GNU_GETTEXT executed before
AM_ICONV
AS_IF([test "$am_cv_func_iconv" != "yes"],
[AC_MSG_ERROR([libiconv is needed for Eliot to work properly])])
@ -242,7 +242,7 @@ fi
dnl --------------------------------------------------------------
dnl Output
dnl --------------------------------------------------------------
AC_CONFIG_FILES(intl/Makefile po/Makefile.in
AC_CONFIG_FILES(po/Makefile.in
dic/Makefile
game/Makefile
utils/Makefile

8
dic/Makefile.am
View file

@ -20,7 +20,7 @@
noinst_LIBRARIES = libdic.a
localedir = $(datadir)/locale
AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir) -I../intl -I$(top_srcdir)/intl $(INCICONV) @LOG4CXX_CFLAGS@
AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir) $(INCICONV) @LOG4CXX_CFLAGS@
libdic_a_SOURCES = \
logging.h \
@ -51,14 +51,14 @@ bin_PROGRAMS = \
compdic_SOURCES=compdicmain.cpp
compdic_CPPFLAGS=$(AM_CPPFLAGS) @BOOST_CPPFLAGS@
compdic_LDADD=libdic.a @LIBINTL@
compdic_LDADD=libdic.a @LIBINTL@ @LIBICONV@
listdic_SOURCES=listdicmain.cpp
listdic_LDADD=libdic.a @LIBINTL@
listdic_LDADD=libdic.a @LIBINTL@ @LIBICONV@
#regexp_CFLAGS=-DDEBUG_RE
regexp_SOURCES=regexpmain.cpp
regexp_LDADD=libdic.a @LIBINTL@
regexp_LDADD=libdic.a @LIBINTL@ @LIBICONV@
if WITH_LOGGING
compdic_LDADD += @LOG4CXX_LIBS@

23
extras/contrib/Makefile
View file

@ -3,6 +3,7 @@ APU_VERSION := 1.6.1
ARABICA_VERSION := 2016-January
BOOST_VERSION := 1.72.0
EXPAT_VERSION := 2.2.9
GETTEXT_VERSION := 0.20.1
ICONV_VERSION := 1.16
LIBCONFIG_VERSION := 1.7.2
LIBXML2_VERSION := 2.9.8
@ -31,7 +32,7 @@ CONFIGURE = CC="$(CC)" CXX="$(CXX)" CPPFLAGS="$(CPPFLAGS)" ./configure --host=$(
# Dependencies (incomplete list):
# expat <- apr <- apu <- log4cxx
LIBS := iconv boost expat apr apu libconfig log4cxx arabica qt2
LIBS := iconv gettext boost expat apr apu libconfig log4cxx arabica qt2
TARGETS = $(LIBS:%=.%)
.PHONY: help all clean clean-% distclean distclean-%
@ -169,6 +170,26 @@ $(EXPAT_DIR_FLAG): $(EXPAT_ARCHIVE)
touch $@
### gettext ###
GETTEXT_DIR = $(BUILD_DIR)/gettext-$(GETTEXT_VERSION)
GETTEXT_DIR_FLAG = $(GETTEXT_DIR)/.flag
GETTEXT_ARCHIVE = $(ARCHIVE_DIR)/gettext-$(GETTEXT_VERSION).tar.gz
$(GETTEXT_ARCHIVE): $(PREFIX_FLAG)
$(WGET) https://ftp.gnu.org/pub/gnu/gettext/$(shell basename $@)
$(GETTEXT_DIR_FLAG): $(GETTEXT_ARCHIVE)
$(TAR) -xzf $<
touch $@
.gettext: $(GETTEXT_DIR_FLAG)
(cd $(GETTEXT_DIR) \
&& $(CONFIGURE) --disable-java --disable-native-java --disable-relocatable --without-emacs --without-included-libxml \
&& make install)
touch $@
### iconv ###
ICONV_DIR = $(BUILD_DIR)/libiconv-$(ICONV_VERSION)

17
po/makefile-qt4.patch
View file

@ -1,6 +1,6 @@
--- po/Makefile.in.in 2013-01-06 17:32:47.328960440 +0100
+++ po/Makefile.in.in.new 2013-01-06 17:34:22.641893986 +0100
@@ -135,6 +135,11 @@
--- po/Makefile.in.in 2020-04-06 19:12:50.652868150 +0200
+++ po/Makefile.in.in.new 2020-04-06 19:16:31.289415435 +0200
@@ -163,6 +163,11 @@
# otherwise packages like GCC can not be built if only parts of the source
# have been downloaded.
@ -11,21 +11,22 @@
+
# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
@@ -150,14 +155,14 @@
# The determination of whether the package xyz is a GNU one is based on the
@@ -194,7 +199,7 @@
fi; \
case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
'' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
- $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_builddir) --directory=$(top_srcdir) \
--add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
--add-comments=TRANSLATORS: \
--files-from=$(srcdir)/POTFILES.in \
--copyright-holder='$(COPYRIGHT_HOLDER)' \
--msgid-bugs-address="$$msgid_bugs_address" \
@@ -202,7 +207,7 @@
$(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
;; \
*) \
- $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_builddir) --directory=$(top_srcdir) \
--add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
--add-comments=TRANSLATORS: \
--files-from=$(srcdir)/POTFILES.in \
--copyright-holder='$(COPYRIGHT_HOLDER)' \

2
qt/Makefile.am
View file

@ -148,7 +148,7 @@ BUILT_SOURCES = $(nodist_eliot_SOURCES)
MOSTLYCLEANFILES = $(nodist_eliot_SOURCES)
eliot_LDADD = ../game/libgame.a ../dic/libdic.a @QT_LIBS@ @LIBINTL@ @LIBCONFIG_LIBS@ @ARABICA_LIBS@ @EXPAT_LIBS@
eliot_LDADD = ../game/libgame.a ../dic/libdic.a @QT_LIBS@ @LIBINTL@ @LIBICONV@ @LIBCONFIG_LIBS@ @ARABICA_LIBS@ @EXPAT_LIBS@
# Needed for proper stack trace handling
eliot_LDFLAGS = -rdynamic

4
utils/Makefile.am
View file

@ -25,7 +25,7 @@ bin_PROGRAMS =
if BUILD_TEXT
noinst_PROGRAMS += eliottxt
eliottxt_SOURCES = game_io.h game_io.cpp eliottxt.cpp
eliottxt_LDADD = $(top_builddir)/game/libgame.a $(top_builddir)/dic/libdic.a @LIBINTL@ @LIBCONFIG_LIBS@ @ARABICA_LIBS@ @EXPAT_LIBS@
eliottxt_LDADD = $(top_builddir)/game/libgame.a $(top_builddir)/dic/libdic.a @LIBINTL@ @LIBICONV@ @LIBCONFIG_LIBS@ @ARABICA_LIBS@ @EXPAT_LIBS@
if HAS_READLINE
eliottxt_LDADD += -lreadline
@ -38,7 +38,7 @@ endif
if BUILD_NCURSES
bin_PROGRAMS += eliotcurses
eliotcurses_SOURCES = curses_intf.cpp curses_intf.h
eliotcurses_LDADD = ../game/libgame.a ../dic/libdic.a @CURSES_LIB@ @LIBINTL@ @LIBCONFIG_LIBS@ @ARABICA_LIBS@ @EXPAT_LIBS@
eliotcurses_LDADD = ../game/libgame.a ../dic/libdic.a @CURSES_LIB@ @LIBINTL@ @LIBICONV@ @LIBCONFIG_LIBS@ @ARABICA_LIBS@ @EXPAT_LIBS@
if WITH_LOGGING
eliotcurses_LDADD += @LOG4CXX_LIBS@
endif