[Xfce4-commits] r30408 - in xfce4-dev-tools/trunk: . scripts

[Brian Tarricone]

Author: kelnos
Date: 2009-07-28 02:14:55 +0000 (Tue, 28 Jul 2009)
New Revision: 30408

Modified:
   xfce4-dev-tools/trunk/ChangeLog
   xfce4-dev-tools/trunk/NEWS
   xfce4-dev-tools/trunk/scripts/xdt-autogen.in
Log:
also support the newer IT_PROG_INTLTOOL macro

Modified: xfce4-dev-tools/trunk/ChangeLog
===================================================================
--- xfce4-dev-tools/trunk/ChangeLog	2009-07-27 22:39:11 UTC (rev 30407)
+++ xfce4-dev-tools/trunk/ChangeLog	2009-07-28 02:14:55 UTC (rev 30408)
@@ -1,3 +1,8 @@
+2009-07-27	Brian Tarricone <brian at tarricone.org>
+
+	* scripts/xdt-autogen.in: Also support newer IT_PROG_INTLTOOL
+	  macro.
+
 2009-05-04	Brian Tarricone <bjt23 at cornell.edu>
 
 	* m4macros/xdt-features.m4: Add a bunch more compiler warning

Modified: xfce4-dev-tools/trunk/NEWS
===================================================================
--- xfce4-dev-tools/trunk/NEWS	2009-07-27 22:39:11 UTC (rev 30407)
+++ xfce4-dev-tools/trunk/NEWS	2009-07-28 02:14:55 UTC (rev 30408)
@@ -1,3 +1,7 @@
+4.6.2
+=====
+- Also support the newer IT_PROG_INTLTOOL macro
+
 4.6.0
 =====
 - Replace grep -P with awk and thus make the script more portable. Properly 
@@ -4,7 +8,6 @@
   detect changed ChangeLogs in SVN. This should get rid the empty lines when 
   committing several changed ChangeLogs (bug #4716). 
 
-
 4.5.93
 ======
 - Remove unreliable and not really needed intltool auto-patch.

Modified: xfce4-dev-tools/trunk/scripts/xdt-autogen.in
===================================================================
--- xfce4-dev-tools/trunk/scripts/xdt-autogen.in	2009-07-27 22:39:11 UTC (rev 30407)
+++ xfce4-dev-tools/trunk/scripts/xdt-autogen.in	2009-07-28 02:14:55 UTC (rev 30408)
@@ -161,7 +161,7 @@
 ##
 test -z "${XDT_PROG_INTLTOOLIZE}" && XDT_PROG_INTLTOOLIZE="intltoolize"
 for configure_file in $CONFIGURE_FILES; do
-  if grep "^AC_PROG_INTLTOOL" "${configure_file}" >/dev/null 2>&1; then
+  if grep -E "^(AC|IT)_PROG_INTLTOOL" "${configure_file}" >/dev/null 2>&1; then
     (${XDT_PROG_INTLTOOLIZE} --version) </dev/null >/dev/null 2>&1 || {
       cat >&2 <<EOF
 xdt-autogen: You must have "intltool" installed on your system.
@@ -345,7 +345,7 @@
     fi
   fi
 
-  if grep "^AC_PROG_INTLTOOL" "${configure_file}" >/dev/null 2>&1; then
+  if grep -E "^(AC|IT)_PROG_INTLTOOL" "${configure_file}" >/dev/null 2>&1; then
     (echo "Running ${XDT_PROG_INTLTOOLIZE} --automake --copy --force" &&
      cd "${source_dir}" &&
      ${XDT_PROG_INTLTOOLIZE} --automake --copy --force) || exit 1