From 5858b0b859c9a5fbdfb05f3dc93b47d672443d7a Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Wed, 11 Apr 2012 20:22:49 -0400 Subject: [PATCH] Make choice of whether to build rsvg-view-3 non-automagic --- Makefile.am | 2 +- configure.in | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1adb278..77c2ad1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ endif lib_LTLIBRARIES = librsvg-@RSVG_API_MAJOR_VERSION@.la bin_PROGRAMS = rsvg-convert -if HAVE_GTK_3 +if ENABLE_RSVG_VIEW bin_PROGRAMS += rsvg-view-3 endif diff --git a/configure.in b/configure.in index 005aff4..68b522c 100644 --- a/configure.in +++ b/configure.in @@ -154,6 +154,22 @@ fi AM_CONDITIONAL([ENABLE_GTK2_ENGINE],[test "$enable_gtk_theme" = "yes"]) +# =========================================================================== +# rsvg-view-3 application +# =========================================================================== + +if test "have_gtk_3"; then + AC_MSG_CHECKING([whether to build the rsvg-view-3 application]) + AC_ARG_ENABLE([rsvg-view], + [AS_HELP_STRING([--disable-rsvg-view],[Disable the rsvg-view-3 application (default=yes)])], + [],[enable_rsvg_view=yes]) + AC_MSG_RESULT([$enable_rsvg_view]) +else + enable_rsvg_view=no +fi + +AM_CONDITIONAL([ENABLE_RSVG_VIEW],[test "$enable_rsvg_view" = "yes"]) + dnl =========================================================================== dnl GDK-Pixbuf SVG loader dnl =========================================================================== @@ -339,5 +355,6 @@ librsvg-$VERSION GTK 2.0: ${have_gtk_2} GTK 3.0: ${have_gtk_3} Build GTK 2.0 theme engine: ${enable_gtk_theme} + Build rsvg-view-3 application: ${enable_rsvg_view} Build miscellaenous tools: ${build_misc_tools} " -- 1.7.8.5