Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono-addins.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Nordan <rpvn@robpvn.net>2013-10-12 12:23:03 +0400
committerRobert Nordan <rpvn@robpvn.net>2013-10-12 12:23:03 +0400
commit0a82baeff7451220a395f7db07d1edca20599fbc (patch)
treeca52c5a6c09d3b67a882c58d989ce7275bf30bd5 /configure.ac
parentf7f31ad4c5c70b8696e81ac694cc23b224f2b303 (diff)
Revert "Revert "Add Conditional check for GTK3""
This reverts commit 0aa5fb5f949dcb8c13a2c6c0fc58b5aa7e06a634, because I discovered that I had reverted one commit too many. Slightly embarrassing, but at least git lets me fix it!
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac14
1 files changed, 13 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 8a05636..f209995 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,13 @@ AC_ARG_ENABLE(gui,
AM_CONDITIONAL(ENABLE_GUI, test x$enable_gui = xyes)
+AC_ARG_ENABLE(gui_gtk3,
+ AC_HELP_STRING([--enable-gui-gtk3],
+ [enable support for GTK3 dependent libraries [default=no]]),
+ enable_gui_gtk3=${enableval}, enable_gui_gtk3=no)
+
+AM_CONDITIONAL(ENABLE_GUI_GTK3, test x$enable_gui_gtk3 = xyes)
+
AC_ARG_ENABLE(tests,
AC_HELP_STRING([--enable-tests],
[build unit tests [default=no]]),
@@ -65,6 +72,10 @@ if test "x$enable_gui" = "xyes"; then
PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
fi
+if test "x$enable_gui_gtk3" = "xyes"; then
+ PKG_CHECK_MODULES([GTK_SHARP_30], [gtk-sharp-3.0 >= 2.99])
+fi
+
if test "x$enable_tests" = "xyes"; then
PKG_CHECK_MODULES([MONO_NUNIT], [mono-nunit])
fi
@@ -117,7 +128,8 @@ echo ""
echo "Configuration summary"
echo ""
echo " * Installation prefix = $prefix"
-echo " * gui support: $enable_gui"
+echo " * GTK2 gui support: $enable_gui"
+echo " * GTK3 gui support: $enable_gui_gtk3"
echo " * unit tests: $enable_tests"
echo " * documentation: $enable_docs"
echo ""