Change instances of GNM_SUPPORT to GNM_READ_SUPPORT

Commit 82c1097ab658e8c13ab3ad439970148defba6e19 used the preprocessor
symbol GNM_READ_SUPPORT but GNM_SUPPORT was the one set in the autconf
files.  Hence some code was erroneously omitted.

This change uses GNM_READ_SUPPORT throughout which is consistent
with ODF_READ_SUPPORT

diff --git a/configure.ac b/configure.ac
index d538550370d66c3a7c72fa2221475416a58bf221..b85803642c6c7ceb4ce80a22fc9d69f9bb840376 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -201,19 +201,19 @@ AC_DEFINE(
 
 dnl Gnumeric and OpenDocument (read) support requires libxml2 and zlib.
 if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = yes; then
-  GNM_SUPPORT=yes
+  GNM_READ_SUPPORT=yes
   ODF_READ_SUPPORT=yes
   AC_DEFINE(
-    [GNM_SUPPORT], [1],
+    [GNM_READ_SUPPORT], [1],
     [Define to 1 if building in support for reading Gnumeric files.])
   AC_DEFINE(
     [ODF_READ_SUPPORT], [1],
     [Define to 1 if building in support for reading OpenDocument files.])
 else
-  GNM_SUPPORT=no
+  GNM_READ_SUPPORT=no
   ODF_READ_SUPPORT=no
 fi
-AC_SUBST([GNM_SUPPORT])
+AC_SUBST([GNM_READ_SUPPORT])
 AC_SUBST([ODF_READ_SUPPORT])
 
 dnl ODF support requires libxml2 (zlib is optional).

diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c
index 07c1814f8e4c2c7b349332b3abf021477824464e..8faffe6676ed29294b7fa28b4c946ab7639c3807 100644 (file)
--- a/src/data/gnumeric-reader.c
+++ b/src/data/gnumeric-reader.c
@@ -28,7 +28,7 @@
 
 #include "spreadsheet-reader.h"
 
-#if !GNM_SUPPORT
+#if !GNM_READ_SUPPORT
 
 struct casereader *
 gnumeric_open_reader (const struct spreadsheet_read_options *opts, struct dictionary **dict)
@@ -953,4 +953,4 @@ gnm_file_casereader_read (struct casereader *reader UNUSED, void *r_)
 }
 
 
-#endif /* GNM_SUPPORT */
+#endif /* GNM_READ_SUPPORT */

diff --git a/tests/atlocal.in b/tests/atlocal.in
index cfe019a238d4e2d7ee400b28c9d3ef7a0b198a43..7c23b79662ff3e9dcecb6047fb91ba66219a5458 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -2,7 +2,7 @@
 
 # Variables used internally by the testsuite.
 EXEEXT='@EXEEXT@'
-GNM_SUPPORT='@GNM_SUPPORT@'
+GNM_READ_SUPPORT='@GNM_READ_SUPPORT@'
 ODF_READ_SUPPORT='@ODF_READ_SUPPORT@'
 PERL='@PERL@'
 WITH_PERL_MODULE='@WITH_PERL_MODULE@'

diff --git a/tests/language/data-io/get-data-spreadsheet.at b/tests/language/data-io/get-data-spreadsheet.at
index 3ca0d8b93608f1c458e75ae1e1b029db48a966ed..99c662b8cf5772cad9f691d029215513d7059e73 100644 (file)
--- a/tests/language/data-io/get-data-spreadsheet.at
+++ b/tests/language/data-io/get-data-spreadsheet.at
@@ -3,7 +3,7 @@ m4_define([SPREADSHEET_TEST_PREP],[dnl
  m4_if($1,[GNM],[dnl
     AT_CHECK([gzip -c $top_srcdir/tests/language/data-io/Book1.gnm.unzipped > Book1.gnumeric])dnl
     m4_define([testsheet],[Book1.gnumeric])dnl
-    AT_SKIP_IF([test n$GNM_SUPPORT != nyes])dnl
+    AT_SKIP_IF([test n$GNM_READ_SUPPORT != nyes])dnl
     ]) dnl
  m4_if($1,[ODS],[dnl
     AT_CHECK([cp $top_srcdir/tests/language/data-io/test.ods test.ods])dnl