gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-29 01:42:32 +01:00
Code Issues Projects Releases Wiki Activity

configure: rewrote detection for 'xgettext'

Browse Source 
The main change is to use Autoconf's syntax for consistency;

Now the detected program is used in the makefiles (user has the possibility
to change the name of the command);

A conditional is used to avoid enabling make targets that would fail if
the command does not exist.

Took opportunity to implement the silent-rules compliance to POT generation
rules.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2015-01-20 22:03:57 +01:00
committed by Carlos R. Mafra
parent 80e00c3521
commit 2cfb2b5276
6 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
WINGs/po/Makefile.am
View File

@@ -79,14 +79,18 @@ SUFFIXES = .po .mo
all-local: $(CATALOGS) all-local: $(CATALOGS)
if HAVE_XGETTEXT
$(DOMAIN).pot: $(POTFILES) $(DOMAIN).pot: $(POTFILES)
xgettext --default-domain=$(DOMAIN) \ $(AM_V_GEN)$(XGETTEXT) --default-domain=$(DOMAIN) \
--add-comments --keyword=_ --keyword=N_ $(POTFILES) --add-comments --keyword=_ --keyword=N_ $(POTFILES)
if cmp -s $(DOMAIN).po $(DOMAIN).pot; then \ @if cmp -s $(DOMAIN).po $(DOMAIN).pot; then \
rm -f $(DOMAIN).po; \ rm -f $(DOMAIN).po; \
else \ else \
mv -f $(DOMAIN).po $(DOMAIN).pot; \ mv -f $(DOMAIN).po $(DOMAIN).pot; \
fi fi
endif
install-data-local: $(CATALOGS) install-data-local: $(CATALOGS)
$(mkinstalldirs) $(DESTDIR)$(nlsdir) $(mkinstalldirs) $(DESTDIR)$(nlsdir)

9
WPrefs.app/po/Makefile.am
View File

@@ -45,14 +45,17 @@ SUFFIXES = .po .mo
all-local: $(CATALOGS) all-local: $(CATALOGS)
if HAVE_XGETTEXT
$(DOMAIN).pot: $(POTFILES) $(DOMAIN).pot: $(POTFILES)
xgettext --default-domain=$(DOMAIN) \ $(AM_V_GEN)$(XGETTEXT) --default-domain=$(DOMAIN) \
--add-comments --keyword=_ --keyword=N_ $(POTFILES) --add-comments --keyword=_ --keyword=N_ $(POTFILES)
if cmp -s $(DOMAIN).po $(DOMAIN).pot; then \ @if cmp -s $(DOMAIN).po $(DOMAIN).pot; then \
rm -f $(DOMAIN).po; \ rm -f $(DOMAIN).po; \
else \ else \
mv -f $(DOMAIN).po $(DOMAIN).pot; \ mv -f $(DOMAIN).po $(DOMAIN).pot; \
fi fi
endif
install-data-local: $(CATALOGS) install-data-local: $(CATALOGS)

10
configure.ac
View File

@@ -417,17 +417,9 @@ dnl ====================
dnl Detect the language for translations to be installed and check dnl Detect the language for translations to be installed and check
dnl that the gettext environment works dnl that the gettext environment works
WM_I18N_LANGUAGES WM_I18N_LANGUAGES
WM_I18N_XGETTEXT
AC_CHECK_PROG(XGETTEXT, xgettext, xgettext)
if test "$XGETTEXT" != ""; then
if $XGETTEXT --help 2>&1 | grep illegal >/dev/null ; then
echo "xgettext isn't GNU version"
XGETTEXT=""
fi
fi
dnl Added by Oliver - Support for NLSDIR option dnl Added by Oliver - Support for NLSDIR option
dnl =========================================== dnl ===========================================
AC_ARG_WITH(nlsdir, AS_HELP_STRING([--with-nlsdir=PATH], [specify where the locale stuff should go])) AC_ARG_WITH(nlsdir, AS_HELP_STRING([--with-nlsdir=PATH], [specify where the locale stuff should go]))

16
m4/wm_i18n.m4
View File

@@ -92,3 +92,19 @@ AC_SUBST([WMAKERMOFILES])dnl
AC_SUBST([WPREFSMOFILES])dnl AC_SUBST([WPREFSMOFILES])dnl
AC_SUBST([UTILMOFILES])dnl AC_SUBST([UTILMOFILES])dnl
]) ])
# WM_I18N_XGETTEXT
# ----------------
#
# xgettext is used to generate the Templates for translation, it is not
# mandatory for users, only for translation teams. We look for it even
# if I18N was not asked because it can be used by dev team.
AC_DEFUN_ONCE([WM_I18N_XGETTEXT],
[AC_CHECK_PROGS([XGETTEXT], [xgettext], [])
AS_IF([test "x$XGETTEXT" != "x"],
AS_IF([$XGETTEXT --help 2>&1 | grep "illegal" > /dev/null],
[AC_MSG_WARN([[$XGETTEXT is not GNU version, ignoring]])
XGETTEXT=""]))
AM_CONDITIONAL([HAVE_XGETTEXT], [test "x$XGETTEXT" != "x"])dnl
])

10
po/Makefile.am
View File

@@ -74,14 +74,18 @@ SUFFIXES = .po .mo
all-local: $(CATALOGS) all-local: $(CATALOGS)
if HAVE_XGETTEXT
$(DOMAIN).pot: $(POTFILES) $(DOMAIN).pot: $(POTFILES)
xgettext --default-domain=$(DOMAIN) \ $(AM_V_GEN)$(XGETTEXT) --default-domain=$(DOMAIN) \
--add-comments --keyword=_ --keyword=N_ $(POTFILES) --add-comments --keyword=_ --keyword=N_ $(POTFILES)
if cmp -s $(DOMAIN).po $(DOMAIN).pot; then \ @if cmp -s $(DOMAIN).po $(DOMAIN).pot; then \
rm -f $(DOMAIN).po; \ rm -f $(DOMAIN).po; \
else \ else \
mv -f $(DOMAIN).po $(DOMAIN).pot; \ mv -f $(DOMAIN).po $(DOMAIN).pot; \
fi fi
endif
install-data-local: $(CATALOGS) install-data-local: $(CATALOGS)
$(mkinstalldirs) $(DESTDIR)$(nlsdir) $(mkinstalldirs) $(DESTDIR)$(nlsdir)

9
util/po/Makefile.am
View File

@@ -20,14 +20,17 @@ SUFFIXES = .po .mo
all-local: $(CATALOGS) all-local: $(CATALOGS)
if HAVE_XGETTEXT
$(DOMAIN).pot: $(POTFILES) $(DOMAIN).pot: $(POTFILES)
xgettext --default-domain=$(DOMAIN) \ $(AM_V_GEN)$(XGETTEXT) --default-domain=$(DOMAIN) \
--add-comments --keyword=_ --keyword=N_ $(POTFILES) --add-comments --keyword=_ --keyword=N_ $(POTFILES)
if cmp -s $(DOMAIN).po $(DOMAIN).pot; then \ @if cmp -s $(DOMAIN).po $(DOMAIN).pot; then \
rm -f $(DOMAIN).po; \ rm -f $(DOMAIN).po; \
else \ else \
mv -f $(DOMAIN).po $(DOMAIN).pot; \ mv -f $(DOMAIN).po $(DOMAIN).pot; \
fi fi
endif
install-data-local: $(CATALOGS) install-data-local: $(CATALOGS)