From: Daiki Ueno <ueno@gnu.org>
Date: Fri, 9 Aug 2013 16:19:49 +0000 (+0200)
Subject: x-gsettings: add guard when expat is not available at compile time
X-Git-Tag: v0.19~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=865f3f31087891235eb3604b8ff2e972b2836224;p=thirdparty%2Fgettext.git

x-gsettings: add guard when expat is not available at compile time
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 9444a7f4a..38dc37618 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-09  Daiki Ueno  <ueno@gnu.org>
+
+	* x-gsettings.c (extract_gsettings): Add guard when expat is not
+	available at compile time.
+
 2013-08-08  Miguel Angel Arruga Vivas  <rosen644835@gmail.com> (tiny change)
 
 	Fix copyright year in xgettext version string.
diff --git a/gettext-tools/src/x-gsettings.c b/gettext-tools/src/x-gsettings.c
index eac6d3d02..14a258422 100644
--- a/gettext-tools/src/x-gsettings.c
+++ b/gettext-tools/src/x-gsettings.c
@@ -366,13 +366,15 @@ error while reading \"%s\""), real_filename);
 
 void
 extract_gsettings (FILE *fp,
-               const char *real_filename, const char *logical_filename,
-               flag_context_list_table_ty *flag_table,
-               msgdomain_list_ty *mdlp)
+                   const char *real_filename, const char *logical_filename,
+                   flag_context_list_table_ty *flag_table,
+                   msgdomain_list_ty *mdlp)
 {
+#if DYNLOAD_LIBEXPAT || HAVE_LIBEXPAT
   if (LIBEXPAT_AVAILABLE ())
     do_extract_gsettings (fp, real_filename, logical_filename, mdlp);
   else
+#endif
     {
       multiline_error (xstrdup (""),
                        xasprintf (_("\