Commit 0e5ffe27 authored by Yann Diorcet's avatar Yann Diorcet
Browse files

Improve wizard disabling with gtk < 2.22.0

parent d998fa1a
...@@ -449,7 +449,7 @@ AC_ARG_ENABLE(assistant, ...@@ -449,7 +449,7 @@ AC_ARG_ENABLE(assistant,
dnl check libsoup (needed for wizard) dnl check libsoup (needed for wizard)
if test "$build_wizard" != "false" ; then if test "$build_wizard" != "false" ; then
PKG_CHECK_MODULES(LIBSOUP, [libsoup-2.4 >= 2.26],[build_wizard=true], PKG_CHECK_MODULES(LIBSOUP, [libsoup-2.4 >= 2.26],[],
[ [
if test "$build_wizard" = "true" ; then if test "$build_wizard" = "true" ; then
AC_MSG_ERROR([Could not found libsoup, assistant cannot be compiled.]) AC_MSG_ERROR([Could not found libsoup, assistant cannot be compiled.])
...@@ -459,7 +459,7 @@ if test "$build_wizard" != "false" ; then ...@@ -459,7 +459,7 @@ if test "$build_wizard" != "false" ; then
]) ])
fi fi
if test "$build_wizard" != "false" ; then if test "$build_wizard" != "false" ; then
PKG_CHECK_MODULES(LIBGTKWIZARD, [gtk+-2.0 >= 2.22.0],[build_wizard=true], PKG_CHECK_MODULES(LIBGTKWIZARD, [gtk+-2.0 >= 2.22.0],[],
[ [
if test "$build_wizard" = "true" ; then if test "$build_wizard" = "true" ; then
AC_MSG_ERROR([gtk+-2.0 < 2.22.0, assistant cannot be compiled.]) AC_MSG_ERROR([gtk+-2.0 < 2.22.0, assistant cannot be compiled.])
...@@ -471,7 +471,7 @@ fi ...@@ -471,7 +471,7 @@ fi
AC_SUBST(LIBSOUP_CFLAGS) AC_SUBST(LIBSOUP_CFLAGS)
AC_SUBST(LIBSOUP_LIBS) AC_SUBST(LIBSOUP_LIBS)
AM_CONDITIONAL(BUILD_WIZARD, test x$build_wizard = xtrue) AM_CONDITIONAL(BUILD_WIZARD, test x$build_wizard = xtrue)
if test "$build_wizard" = "true" ; then if test "$build_wizard" != "false" ; then
AC_DEFINE(BUILD_WIZARD, 1, [Define if wizard enabled] ) AC_DEFINE(BUILD_WIZARD, 1, [Define if wizard enabled] )
fi fi
......
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