--- configure.orig 2010-06-22 23:33:27.209859071 +0200 +++ configure 2010-06-22 23:34:07.417853306 +0200 @@ -11727,96 +11727,6 @@ $as_echo "no" >&6; } fi fi -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREADSTUBS" >&5 -$as_echo_n "checking for PTHREADSTUBS... " >&6; } - -if test -n "$PTHREADSTUBS_CFLAGS"; then - pkg_cv_PTHREADSTUBS_CFLAGS="$PTHREADSTUBS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pthread-stubs\""; } >&5 - ($PKG_CONFIG --exists --print-errors "pthread-stubs") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_PTHREADSTUBS_CFLAGS=`$PKG_CONFIG --cflags "pthread-stubs" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$PTHREADSTUBS_LIBS"; then - pkg_cv_PTHREADSTUBS_LIBS="$PTHREADSTUBS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pthread-stubs\""; } >&5 - ($PKG_CONFIG --exists --print-errors "pthread-stubs") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_PTHREADSTUBS_LIBS=`$PKG_CONFIG --libs "pthread-stubs" 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 - PTHREADSTUBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pthread-stubs" 2>&1` - else - PTHREADSTUBS_PKG_ERRORS=`$PKG_CONFIG --print-errors "pthread-stubs" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$PTHREADSTUBS_PKG_ERRORS" >&5 - - as_fn_error "Package requirements (pthread-stubs) were not met: - -$PTHREADSTUBS_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 PTHREADSTUBS_CFLAGS -and PTHREADSTUBS_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 PTHREADSTUBS_CFLAGS -and PTHREADSTUBS_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 - PTHREADSTUBS_CFLAGS=$pkg_cv_PTHREADSTUBS_CFLAGS - PTHREADSTUBS_LIBS=$pkg_cv_PTHREADSTUBS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - - pkgconfigdir=${libdir}/pkgconfig