projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: Streamline pspp.desktop
[pspp]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index eb10e560a2d2a4362a6f17ab269855b9ade0ecee..1456b66138eaf537a40cedd6a39325b4f143a088 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-75,6
+75,9
@@
if test "$with_cairo" != no && test "$with_gui" != "no"; then
PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.16], [],
[PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.16 or later (or use --without-gui)])])
PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.16], [],
[PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.16 or later (or use --without-gui)])])
+ PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-2.0 >= 2.2], [],
+ [PSPP_REQUIRED_PREREQ([gtksourceview 2.0 version 2.2 or later (or use --without-gui)])])
+
AC_ARG_VAR([GLIB_GENMARSHAL])
AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
if test "x$GLIB_GENMARSHAL" = x; then
AC_ARG_VAR([GLIB_GENMARSHAL])
AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
if test "x$GLIB_GENMARSHAL" = x; then
@@
-196,24
+199,30
@@
AC_DEFINE(
[crc32], [gl_crc32],
[Avoid making zlib call gnulib's crc32() instead of its own.])
[crc32], [gl_crc32],
[Avoid making zlib call gnulib's crc32() instead of its own.])
-dnl Gnumeric support requires libxml2 and zlib.
+dnl Gnumeric
and OpenDocument (read)
support requires libxml2 and zlib.
if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = yes; then
GNM_SUPPORT=yes
if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = yes; then
GNM_SUPPORT=yes
+ ODF_READ_SUPPORT=yes
AC_DEFINE(
[GNM_SUPPORT], [1],
[Define to 1 if building in support for reading Gnumeric files.])
AC_DEFINE(
[GNM_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
else
GNM_SUPPORT=no
+ ODF_READ_SUPPORT=no
fi
AC_SUBST([GNM_SUPPORT])
fi
AC_SUBST([GNM_SUPPORT])
+AC_SUBST([ODF_READ_SUPPORT])
-dnl OD
T support requires libxml2
.
+dnl OD
F support requires libxml2 (zlib is optional)
.
if test $HAVE_LIBXML2 = yes; then
AC_DEFINE(
if test $HAVE_LIBXML2 = yes; then
AC_DEFINE(
- [OD
T
_SUPPORT], [1],
- [Define to 1 if building in support for writing O
DT
files.])
+ [OD
F_WRITE
_SUPPORT], [1],
+ [Define to 1 if building in support for writing O
penDocument
files.])
fi
fi
-AM_CONDITIONAL([OD
T
_SUPPORT], [test $HAVE_LIBXML2 = yes])
+AM_CONDITIONAL([OD
F_WRITE
_SUPPORT], [test $HAVE_LIBXML2 = yes])
AC_ARG_WITH(
gui_tools,
AC_ARG_WITH(
gui_tools,