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
dnl Gnumeric and OpenDocument (read) support requires libxml2 and zlib.
if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = yes; then
dnl Gnumeric and OpenDocument (read) support requires libxml2 and zlib.
if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = yes; then
ODF_READ_SUPPORT=yes
AC_DEFINE(
ODF_READ_SUPPORT=yes
AC_DEFINE(
+ [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
[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
+AC_SUBST([GNM_READ_SUPPORT])
AC_SUBST([ODF_READ_SUPPORT])
dnl ODF support requires libxml2 (zlib is optional).
AC_SUBST([ODF_READ_SUPPORT])
dnl ODF support requires libxml2 (zlib is optional).
#include "spreadsheet-reader.h"
#include "spreadsheet-reader.h"
struct casereader *
gnumeric_open_reader (const struct spreadsheet_read_options *opts, struct dictionary **dict)
struct casereader *
gnumeric_open_reader (const struct spreadsheet_read_options *opts, struct dictionary **dict)
-#endif /* GNM_SUPPORT */
+#endif /* GNM_READ_SUPPORT */
# Variables used internally by the testsuite.
EXEEXT='@EXEEXT@'
# 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@'
ODF_READ_SUPPORT='@ODF_READ_SUPPORT@'
PERL='@PERL@'
WITH_PERL_MODULE='@WITH_PERL_MODULE@'
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
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
]) dnl
m4_if($1,[ODS],[dnl
AT_CHECK([cp $top_srcdir/tests/language/data-io/test.ods test.ods])dnl