From 3cc6868cf9191070db710fbab4378f730b70df8f Mon Sep 17 00:00:00 2001
From: Mike Massonnet <mmassonnet@xfce.org>
Date: Sat, 27 Aug 2011 20:26:44 +0200
Subject: [PATCH 2/2] Add i18n support in dev-tools package for xdt-csource

---
 Makefile.am        |    1 +
 acinclude.m4       |   41 +++++++++++++++++++++++++++++++++++++++++
 autogen.sh         |    5 ++++-
 configure.in.in    |    7 +++++++
 po/POTFILES.in     |    1 +
 xdt-csource/main.c |    4 ----
 6 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 acinclude.m4
 create mode 100644 po/POTFILES.in

diff --git a/Makefile.am b/Makefile.am
index 1a5a2cf..2f04d7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,6 +7,7 @@
 #
 
 SUBDIRS = 								\
+	po								\
 	m4macros							\
 	scripts								\
 	xdt-csource
diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644
index 0000000..c955759
--- /dev/null
+++ b/acinclude.m4
@@ -0,0 +1,41 @@
+AC_DEFUN([XDT_I18N],
+[
+  dnl Substitute GETTEXT_PACKAGE variable
+  GETTEXT_PACKAGE=m4_default([$2], [AC_PACKAGE_TARNAME()])
+  AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Name of default gettext domain])
+  AC_SUBST([GETTEXT_PACKAGE])
+
+  dnl gettext and stuff
+  ALL_LINGUAS="$1"
+  AM_GLIB_GNU_GETTEXT()
+
+  dnl This is required on some Linux systems
+  AC_CHECK_FUNC([bind_textdomain_codeset])
+
+  dnl Determine where to install locale files
+  AC_MSG_CHECKING([for locales directory])
+  AC_ARG_WITH([locales-dir], 
+  [
+    AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+  ], [localedir=$withval],
+  [
+    if test x"$CATOBJEXT" = x".mo"; then
+      localedir=$libdir/locale
+    else
+      localedir=$datadir/locale
+    fi
+  ])
+  AC_MSG_RESULT([$localedir])
+  AC_SUBST([localedir])
+
+  dnl Determine additional xgettext flags
+  AC_MSG_CHECKING([for additional xgettext flags])
+  if test x"$XGETTEXT_ARGS" = x""; then
+    XGETTEXT_ARGS="--keyword=Q_ --from-code=UTF-8";
+  else
+    XGETTEXT_ARGS="$XGETTEXT_ARGS --keyword=Q_ --from-code=UTF-8";
+  fi
+  AC_SUBST([XGETTEXT_ARGS])
+  AC_MSG_RESULT([$XGETTEXT_ARGS])
+])
+
diff --git a/autogen.sh b/autogen.sh
index eae2da1..76065f7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -27,7 +27,10 @@ fi
 if test "x$revision" = "x"; then
   revision=UNKNOWN
 fi
-sed -e "s/@REVISION@/${revision}/g" < "configure.in.in" > "configure.in"
+linguas=`cd "po" 2>/dev/null && ls *.po 2>/dev/null | awk 'BEGIN { FS="."; ORS=" " } { print $1 }'`
+sed -e "s/@REVISION@/${revision}/g" \
+    -e "s/@LINGUAS@/${linguas}/g" \
+    < "configure.in.in" > "configure.in"
 
 if (type xdt-autogen) >/dev/null 2>&1; then
   exec xdt-autogen "$@"
diff --git a/configure.in.in b/configure.in.in
index 57f1975..3ab3209 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -50,6 +50,7 @@ dnl ********************************
 AC_PROG_CC()
 AM_PROG_CC_C_O()
 AC_PROG_INSTALL()
+AC_PROG_INTLTOOL([0.31], [no-xml])
 AC_PROG_LIBTOOL()
 
 dnl ***************************************
@@ -63,6 +64,11 @@ dnl *** Check for required packages ***
 dnl ***********************************
 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.18.0])
 
+dnl ******************************
+dnl *** Check for i18n support ***
+dnl ******************************
+XDT_I18N([@LINGUAS@])
+
 dnl **********************
 dnl *** Generate files ***
 dnl **********************
@@ -70,6 +76,7 @@ AC_OUTPUT([
 Makefile
 xfce4-dev-tools.spec
 m4macros/Makefile
+po/Makefile.in
 scripts/Makefile
 scripts/xdt-autogen.in
 xdt-csource/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..5d9cc95
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1 @@
+xdt-csource/main.c
diff --git a/xdt-csource/main.c b/xdt-csource/main.c
index ff1ecc9..a188f2c 100644
--- a/xdt-csource/main.c
+++ b/xdt-csource/main.c
@@ -39,10 +39,6 @@
 #include <string.h>
 #endif
 
-#ifndef GETTEXT_PACKAGE
-#define GETTEXT_PACKAGE PACKAGE
-#endif
-
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <glib/gprintf.h>
-- 
1.7.6