s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't check clutter-gtk if clutter is disabled.

Browse Source
This commit is contained in:
Daiki Ueno
2011-06-09 18:05:12 +09:00
parent a744096dd7
commit e199add701
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
configure.ac
View File

@ -217,19 +217,22 @@ AM_CONDITIONAL(ENABLE_CLUTTER, [test x$enable_clutter = xyes])
AC_MSG_RESULT($enable_clutter) AC_MSG_RESULT($enable_clutter)
dnl clutter-gtk dnl clutter-gtk
AC_MSG_CHECKING([whether you enable clutter-gtk]) if test x$enable_clutter = xyes; then
AC_ARG_ENABLE(clutter-gtk, AC_MSG_CHECKING([whether you enable clutter-gtk])
AS_HELP_STRING([--enable-clutter-gtk=no/yes], AC_ARG_ENABLE(clutter-gtk,
[Enable clutter user interface default=yes]),, AS_HELP_STRING([--enable-clutter-gtk=no/yes],
enable_clutter_gtk=yes) [Enable clutter user interface default=yes]),,
enable_clutter_gtk=yes)
if test x$enable_clutter_gtk = xyes; then
PKG_CHECK_MODULES([CLUTTER_GTK], [clutter-gtk-1.0], , enable_clutter_gtk=yes)
if test x$enable_clutter_gtk = xyes; then if test x$enable_clutter_gtk = xyes; then
AC_DEFINE([HAVE_CLUTTER_GTK], [1], [Define if Clutter-Gtk is found]) PKG_CHECK_MODULES([CLUTTER_GTK], [clutter-gtk-1.0], ,
enable_clutter_gtk=no)
if test x$enable_clutter_gtk = xyes; then
AC_DEFINE([HAVE_CLUTTER_GTK], [1], [Define if Clutter-Gtk is found])
fi
fi fi
AC_MSG_RESULT($enable_clutter_gtk)
fi fi
AC_MSG_RESULT($enable_clutter_gtk)
AM_CONDITIONAL(ENABLE_CLUTTER_GTK, [test x$enable_clutter_gtk = xyes]) AM_CONDITIONAL(ENABLE_CLUTTER_GTK, [test x$enable_clutter_gtk = xyes])
GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) GTK_DOC_CHECK([1.14],[--flavour no-tmpl])