From b886423b40760e1c777bd795ece60b62a8781779 Mon Sep 17 00:00:00 2001 From: Pierre-Luc Beaudoin Date: Mon, 11 Aug 2008 22:26:31 -0400 Subject: [PATCH] Add clutter deps --- autom4te.cache/output.2 | 50 ++++++++++++++++++++++++++++++++--------- autom4te.cache/output.3 | 50 ++++++++++++++++++++++++++++++++--------- autom4te.cache/traces.2 | 32 +++++++++++++------------- autom4te.cache/traces.3 | 33 +++++++++++++++++++-------- configure | 50 ++++++++++++++++++++++++++++++++--------- configure.ac | 5 ++++- 6 files changed, 164 insertions(+), 56 deletions(-) diff --git a/autom4te.cache/output.2 b/autom4te.cache/output.2 index a22f004..615cc65 100644 --- a/autom4te.cache/output.2 +++ b/autom4te.cache/output.2 @@ -3405,18 +3405,27 @@ if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + \"") >&5 ($PKG_CONFIG --exists --print-errors " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + ") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + " 2>/dev/null` else pkg_failed=yes @@ -3432,18 +3441,27 @@ if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + \"") >&5 ($PKG_CONFIG --exists --print-errors " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + ") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + " 2>/dev/null` else pkg_failed=yes @@ -3465,12 +3483,18 @@ fi if test $_pkg_short_errors_supported = yes; then DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + "` else DEPS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + "` fi # Put the nasty error message in config.log where it belongs @@ -3478,7 +3502,10 @@ fi { { echo "$as_me:$LINENO: error: Package requirements ( glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + ) were not met: $DEPS_PKG_ERRORS @@ -3492,7 +3519,10 @@ See the pkg-config man page for more details. " >&5 echo "$as_me: error: Package requirements ( glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + ) were not met: $DEPS_PKG_ERRORS diff --git a/autom4te.cache/output.3 b/autom4te.cache/output.3 index a22f004..615cc65 100644 --- a/autom4te.cache/output.3 +++ b/autom4te.cache/output.3 @@ -3405,18 +3405,27 @@ if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + \"") >&5 ($PKG_CONFIG --exists --print-errors " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + ") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + " 2>/dev/null` else pkg_failed=yes @@ -3432,18 +3441,27 @@ if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + \"") >&5 ($PKG_CONFIG --exists --print-errors " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + ") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + " 2>/dev/null` else pkg_failed=yes @@ -3465,12 +3483,18 @@ fi if test $_pkg_short_errors_supported = yes; then DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + "` else DEPS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + "` fi # Put the nasty error message in config.log where it belongs @@ -3478,7 +3502,10 @@ fi { { echo "$as_me:$LINENO: error: Package requirements ( glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + ) were not met: $DEPS_PKG_ERRORS @@ -3492,7 +3519,10 @@ See the pkg-config man page for more details. " >&5 echo "$as_me: error: Package requirements ( glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + ) were not met: $DEPS_PKG_ERRORS diff --git a/autom4te.cache/traces.2 b/autom4te.cache/traces.2 index 2310ffc..4832065 100644 --- a/autom4te.cache/traces.2 +++ b/autom4te.cache/traces.2 @@ -307,20 +307,20 @@ m4trace:configure.ac:21: -1- m4_pattern_allow([^DEPS_CFLAGS$]) m4trace:configure.ac:21: -1- AC_SUBST([DEPS_LIBS]) m4trace:configure.ac:21: -1- AC_SUBST_TRACE([DEPS_LIBS]) m4trace:configure.ac:21: -1- m4_pattern_allow([^DEPS_LIBS$]) -m4trace:configure.ac:33: -1- AC_CONFIG_FILES([Makefile +m4trace:configure.ac:36: -1- AC_CONFIG_FILES([Makefile src/Makefile]) -m4trace:configure.ac:35: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) -m4trace:configure.ac:35: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) -m4trace:configure.ac:35: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.ac:35: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) -m4trace:configure.ac:35: -1- AC_SUBST_TRACE([LTLIBOBJS]) -m4trace:configure.ac:35: -1- m4_pattern_allow([^LTLIBOBJS$]) -m4trace:configure.ac:35: -1- AC_SUBST_TRACE([top_builddir]) -m4trace:configure.ac:35: -1- AC_SUBST_TRACE([srcdir]) -m4trace:configure.ac:35: -1- AC_SUBST_TRACE([abs_srcdir]) -m4trace:configure.ac:35: -1- AC_SUBST_TRACE([top_srcdir]) -m4trace:configure.ac:35: -1- AC_SUBST_TRACE([abs_top_srcdir]) -m4trace:configure.ac:35: -1- AC_SUBST_TRACE([builddir]) -m4trace:configure.ac:35: -1- AC_SUBST_TRACE([abs_builddir]) -m4trace:configure.ac:35: -1- AC_SUBST_TRACE([abs_top_builddir]) -m4trace:configure.ac:35: -1- AC_SUBST_TRACE([INSTALL]) +m4trace:configure.ac:38: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) +m4trace:configure.ac:38: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) +m4trace:configure.ac:38: -1- m4_pattern_allow([^LIB@&t@OBJS$]) +m4trace:configure.ac:38: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) +m4trace:configure.ac:38: -1- AC_SUBST_TRACE([LTLIBOBJS]) +m4trace:configure.ac:38: -1- m4_pattern_allow([^LTLIBOBJS$]) +m4trace:configure.ac:38: -1- AC_SUBST_TRACE([top_builddir]) +m4trace:configure.ac:38: -1- AC_SUBST_TRACE([srcdir]) +m4trace:configure.ac:38: -1- AC_SUBST_TRACE([abs_srcdir]) +m4trace:configure.ac:38: -1- AC_SUBST_TRACE([top_srcdir]) +m4trace:configure.ac:38: -1- AC_SUBST_TRACE([abs_top_srcdir]) +m4trace:configure.ac:38: -1- AC_SUBST_TRACE([builddir]) +m4trace:configure.ac:38: -1- AC_SUBST_TRACE([abs_builddir]) +m4trace:configure.ac:38: -1- AC_SUBST_TRACE([abs_top_builddir]) +m4trace:configure.ac:38: -1- AC_SUBST_TRACE([INSTALL]) diff --git a/autom4te.cache/traces.3 b/autom4te.cache/traces.3 index d536bee..f58d10e 100644 --- a/autom4te.cache/traces.3 +++ b/autom4te.cache/traces.3 @@ -6897,7 +6897,10 @@ m4trace:configure.ac:18: -1- m4_pattern_allow([^DEPS_CFLAGS$]) m4trace:configure.ac:19: -1- m4_pattern_allow([^DEPS_LIBS$]) m4trace:configure.ac:21: -1- PKG_CHECK_MODULES([DEPS], [ glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + ]) m4trace:configure.ac:21: -1- PKG_PROG_PKG_CONFIG m4trace:configure.ac:21: -1- m4_pattern_forbid([^_?PKG_[A-Z_]+$]) @@ -6908,20 +6911,32 @@ m4trace:configure.ac:21: -1- m4_pattern_allow([^DEPS_CFLAGS$]) m4trace:configure.ac:21: -1- m4_pattern_allow([^DEPS_LIBS$]) m4trace:configure.ac:21: -1- PKG_CHECK_EXISTS([ glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + ], [pkg_cv_[]DEPS_CFLAGS=`$PKG_CONFIG --[]cflags " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + " 2>/dev/null`], [pkg_failed=yes]) m4trace:configure.ac:21: -1- PKG_CHECK_EXISTS([ glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + ], [pkg_cv_[]DEPS_LIBS=`$PKG_CONFIG --[]libs " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + " 2>/dev/null`], [pkg_failed=yes]) m4trace:configure.ac:21: -1- _PKG_SHORT_ERRORS_SUPPORTED -m4trace:configure.ac:35: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.ac:35: -1- m4_pattern_allow([^LTLIBOBJS$]) -m4trace:configure.ac:35: -1- _AC_AM_CONFIG_HEADER_HOOK([$ac_file]) -m4trace:configure.ac:35: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS +m4trace:configure.ac:38: -1- m4_pattern_allow([^LIB@&t@OBJS$]) +m4trace:configure.ac:38: -1- m4_pattern_allow([^LTLIBOBJS$]) +m4trace:configure.ac:38: -1- _AC_AM_CONFIG_HEADER_HOOK([$ac_file]) +m4trace:configure.ac:38: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS diff --git a/configure b/configure index 2c94152..fcfaa03 100755 --- a/configure +++ b/configure @@ -3405,18 +3405,27 @@ if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + \"") >&5 ($PKG_CONFIG --exists --print-errors " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + ") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + " 2>/dev/null` else pkg_failed=yes @@ -3432,18 +3441,27 @@ if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + \"") >&5 ($PKG_CONFIG --exists --print-errors " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + ") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + " 2>/dev/null` else pkg_failed=yes @@ -3465,12 +3483,18 @@ fi if test $_pkg_short_errors_supported = yes; then DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + "` else DEPS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + "` fi # Put the nasty error message in config.log where it belongs @@ -3478,7 +3502,10 @@ fi { { echo "$as_me:$LINENO: error: Package requirements ( glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + ) were not met: $DEPS_PKG_ERRORS @@ -3492,7 +3519,10 @@ See the pkg-config man page for more details. " >&5 echo "$as_me: error: Package requirements ( glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + ) were not met: $DEPS_PKG_ERRORS diff --git a/configure.ac b/configure.ac index 52cafc7..8a35f60 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,10 @@ AC_SUBST(DEPS_LIBS) PKG_CHECK_MODULES(DEPS, [ glib-2.0 >= 2.2, gobject-2.0 >= 2.0, - gtk+-2.0 >= 2.2 ] + gtk+-2.0 >= 2.2, + clutter-0.6 >= 0.6, + clutter-gtk-0.6 >= 0.6 + ] ) # Checks for header files. -- 2.39.5