Re: [bug-gettext] gettext 0.19.5 first release candidate

[Daiki Ueno]

Daiki Ueno <address@hidden> writes:

> I'm not able to check it on Solaris off hand, but does the attached
> patch work?

Sorry, the patch was incomplete (I could reproduce it on AIX).  There
was a silly typo around libexpat checking.

The attached patch (committed) should fix this.

Regards,
-- 

>From 3dfb94a2b8105c766cb58a340a62928bd0877808 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <address@hidden>
Date: Tue, 23 Jun 2015 18:47:20 +0900
Subject: [PATCH] build: Fix error when expat is not available

* cldr-plurals.c (main): Fix unmatched braces when
!(DYNLOAD_LIBEXPAT || HAVE_LIBEXPAT).
---
 gettext-tools/src/ChangeLog      | 5 +++++
 gettext-tools/src/cldr-plurals.c | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 70215e1..9974a1c 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,5 +1,10 @@
 2015-06-23  Daiki Ueno  <address@hidden>
 
+       * cldr-plurals.c (main): Fix unmatched braces when
+       !(DYNLOAD_LIBEXPAT || HAVE_LIBEXPAT).
+
+2015-06-23  Daiki Ueno  <address@hidden>
+
        * cldr-plurals.c: Include "basename.h".
        (main): Place optind on the right hand side of the expression, to
        work around build failure on Solaris.
diff --git a/gettext-tools/src/cldr-plurals.c b/gettext-tools/src/cldr-plurals.c
index 3bd3d54..38011fc 100644
--- a/gettext-tools/src/cldr-plurals.c
+++ b/gettext-tools/src/cldr-plurals.c
@@ -453,10 +453,9 @@ There is NO WARRANTY, to the extent permitted by law.\n\
           free (extracted_rules);
         }
       else
+#endif
         {
-#else
           error (1, 0, _("extraction is not supported"));
-#endif
         }
     }
   else if (argc == optind)
-- 
2.4.2