[gtk-mac-integration: 1/2] configure fixes
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-mac-integration: 1/2] configure fixes
- Date: Tue, 12 May 2015 13:52:39 +0000 (UTC)
commit 44a995721c7acfcdf62b6217df2944e0e10f6875
Author: Tom Schoonjans <Tom Schoonjans bam de>
Date: Tue May 12 09:27:42 2015 +0200
configure fixes
couple of brackets removed
configure errors out when neither Gtk2 nor Gtk3 was found.
configure.ac | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e191e99..481293a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ AS_IF([test "x$enable_menu_images" != xno],
[AC_DEFINE([USE_MENU_IMAGES], 1, [Add images to menu items])])
-AC_ARG_WITH([gtk2], [AS_HELP_STRING([--with-gtk2]), [build against gtk2])] ,[with_gtk2=$withval],
+AC_ARG_WITH([gtk2], [AS_HELP_STRING([--with-gtk2], [build against gtk2])] ,[with_gtk2=$withval],
[with_gtk2=yes])
AC_ARG_WITH([gtk3], [AS_HELP_STRING([--with-gtk3], [build against gtk3])] ,[with_gtk3=$withval],
[with_gtk3=yes])
@@ -60,14 +60,18 @@ if test "x$with_gtk3" = "xyes" ; then
PKG_CHECK_MODULES([GTK3], [gtk+-3.0], [],
with_gtk3=no
AC_MSG_WARN([GTK+-3.0 not found])
- ])
+ )
fi
if test "x$with_gtk2" = "xyes" ; then
PKG_CHECK_MODULES([GTK2], [gtk+-2.0], [],
with_gtk2=no
AC_MSG_WARN([GTK+-2.0 not found])
- ])
+ )
+fi
+
+if test "x$with_gtk2" = "xno" && test "x$with_gtk3" = "xno" ; then
+ AC_MSG_ERROR([Neither GTK+-2.0 nor GTK+-3.0 was found])
fi
AM_CONDITIONAL([INTROSPECTION], [test x$with_gtk3 = xyes])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]