1.1 --- a/configure	Thu May 27 13:33:45 2010 +0200
     1.2 +++ b/configure	Sat May 29 14:23:07 2010 +0200
     1.3 @@ -613,6 +613,8 @@
     1.4  RESOLV_LIBS
     1.5  GLIB_LIBS
     1.6  GLIB_CFLAGS
     1.7 +PKG_CONFIG_LIBDIR
     1.8 +PKG_CONFIG_PATH
     1.9  PKG_CONFIG
    1.10  RANLIB
    1.11  EGREP
    1.12 @@ -726,6 +728,8 @@
    1.13  CPPFLAGS
    1.14  CPP
    1.15  PKG_CONFIG
    1.16 +PKG_CONFIG_PATH
    1.17 +PKG_CONFIG_LIBDIR
    1.18  GLIB_CFLAGS
    1.19  GLIB_LIBS'
    1.20  
    1.21 @@ -1376,6 +1380,10 @@
    1.22                you have headers in a nonstandard directory <include dir>
    1.23    CPP         C preprocessor
    1.24    PKG_CONFIG  path to pkg-config utility
    1.25 +  PKG_CONFIG_PATH
    1.26 +              directories to add to pkg-config's search path
    1.27 +  PKG_CONFIG_LIBDIR
    1.28 +              path overriding pkg-config's built-in search path
    1.29    GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
    1.30    GLIB_LIBS   linker flags for GLIB, overriding pkg-config
    1.31  
    1.32 @@ -4238,6 +4246,10 @@
    1.33  
    1.34  
    1.35  
    1.36 +
    1.37 +
    1.38 +
    1.39 +
    1.40  if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
    1.41  	if test -n "$ac_tool_prefix"; then
    1.42    # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
    1.43 @@ -4350,18 +4362,16 @@
    1.44  $as_echo "no" >&6; }
    1.45  		PKG_CONFIG=""
    1.46  	fi
    1.47 -
    1.48  fi
    1.49  
    1.50  pkg_failed=no
    1.51  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
    1.52  $as_echo_n "checking for GLIB... " >&6; }
    1.53  
    1.54 -if test -n "$PKG_CONFIG"; then
    1.55 -    if test -n "$GLIB_CFLAGS"; then
    1.56 -        pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
    1.57 -    else
    1.58 -        if test -n "$PKG_CONFIG" && \
    1.59 +if test -n "$GLIB_CFLAGS"; then
    1.60 +    pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
    1.61 + elif test -n "$PKG_CONFIG"; then
    1.62 +    if test -n "$PKG_CONFIG" && \
    1.63      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5
    1.64    ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
    1.65    ac_status=$?
    1.66 @@ -4371,15 +4381,13 @@
    1.67  else
    1.68    pkg_failed=yes
    1.69  fi
    1.70 -    fi
    1.71 -else
    1.72 -	pkg_failed=untried
    1.73 -fi
    1.74 -if test -n "$PKG_CONFIG"; then
    1.75 -    if test -n "$GLIB_LIBS"; then
    1.76 -        pkg_cv_GLIB_LIBS="$GLIB_LIBS"
    1.77 -    else
    1.78 -        if test -n "$PKG_CONFIG" && \
    1.79 + else
    1.80 +    pkg_failed=untried
    1.81 +fi
    1.82 +if test -n "$GLIB_LIBS"; then
    1.83 +    pkg_cv_GLIB_LIBS="$GLIB_LIBS"
    1.84 + elif test -n "$PKG_CONFIG"; then
    1.85 +    if test -n "$PKG_CONFIG" && \
    1.86      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5
    1.87    ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
    1.88    ac_status=$?
    1.89 @@ -4389,14 +4397,15 @@
    1.90  else
    1.91    pkg_failed=yes
    1.92  fi
    1.93 -    fi
    1.94 -else
    1.95 -	pkg_failed=untried
    1.96 + else
    1.97 +    pkg_failed=untried
    1.98  fi
    1.99  
   1.100  
   1.101  
   1.102  if test $pkg_failed = yes; then
   1.103 +   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   1.104 +$as_echo "no" >&6; }
   1.105  
   1.106  if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
   1.107          _pkg_short_errors_supported=yes
   1.108 @@ -4404,9 +4413,9 @@
   1.109          _pkg_short_errors_supported=no
   1.110  fi
   1.111          if test $_pkg_short_errors_supported = yes; then
   1.112 -	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0"`
   1.113 +	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0" 2>&1`
   1.114          else
   1.115 -	        GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"`
   1.116 +	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0" 2>&1`
   1.117          fi
   1.118  	# Put the nasty error message in config.log where it belongs
   1.119  	echo "$GLIB_PKG_ERRORS" >&5
   1.120 @@ -4420,9 +4429,10 @@
   1.121  
   1.122  Alternatively, you may set the environment variables GLIB_CFLAGS
   1.123  and GLIB_LIBS to avoid the need to call pkg-config.
   1.124 -See the pkg-config man page for more details.
   1.125 -" "$LINENO" 5
   1.126 +See the pkg-config man page for more details." "$LINENO" 5
   1.127  elif test $pkg_failed = untried; then
   1.128 +     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   1.129 +$as_echo "no" >&6; }
   1.130  	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
   1.131  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   1.132  as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
   1.133 @@ -4440,7 +4450,7 @@
   1.134  	GLIB_LIBS=$pkg_cv_GLIB_LIBS
   1.135          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
   1.136  $as_echo "yes" >&6; }
   1.137 -	:
   1.138 +
   1.139  fi
   1.140  
   1.141