diff options
| author | dobey <> | 2004-06-13 00:02:05 +0000 |
|---|---|---|
| committer | dobey <> | 2004-06-13 00:02:05 +0000 |
| commit | 3764e118e4fd25f4d4aa8d5be13f2d564a704717 (patch) | |
| tree | 50c25e8bc6ac677e92e454ad70c346d5bd948d4d /intltool.m4 | |
| parent | 9131ceddf880923e6fe0756dafcd618fafdc8cb1 (diff) | |
| download | intltool-3764e118e4fd25f4d4aa8d5be13f2d564a704717.tar.gz | |
2004-06-12 Rodney Dawes <dobey@novell.com>
* README: Document the changes to intltool.m4 for declaring that
an application does not need the XML processing features of intltool
* intltool.m4: Add the second option of [no-xml] to AC_PROG_INTLTOOL
so that applications can request to not use the XML processing features
of intltool that require the XML::Parser perl module
Fixes #130850
Diffstat (limited to 'intltool.m4')
| -rw-r--r-- | intltool.m4 | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/intltool.m4 b/intltool.m4 index 7ab8d44..7e6ae75 100644 --- a/intltool.m4 +++ b/intltool.m4 @@ -22,7 +22,7 @@ ll## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*- ## configuration script generated by Autoconf, you may include it under ## the same distribution terms that you use for the rest of that program. -dnl AC_PROG_INTLTOOL([MINIMUM-VERSION]) +dnl AC_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) # serial 1 AC_PROG_INTLTOOL AC_DEFUN([AC_PROG_INTLTOOL], [ @@ -95,10 +95,13 @@ fi if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then AC_MSG_ERROR([perl 5.x required for intltool]) fi -if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then -: -else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) +if test "x$2" != "xno-xml"; then + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) + fi fi # Remove file type tags (using []) from po/POTFILES. |