[beryl-commits] compiz mirror: Changes to 'master' (6a762ef3dedf32216170652284981ad85430b250)

[compiz at server.beryl-project.org]

New commits:
commit 6a762ef3dedf32216170652284981ad85430b250
Merge: 85a622ab0001821fbdb0136605fec219601dae01 64fbb40bc64208e5410582e3cd9f19aa0d52bcc4
Author: Robert Carr <racarr at gorbie.(none)>
Date:   Sun Jun 17 12:57:25 2007 -0400

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/app/compiz

commit 85a622ab0001821fbdb0136605fec219601dae01
Author: Robert Carr <racarr at gorbie.(none)>
Date:   Sun Jun 17 12:56:51 2007 -0400

    Move AM_GCONF_SOURCE_2 in to gconf conditional


 configure.ac |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


Modified: compiz/configure.ac
===================================================================
--- compiz/configure.ac
+++ compiz/configure.ac
@@ -147,14 +147,13 @@ AC_ARG_ENABLE(gconf,
 
 if test "x$use_gconf" = "xyes"; then
   PKG_CHECK_MODULES(GCONF, gconf-2.0)
-
+  AM_GCONF_SOURCE_2
   AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
   if test x"$GCONFTOOL" = xno; then
     AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
   fi
 fi
 
-AM_GCONF_SOURCE_2
 
 AM_CONDITIONAL(USE_GCONF, test "x$use_gconf" = "xyes")
 if test "$use_gconf" = yes; then