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 9444a7f4a4a6d0341b088fc349f5d29d8d09544b..38dc37618fae3cff497f7e57c3308c29a882937a 100644 (file)
--- 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 eac6d3d026bdb8816603ce3cea6b35206a80f2bf..14a25842209af368be438a7b39d6578d10dff80c 100644 (file)
--- 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 (_("\