commit a7cf6246dbac6bd14a8c6036c11b629ab77e89cb
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Sun Sep 11 18:58:41 2011 +0100
Sort out clarity's options for building or not building
* Seems that currently even without clutter, configure claims it will build
clarity when in fact it doesn't
configure.ac | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f945310..cefda19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,19 +205,24 @@ else
[clutter-gtk-1.0 >= 1.0],
[have_clutter_gtk="yes"],
[have_clutter_gtk="no"])
- have_clarity="yes"
-fi
-AM_CONDITIONAL(HAVE_CLUTTER_GTK, [test "x$have_clutter_gtk" = "xyes"])
-AM_CONDITIONAL(HAVE_PLUGIN_CLARITY, [test "x$have_clutter_gtk" = "xyes"])
-if test "x$have_clutter_gtk" = "xyes"; then
- AC_DEFINE(HAVE_CLUTTER_GTK, 1, [Define if you have clutter gtk support])
- AC_SUBST(CLUTTER_GTK_CFLAGS)
- AC_SUBST(CLUTTER_GTK_LIBS)
- dnl Need to add to CFLAGS and LIBS so main can init correctly
- CFLAGS="$CFLAGS $CLUTTER_GTK_CFLAGS"
- LIBS="$LIBS $CLUTTER_GTK_LIBS"
-fi
+
+ dnl we have clutter installed
+ AM_CONDITIONAL(HAVE_CLUTTER_GTK, [test "x$have_clutter_gtk" = "xyes"])
+ dnl we can go ahead and build clarity
+
+ if test "x$have_clutter_gtk" = "xyes"; then
+ have_clarity="yes"
+ AM_CONDITIONAL(HAVE_PLUGIN_CLARITY, [test "x$have_clarity" =
"xyes"])
+
+ AC_DEFINE(HAVE_CLUTTER_GTK, 1, [Define if you have clutter gtk
support])
+ AC_SUBST(CLUTTER_GTK_CFLAGS)
+ AC_SUBST(CLUTTER_GTK_LIBS)
+ dnl Need to add to CFLAGS and LIBS so main can init correctly
+ CFLAGS="$CFLAGS $CLUTTER_GTK_CFLAGS"
+ LIBS="$LIBS $CLUTTER_GTK_LIBS"
+ fi
+fi
dnl Check for gstreamer
dnl -------------------------------------------------------------
------------------------------------------------------------------------------
Using storage to extend the benefits of virtualization and iSCSI
Virtualization increases hardware utilization and delivers a new level of
agility. Learn what those decisions are and how to modernize your storage
and backup environments for virtualization.
http://www.accelacomm.com/jaw/sfnl/114/51434361/
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
