Fix broken ./configure --without-gui (again)

[pspp] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9acc451d100154ebcd5df9e6923cea8302388b11..c23dc6bcd199715f637c4f77af50b05bc07a6ed6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ $as_echo '<name>Hallo</name>' >> test.metainfo.xml.in
 $as_echo '</component>' >> test.metainfo.xml.in
 xgettext -o mifc.po test.metainfo.xml.in
 if ! test -f ./mifc.po  ; then
-  PSPP_REQUIRED_PREREQ([appstream 0.12 or later for metainfo.its])
+  PSPP_OPTIONAL_PREREQ([org.fsf.metainfo.xml will not be translated. Install gettext >=0.20 or appstream.])
 fi
 rm -f mifc.po test.metainfo.xml.in
 
@@ -119,7 +119,7 @@ AC_ARG_WITH([gui],
   [AS_HELP_STRING([--without-gui],
                   [Don't build the PSPPIRE GUI (using GTK+)])],
   [], [with_gui=yes])
-AM_CONDITIONAL([HAVE_GUI],
+AM_CONDITIONAL([building_gui],
                [test "$with_cairo" != no && test "$with_gui" != "no"])
 if test "$with_cairo" != no && test "$with_gui" != "no"; then
   PKG_CHECK_MODULES([GTHREAD], [gthread-2.0], [],
@@ -137,6 +137,10 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then
   PKG_CHECK_MODULES([SPREAD_SHEET_WIDGET], [spread-sheet-widget >= 0.6], [],
     [PSPP_REQUIRED_PREREQ([spread-sheet-widget 0.6 (or use --without-gui)])])
 
+  PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.44],
+    [AC_DEFINE([HAVE_RSVG], 1, [Define to 1 if librsvg is available])],
+    [PSPP_OPTIONAL_PREREQ([librsvg >= 2.44 required for high dpi Copy and Paste])])
+
   AC_ARG_VAR([GLIB_GENMARSHAL])
   AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
   if test "x$GLIB_GENMARSHAL" = x; then