Kaydet (Commit) 78051aaa authored tarafından Christian Lohmaier's avatar Christian Lohmaier Kaydeden (comit) Michael Stahl

be consistent with configure's default and switch wrt gtk3

also record the system-cairo stuff as a proper warning, so that people
have a chance to see it.

Change-Id: Ic59bed91edbe92a642851ccef570c9dca94672f0
üst 85dbc812
...@@ -812,7 +812,7 @@ AC_ARG_ENABLE(gtk, ...@@ -812,7 +812,7 @@ AC_ARG_ENABLE(gtk,
,enable_gtk=yes) ,enable_gtk=yes)
AC_ARG_ENABLE(gtk3, AC_ARG_ENABLE(gtk3,
AS_HELP_STRING([--disable-gtk3], AS_HELP_STRING([--enable-gtk3],
[Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available.]), [Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available.]),
,enable_gtk3=no) ,enable_gtk3=no)
...@@ -9195,7 +9195,8 @@ GTK3_LIBS="" ...@@ -9195,7 +9195,8 @@ GTK3_LIBS=""
ENABLE_GTK3="" ENABLE_GTK3=""
if test "x$enable_gtk3" = "xyes"; then if test "x$enable_gtk3" = "xyes"; then
if test "$with_system_cairo" != yes; then if test "$with_system_cairo" != yes; then
echo "System cairo required for gtk3 support, please use --with-system-cairo" AC_MSG_WARN([System cairo required for gtk3 support, please use --with-system-cairo])
add_warning "System cairo required for gtk3 support, please use --with-system-cairo"
fi fi
PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.2 gtk+-unix-print-3.0 gmodule-no-export-2.0 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="") PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.2 gtk+-unix-print-3.0 gmodule-no-export-2.0 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
if test "x$ENABLE_GTK3" = "xTRUE"; then if test "x$ENABLE_GTK3" = "xTRUE"; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment