1.1 --- a/Makefile.in	Thu May 27 13:33:45 2010 +0200
     1.2 +++ b/Makefile.in	Sat May 29 14:23:07 2010 +0200
     1.3 @@ -147,6 +147,8 @@
     1.4  PACKAGE_VERSION = @PACKAGE_VERSION@
     1.5  PATH_SEPARATOR = @PATH_SEPARATOR@
     1.6  PKG_CONFIG = @PKG_CONFIG@
     1.7 +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
     1.8 +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
     1.9  RANLIB = @RANLIB@
    1.10  RESOLV_LIBS = @RESOLV_LIBS@
    1.11  SET_MAKE = @SET_MAKE@

     2.1 --- a/configure	Thu May 27 13:33:45 2010 +0200
     2.2 +++ b/configure	Sat May 29 14:23:07 2010 +0200
     2.3 @@ -613,6 +613,8 @@
     2.4  RESOLV_LIBS
     2.5  GLIB_LIBS
     2.6  GLIB_CFLAGS
     2.7 +PKG_CONFIG_LIBDIR
     2.8 +PKG_CONFIG_PATH
     2.9  PKG_CONFIG
    2.10  RANLIB
    2.11  EGREP
    2.12 @@ -726,6 +728,8 @@
    2.13  CPPFLAGS
    2.14  CPP
    2.15  PKG_CONFIG
    2.16 +PKG_CONFIG_PATH
    2.17 +PKG_CONFIG_LIBDIR
    2.18  GLIB_CFLAGS
    2.19  GLIB_LIBS'
    2.20  
    2.21 @@ -1376,6 +1380,10 @@
    2.22                you have headers in a nonstandard directory <include dir>
    2.23    CPP         C preprocessor
    2.24    PKG_CONFIG  path to pkg-config utility
    2.25 +  PKG_CONFIG_PATH
    2.26 +              directories to add to pkg-config's search path
    2.27 +  PKG_CONFIG_LIBDIR
    2.28 +              path overriding pkg-config's built-in search path
    2.29    GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
    2.30    GLIB_LIBS   linker flags for GLIB, overriding pkg-config
    2.31  
    2.32 @@ -4238,6 +4246,10 @@
    2.33  
    2.34  
    2.35  
    2.36 +
    2.37 +
    2.38 +
    2.39 +
    2.40  if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
    2.41  	if test -n "$ac_tool_prefix"; then
    2.42    # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
    2.43 @@ -4350,18 +4362,16 @@
    2.44  $as_echo "no" >&6; }
    2.45  		PKG_CONFIG=""
    2.46  	fi
    2.47 -
    2.48  fi
    2.49  
    2.50  pkg_failed=no
    2.51  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
    2.52  $as_echo_n "checking for GLIB... " >&6; }
    2.53  
    2.54 -if test -n "$PKG_CONFIG"; then
    2.55 -    if test -n "$GLIB_CFLAGS"; then
    2.56 -        pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
    2.57 -    else
    2.58 -        if test -n "$PKG_CONFIG" && \
    2.59 +if test -n "$GLIB_CFLAGS"; then
    2.60 +    pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
    2.61 + elif test -n "$PKG_CONFIG"; then
    2.62 +    if test -n "$PKG_CONFIG" && \
    2.63      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5
    2.64    ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
    2.65    ac_status=$?
    2.66 @@ -4371,15 +4381,13 @@
    2.67  else
    2.68    pkg_failed=yes
    2.69  fi
    2.70 -    fi
    2.71 -else
    2.72 -	pkg_failed=untried
    2.73 -fi
    2.74 -if test -n "$PKG_CONFIG"; then
    2.75 -    if test -n "$GLIB_LIBS"; then
    2.76 -        pkg_cv_GLIB_LIBS="$GLIB_LIBS"
    2.77 -    else
    2.78 -        if test -n "$PKG_CONFIG" && \
    2.79 + else
    2.80 +    pkg_failed=untried
    2.81 +fi
    2.82 +if test -n "$GLIB_LIBS"; then
    2.83 +    pkg_cv_GLIB_LIBS="$GLIB_LIBS"
    2.84 + elif test -n "$PKG_CONFIG"; then
    2.85 +    if test -n "$PKG_CONFIG" && \
    2.86      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5
    2.87    ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5
    2.88    ac_status=$?
    2.89 @@ -4389,14 +4397,15 @@
    2.90  else
    2.91    pkg_failed=yes
    2.92  fi
    2.93 -    fi
    2.94 -else
    2.95 -	pkg_failed=untried
    2.96 + else
    2.97 +    pkg_failed=untried
    2.98  fi
    2.99  
   2.100  
   2.101  
   2.102  if test $pkg_failed = yes; then
   2.103 +   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   2.104 +$as_echo "no" >&6; }
   2.105  
   2.106  if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
   2.107          _pkg_short_errors_supported=yes
   2.108 @@ -4404,9 +4413,9 @@
   2.109          _pkg_short_errors_supported=no
   2.110  fi
   2.111          if test $_pkg_short_errors_supported = yes; then
   2.112 -	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0"`
   2.113 +	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0" 2>&1`
   2.114          else
   2.115 -	        GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"`
   2.116 +	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0" 2>&1`
   2.117          fi
   2.118  	# Put the nasty error message in config.log where it belongs
   2.119  	echo "$GLIB_PKG_ERRORS" >&5
   2.120 @@ -4420,9 +4429,10 @@
   2.121  
   2.122  Alternatively, you may set the environment variables GLIB_CFLAGS
   2.123  and GLIB_LIBS to avoid the need to call pkg-config.
   2.124 -See the pkg-config man page for more details.
   2.125 -" "$LINENO" 5
   2.126 +See the pkg-config man page for more details." "$LINENO" 5
   2.127  elif test $pkg_failed = untried; then
   2.128 +     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   2.129 +$as_echo "no" >&6; }
   2.130  	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
   2.131  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   2.132  as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
   2.133 @@ -4440,7 +4450,7 @@
   2.134  	GLIB_LIBS=$pkg_cv_GLIB_LIBS
   2.135          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
   2.136  $as_echo "yes" >&6; }
   2.137 -	:
   2.138 +
   2.139  fi
   2.140  
   2.141  

     3.1 --- a/src/Makefile.in	Thu May 27 13:33:45 2010 +0200
     3.2 +++ b/src/Makefile.in	Sat May 29 14:23:07 2010 +0200
     3.3 @@ -175,6 +175,8 @@
     3.4  PACKAGE_VERSION = @PACKAGE_VERSION@
     3.5  PATH_SEPARATOR = @PATH_SEPARATOR@
     3.6  PKG_CONFIG = @PKG_CONFIG@
     3.7 +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
     3.8 +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
     3.9  RANLIB = @RANLIB@
    3.10  RESOLV_LIBS = @RESOLV_LIBS@
    3.11  SET_MAKE = @SET_MAKE@

     4.1 --- a/src/base64/Makefile.in	Thu May 27 13:33:45 2010 +0200
     4.2 +++ b/src/base64/Makefile.in	Sat May 29 14:23:07 2010 +0200
     4.3 @@ -120,6 +120,8 @@
     4.4  PACKAGE_VERSION = @PACKAGE_VERSION@
     4.5  PATH_SEPARATOR = @PATH_SEPARATOR@
     4.6  PKG_CONFIG = @PKG_CONFIG@
     4.7 +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
     4.8 +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
     4.9  RANLIB = @RANLIB@
    4.10  RESOLV_LIBS = @RESOLV_LIBS@
    4.11  SET_MAKE = @SET_MAKE@

     5.1 --- a/src/libident/Makefile.in	Thu May 27 13:33:45 2010 +0200
     5.2 +++ b/src/libident/Makefile.in	Sat May 29 14:23:07 2010 +0200
     5.3 @@ -112,6 +112,8 @@
     5.4  PACKAGE_VERSION = @PACKAGE_VERSION@
     5.5  PATH_SEPARATOR = @PATH_SEPARATOR@
     5.6  PKG_CONFIG = @PKG_CONFIG@
     5.7 +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
     5.8 +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
     5.9  RANLIB = @RANLIB@
    5.10  RESOLV_LIBS = @RESOLV_LIBS@
    5.11  SET_MAKE = @SET_MAKE@

     6.1 --- a/src/md5/Makefile.in	Thu May 27 13:33:45 2010 +0200
     6.2 +++ b/src/md5/Makefile.in	Sat May 29 14:23:07 2010 +0200
     6.3 @@ -116,6 +116,8 @@
     6.4  PACKAGE_VERSION = @PACKAGE_VERSION@
     6.5  PATH_SEPARATOR = @PATH_SEPARATOR@
     6.6  PKG_CONFIG = @PKG_CONFIG@
     6.7 +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
     6.8 +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
     6.9  RANLIB = @RANLIB@
    6.10  RESOLV_LIBS = @RESOLV_LIBS@
    6.11  SET_MAKE = @SET_MAKE@