--- configure.orig 2011-08-30 23:03:20.000000000 +0200 +++ configure 2011-08-30 23:03:01.000000000 +0200 @@ -648,8 +648,6 @@ INTROSPECTION_COMPILER INTROSPECTION_SCANNER GLIB_GENMARSHAL -TESTS_LIBS -TESTS_CFLAGS PACKAGE_LIBS PACKAGE_CFLAGS PKG_CONFIG_LIBDIR @@ -806,8 +804,6 @@ PKG_CONFIG_LIBDIR PACKAGE_CFLAGS PACKAGE_LIBS -TESTS_CFLAGS -TESTS_LIBS GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS XMLTO @@ -1477,9 +1473,6 @@ C compiler flags for PACKAGE, overriding pkg-config PACKAGE_LIBS linker flags for PACKAGE, overriding pkg-config - TESTS_CFLAGS - C compiler flags for TESTS, overriding pkg-config - TESTS_LIBS linker flags for TESTS, overriding pkg-config GTKDOC_DEPS_CFLAGS C compiler flags for GTKDOC_DEPS, overriding pkg-config GTKDOC_DEPS_LIBS @@ -11664,98 +11657,6 @@ fi -tests_modules="gtk+-3.0 >= $REQ_GTK_VERSION" - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TESTS" >&5 -$as_echo_n "checking for TESTS... " >&6; } - -if test -n "$TESTS_CFLAGS"; then - pkg_cv_TESTS_CFLAGS="$TESTS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$tests_modules\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$tests_modules") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_TESTS_CFLAGS=`$PKG_CONFIG --cflags "$tests_modules" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$TESTS_LIBS"; then - pkg_cv_TESTS_LIBS="$TESTS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$tests_modules\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$tests_modules") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_TESTS_LIBS=`$PKG_CONFIG --libs "$tests_modules" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - TESTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$tests_modules" 2>&1` - else - TESTS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$tests_modules" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$TESTS_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements ($tests_modules) were not met: - -$TESTS_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables TESTS_CFLAGS -and TESTS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 - -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables TESTS_CFLAGS -and TESTS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } - -else - TESTS_CFLAGS=$pkg_cv_TESTS_CFLAGS - TESTS_LIBS=$pkg_cv_TESTS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`