xgettext-glade-4: Skip, not fail, when expat was not available.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 4d7c60f85bc88f8742a6e4f526c1a199118d79e0..e0546e187321497c00f4b9d127742d47de21e1c0 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-22  Bruno Haible  <bruno@clisp.org>
+
+       xgettext-glade-4: Skip, not fail, when expat was not available.
+       * xgettext-glade-4: Use the same test for xgettext Glade support as in
+       xgettext-glade-[123].
+       Patch by Matt Burgess <matthew@linuxfromscratch.org>.
+
 2010-05-15  Bruno Haible  <bruno@clisp.org>
 
        Avoid link error on MacOS X 10.4, due to replaced 'unsetenv' function.

diff --git a/gettext-tools/tests/xgettext-glade-4 b/gettext-tools/tests/xgettext-glade-4
index 21971adec56f3eff88e5d77bc7162b7d35614ca4..9d05a9b9c05fb17722b9cd41689038b0cacec2dd 100755 (executable)
--- a/gettext-tools/tests/xgettext-glade-4
+++ b/gettext-tools/tests/xgettext-glade-4
@@ -5,6 +5,20 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
+tmpfiles="$tmpfiles empty.glade"
+cat <<EOF > empty.glade
+<?xml version="1.0"?>
+<GTK-Interface/>
+EOF
+
+tmpfiles="$tmpfiles xg-gl-4.pot"
+: ${XGETTEXT=xgettext}
+${XGETTEXT} -o xg-gl-4.pot empty.glade 2>/dev/null
+test $? = 0 || {
+  echo "Skipping test: xgettext was built without Glade support"
+  rm -fr $tmpfiles; exit 77
+}
+
 tmpfiles="$tmpfiles xg-gl-4.glade"
 cat <<EOF > xg-gl-4.glade
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>