From 574d5ce336ea6eb0da876b53b1ccee36d178f63c Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Thu, 6 Oct 2011 00:44:25 +0000
Subject: [PATCH] Move configure logic for i18n to its own file

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6005 ea778897-0a13-0410-b9d1-a72fbfd435f5
---
 ChangeLog        |  2 +-
 configure.ac     | 25 +------------------------
 m4/geany-i18n.m4 | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 25 deletions(-)
 create mode 100644 m4/geany-i18n.m4

diff --git a/ChangeLog b/ChangeLog
index f42d1580..a32ef8ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
  * autogen.sh, configure.ac:
    Modernize configure.ac a bit.
  * configure.ac, m4/geany-revision.m4, m4/geany-binreloc.m4,
-   m4/geany-gnu-regex.m4, m4/geany-plugins.m4:
+   m4/geany-gnu-regex.m4, m4/geany-plugins.m4, m4/geany-i18n.m4:
    Extract some configure logic to separate files for better
    readability.
 
diff --git a/configure.ac b/configure.ac
index 9db01e8a..a13d7e5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,6 @@ fi
 
 AC_PROG_INSTALL
 AC_PROG_LN_S
-AC_PROG_INTLTOOL
 
 # autoscan start
 
@@ -148,24 +147,7 @@ fi
 
 
 # i18n
-GETTEXT_PACKAGE="$PACKAGE"
-AC_SUBST([GETTEXT_PACKAGE])
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package.])
-
-if test -n "${LINGUAS}"; then
-	ALL_LINGUAS="${LINGUAS}"
-else
-	if test -z "$conf_dir"; then
-		conf_dir="."
-	fi
-	ALL_LINGUAS=`cd "$conf_dir/po" 2>/dev/null && ls *.po 2>/dev/null | $AWK 'BEGIN { FS="."; ORS=" " } { print $1 }'`
-fi
-
-AM_GLIB_GNU_GETTEXT
-# workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845)
-if test "x$MSGFMT" = "xno"; then
-	AC_MSG_ERROR([msgfmt not found. Please install the gettext package.])
-fi
+GEANY_I18N
 
 
 # Set ${datadir}
@@ -184,11 +166,6 @@ fi
 GEANY_DATA_DIR=`eval echo ${datarootdir}/geany`
 AC_SUBST([GEANY_DATA_DIR])
 
-# intltool hack to define install_sh on Debian/Ubuntu systems
-if test "x$install_sh" = "x"; then
-	install_sh="`pwd`/install-sh"
-	AC_SUBST([install_sh])
-fi
 
 
 # Output
diff --git a/m4/geany-i18n.m4 b/m4/geany-i18n.m4
new file mode 100644
index 00000000..c9c5d72b
--- /dev/null
+++ b/m4/geany-i18n.m4
@@ -0,0 +1,33 @@
+dnl GEANY_I18N
+dnl Setups I18N support.
+dnl AC_DEFINEs and AC_SUBSTs GETTEXT_PACKAGE
+AC_DEFUN([GEANY_I18N],
+[
+	AC_REQUIRE([AC_PROG_AWK])
+	AC_REQUIRE([AC_PROG_INTLTOOL])
+
+	GETTEXT_PACKAGE="$PACKAGE"
+	AC_SUBST([GETTEXT_PACKAGE])
+	AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package.])
+
+	if test -n "${LINGUAS}"; then
+		ALL_LINGUAS="${LINGUAS}"
+	else
+		if test -z "$conf_dir"; then
+			conf_dir="."
+		fi
+		ALL_LINGUAS=`cd "$conf_dir/po" 2>/dev/null && ls *.po 2>/dev/null | $AWK 'BEGIN { FS="."; ORS=" " } { print $[]1 }'`
+	fi
+
+	AM_GLIB_GNU_GETTEXT
+	# workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845)
+	if test "x$MSGFMT" = "xno"; then
+		AC_MSG_ERROR([msgfmt not found. Please install the gettext package.])
+	fi
+
+	# intltool hack to define install_sh on Debian/Ubuntu systems
+	if test "x$install_sh" = "x"; then
+		install_sh="`pwd`/install-sh"
+		AC_SUBST([install_sh])
+	fi
+])