diff options
| author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-02-17 18:57:20 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2012-02-17 18:57:20 +0800 |
| commit | da499c0104e3f7dc36b34856d02b7af2ac835c68 (patch) | |
| tree | c36749a75ca205e19327378933bdfd82e416c49f | |
| parent | 235eaff9c65522d1ba39fbbd6e8e77cbd72697da (diff) | |
| download | gsoc2013-evolution-da499c0104e3f7dc36b34856d02b7af2ac835c68.tar.gz gsoc2013-evolution-da499c0104e3f7dc36b34856d02b7af2ac835c68.tar.zst gsoc2013-evolution-da499c0104e3f7dc36b34856d02b7af2ac835c68.zip | |
Bug #663077 - Reorder mx-1.0 and clutter-gtk-1.0 in PKG_CHECK_MODULES
clutter-gtk-1.0 installs headers in /usr/include/clutter-gtk-1.0/clutter-gtk;
clutter-gtk-0.10 installs headers in /usr/include/clutter-1.0/clutter-gtk
To ensure that clutter-gtk-1.0's headers (and not 0.10's) are used,
-I/usr/include/clutter-gtk-1.0 must come before -I/usr/include/clutter-1.0
in CLUTTER_CFLAGS. And that means clutter-gtk-1.0 must come before mx-1.0
in PKG_CHECK_MODULES.
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index affcab8aca..2eb64feea5 100644 --- a/configure.ac +++ b/configure.ac @@ -599,7 +599,7 @@ AC_ARG_WITH([clutter], AC_MSG_RESULT($with_clutter) if test "x$with_clutter" = "xyes"; then - PKG_CHECK_MODULES(CLUTTER, [mx-1.0 clutter-gtk-1.0 >= clutter_gtk_minimum_version clutter-1.0 >= 1.0.0]) + PKG_CHECK_MODULES(CLUTTER, [clutter-gtk-1.0 >= clutter_gtk_minimum_version mx-1.0 clutter-1.0 >= 1.0.0]) AC_DEFINE(HAVE_CLUTTER, 1, [Clutter available]) AM_CONDITIONAL(ENABLE_CLUTTER, true) |