--- pkg-config-0.25.orig/glib-1.2.10/configure	2010-05-09 07:18:10.000000000 +0000
+++ pkg-config-0.25/glib-1.2.10/configure	2011-03-16 08:37:21.000000000 +0000
@@ -12188,56 +12188,9 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra flags to get ANSI library prototypes" >&5
 $as_echo_n "checking for extra flags to get ANSI library prototypes... " >&6; }
-glib_save_LIBS=$LIBS
-LIBS="$LIBS -lm"
-if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <math.h>
-             int main (void) { return (log(1) != log(1.)); }
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; }
-else
-  glib_save_CFLAGS=$CFLAGS
-     CFLAGS="$CFLAGS -std1"
-     if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <math.h>
-                 int main (void) { return (log(1) != log(1.)); }
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: -std1" >&5
-$as_echo "-std1" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
-         CFLAGS=$glib_save_CFLAGS
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5
-$as_echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;}
 
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
+glib_save_LIBS="$LIBS -lm"
+glib_save_CFLAGS="$CFLAGS -std1"
 
 LIBS=$glib_save_LIBS
 
@@ -12719,7 +12672,7 @@
 
 fi
 
-
+glib_cv_has__inline=yes
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __inline" >&5
 $as_echo_n "checking for __inline... " >&6; }
 if test "${glib_cv_has__inline+set}" = set; then :
@@ -12759,6 +12712,7 @@
 xyes) $as_echo "#define G_HAVE___INLINE 1" >>confdefs.h
 
 esac
+glib_cv_has__inline=yes
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __inline__" >&5
 $as_echo_n "checking for __inline__... " >&6; }
 if test "${glib_cv_has__inline__+set}" = set; then :
@@ -12766,10 +12720,6 @@
 else
 
         if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -12798,6 +12748,7 @@
 xyes) $as_echo "#define G_HAVE___INLINE__ 1" >>confdefs.h
 
 esac
+glib_cv_hasinline=yes
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
 if test "${glib_cv_hasinline+set}" = set; then :
@@ -13493,6 +13444,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_working_wctype" >&5
 $as_echo "$glib_working_wctype" >&6; }
 
+glib_cv_sane_realloc=yes
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether realloc (NULL,) will work" >&5
 $as_echo_n "checking whether realloc (NULL,) will work... " >&6; }
 if test "${glib_cv_sane_realloc+set}" = set; then :
@@ -13534,7 +13486,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_cv_sane_realloc" >&5
 $as_echo "$glib_cv_sane_realloc" >&6; }
 
-
+glib_cv_va_copy=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an implementation of va_copy()" >&5
 $as_echo_n "checking for an implementation of va_copy()... " >&6; }
 if test "${glib_cv_va_copy+set}" = set; then :
@@ -13587,10 +13539,6 @@
 else
 
 	if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13625,6 +13573,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glib_cv___va_copy" >&5
 $as_echo "$glib_cv___va_copy" >&6; }
+glib_cv_va_val_copy=yes
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether va_lists can be copied by value" >&5
 $as_echo_n "checking whether va_lists can be copied by value... " >&6; }
 if test "${glib_cv_va_val_copy+set}" = set; then :
@@ -13893,6 +13842,7 @@
 	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTLD_GLOBAL brokenness" >&5
 $as_echo_n "checking for RTLD_GLOBAL brokenness... " >&6; }
+glib_cv_rtldglobal_broken=no
 if test "${glib_cv_rtldglobal_broken+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -13942,6 +13892,7 @@
         else
                 G_MODULE_BROKEN_RTLD_GLOBAL=0
         fi
+  glib_cv_uscore=yes
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for preceeding underscore in symbols" >&5
 $as_echo_n "checking for preceeding underscore in symbols... " >&6; }
 	if test "${glib_cv_uscore+set}" = set; then :
@@ -14626,6 +14577,7 @@
 
 	if test "$ac_cv_header_pwd_h" = "yes"; then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpwuid_r" >&5
+ac_cv_func_getpwuid_r=yes
 $as_echo_n "checking for getpwuid_r... " >&6; }
 	 	if test "${ac_cv_func_getpwuid_r+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -14727,11 +14679,7 @@
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_mutex_trylock is posix like" >&5
 $as_echo_n "checking whether pthread_mutex_trylock is posix like... " >&6; }
 		# DCE Threads return 1 as success, posix 0. what a mess.
-		if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+		if test "$cross_compiling" = Xyes; then :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -14756,11 +14704,7 @@
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_cond_timedwait is posix like" >&5
 $as_echo_n "checking whether pthread_cond_timedwait is posix like... " >&6; }
 		# DCE Threads return -1 as failure, posix ETIMEDOUT.
-		if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+		if test "$cross_compiling" = Xyes; then :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -14821,14 +14765,11 @@
         "yes")
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of $mutex_default_type" >&5
 $as_echo_n "checking size of $mutex_default_type... " >&6; }
+glib_cv_sizeof_gmutex=0
 if test "${glib_cv_sizeof_gmutex+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+  if test "$cross_compiling" = Xyes; then :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -14941,11 +14882,7 @@
 	echo "#endif" >>confrun.c
 done
 echo "return 0; }" >>confrun.c
-if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+if test "$cross_compiling" = Xyes; then :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */