diff options
| author | Brian Tarricone <brian@tarricone.org> | 2009-07-28 02:14:55 +0000 |
|---|---|---|
| committer | Brian Tarricone <brian@tarricone.org> | 2009-07-28 02:14:55 +0000 |
| commit | 83019e7af8e87b2010b4f1fcb27135814722bdb6 (patch) | |
| tree | c342bc540a7df8a2071d88d958ad38f4887ac303 | |
| parent | 1bc99454e7874a1f8dde35ab3e899e4b537f9ac1 (diff) | |
| download | xfce4-dev-tools-83019e7af8e87b2010b4f1fcb27135814722bdb6.tar.gz | |
also support the newer IT_PROG_INTLTOOL macro
(Old svn revision: 30408)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | scripts/xdt-autogen.in | 4 |
3 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2009-07-27 Brian Tarricone <brian@tarricone.org> + + * scripts/xdt-autogen.in: Also support newer IT_PROG_INTLTOOL + macro. + 2009-05-04 Brian Tarricone <bjt23@cornell.edu> * m4macros/xdt-features.m4: Add a bunch more compiler warning @@ -1,10 +1,13 @@ +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 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. diff --git a/scripts/xdt-autogen.in b/scripts/xdt-autogen.in index eb8a97f..d842a12 100644 --- a/scripts/xdt-autogen.in +++ b/scripts/xdt-autogen.in @@ -161,7 +161,7 @@ EOF ## 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 @@ for configure_file in ${CONFIGURE_FILES}; do 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 |