configure: add checks for xgettext and msgmerge

diff --git a/Makefile b/Makefile
index 5f0d0e20230b6965a4eb42afb68117bf0deee374..d4af5514a1ee0d0fb4a03ef190bee14c93e1b745 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -98,9 +98,8 @@ BUNDLE_FLAGS = ${BUNDLE_FLAGS-yes}
 #
 
 MKBUNDLE = $(PYTHON) $(ROOTDIR)/support/mkbundle
-XGETTEXT ?= xgettext --language=C -k_ -kN_ -s
+XGETTEXT2 ?= $(XGETTEXT) --language=C -k_ -kN_ -s
 MSGMERGE ?= msgmerge
-MSGFMT ?= msgfmt
 
 #
 # Debug/Output
@@ -528,7 +527,8 @@ ${BUILDDIR}/%.so: ${SRCS_EXTRA}
 
 # Clean
 clean:
-       rm -rf ${BUILDDIR}/src ${BUILDDIR}/bundle* ${BUILDDIR}/build.o ${BUILDDIR}/timestamp.*
+       rm -rf ${BUILDDIR}/src ${BUILDDIR}/bundle* ${BUILDDIR}/build.o ${BUILDDIR}/timestamp.* \
+              src/tvh_locale_inc.c
        find . -name "*~" | xargs rm -f
        $(MAKE) -f Makefile.webui clean
 
@@ -571,7 +571,7 @@ $(BUILDDIR)/build.o: $(BUILDDIR)/build.c
 .PHONY: intl
 intl:
        @printf "Building tvheadend.pot\n"
-       @$(XGETTEXT) -o intl/tvheadend.pot.new $(I18N-C)
+       @$(XGETTEXT2) -o intl/tvheadend.pot.new $(I18N-C)
        @mv intl/tvheadend.pot.new intl/tvheadend.pot
        $(MAKE) -f Makefile.webui LANGUAGES="$(LANGUAGES)" WEBUI=std intl
        $(MAKE)

diff --git a/Makefile.webui b/Makefile.webui
index f61b2409f818f9aab98cf05fdd467c0469b588be..870d63d8ba747a34e79e03ca58014a14943a4e7b 100644 (file)
--- a/Makefile.webui
+++ b/Makefile.webui
@@ -34,7 +34,7 @@ CSS_PY = PYTHONIOENCODING=utf-8 $(PYTHON) support/css.py
 RUN_JS = PYTHONIOENCODING=utf-8 $(PYTHON) vendor/rjsmin-1.0.10/rjsmin.py
 RUN_CSS = PYTHONIOENCODING=utf-8 $(PYTHON) vendor/rcssmin-1.0.5/rcssmin.py
 GZIPCMD += -n
-XGETTEXT ?= xgettext --language=JavaScript --from-code=utf-8 -k_ -kN_ -s
+XGETTEXT2 ?= $(XGETTEXT) --language=JavaScript --from-code=utf-8 -k_ -kN_ -s
 MSGMERGE ?= msgmerge
 POJS_PY = PYTHONIOENCODING=utf-8 $(PYTHON) support/pojs.py
 
@@ -248,7 +248,7 @@ compile-debug: $(WEBDIR)/extjs-debug.c $(WEBDIR)/extjs-tv-debug.c
 .PHONY: intl
 intl:
        @printf "Building intl/js/tvheadend.js.pot\n"
-       @$(XGETTEXT) -o intl/js/tvheadend.js.pot.new $(JAVASCRIPT_SRC)
+       @$(XGETTEXT2) -o intl/js/tvheadend.js.pot.new $(JAVASCRIPT_SRC)
        @mv intl/js/tvheadend.js.pot.new intl/js/tvheadend.js.pot
 
 intl/js/tvheadend.js.pot:

diff --git a/configure b/configure
index b841faf41292d370671a98b1e61abf73b74a98d1..b47b050f5a3dec079fe421e846b83da6180c6c51 100755 (executable)
--- a/configure
+++ b/configure
@@ -238,6 +238,8 @@ check_py_import gzip
 #
 # Binaries
 #
+check_bin ${XGETTEXT} || die 'WARN: no gettext binaries found'
+check_bin ${MSGMERGE} || die 'WARN: no gettext binaries found'
 check_bin ${GZIPCMD} || die 'WARN: no gzip binary found'
 check_bin ${BZIP2} || echo 'WARN: no bzip2 binary found'
 

diff --git a/support/configure.inc b/support/configure.inc
index 38fb4d1911cb246549c77e910320f4a70f95c8ca..b2dff30c65e9588936cf876307d23c0a54cc255f 100755 (executable)
--- a/support/configure.inc
+++ b/support/configure.inc
@@ -19,6 +19,8 @@ CONFIGURE_ARGS="$*"
 [ -z "$PYTHON"   ] && PYTHON=python
 [ -z "$GZIPCMD"  ] && GZIPCMD=gzip
 [ -z "$BZIP2"    ] && BZIP2=bzip2
+[ -z "$XGETTEXT" ] && XGETTEXT=xgettext
+[ -z "$MSGMERGE" ] && MSGMERGE=msgmerge
 
 # Paths
 [ -z "$prefix"   ] && prefix=/usr/local
@@ -461,6 +463,8 @@ endif
 PYTHON   ?= ${PYTHON}
 GZIPCMD  ?= ${GZIPCMD}
 BZIP2    ?= ${BZIP2}
+XGETTEXT ?= ${XGETTEXT}
+MSGMERGE ?= ${MSGMERGE}
 CFLAGS   += ${CFLAGS}
 LDFLAGS  += ${LDFLAGS}
 prefix    = ${prefix}