$NetBSD: patch-ca,v 1.4 2010/09/23 07:07:47 adam Exp $

--- glib-1.2.10/configure.orig	2010-09-23 06:52:13.000000000 +0000
+++ glib-1.2.10/configure
@@ -12186,61 +12186,6 @@ if test "x$GCC" = "xyes"; then
   fi
 fi
 
-{ $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
-
-LIBS=$glib_save_LIBS
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra flags for POSIX compliance" >&5
 $as_echo_n "checking for extra flags for POSIX compliance... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12726,30 +12671,18 @@ if test "${glib_cv_has__inline+set}" = s
   $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; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	__inline int foo () { return 0; }
 	int main () { return foo (); }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
   glib_cv_has__inline=yes
-
-else
-  glib_cv_has__inline=no
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+	glib_cv_has__inline=no
 fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@ -12765,30 +12698,18 @@ if test "${glib_cv_has__inline__+set}" =
   $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; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	__inline__ int foo () { return 0; }
 	int main () { return foo (); }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
   glib_cv_has__inline__=yes
-
-else
-  glib_cv_has__inline__=no
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+	glib_cv_has__inline__=no
 fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@ -12804,30 +12725,18 @@ if test "${glib_cv_hasinline+set}" = set
   $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; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	inline int foo () { return 0; }
 	int main () { return foo (); }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  glib_cv_hasinline=yes
-
-else
-  glib_cv_hasinline=no
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+if ac_fn_c_try_compile "$LINENO"; then :
+  glib_cv_has_inline=yes
+	glib_cv_has_inline=no
 fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@ -13541,13 +13450,7 @@ if test "${glib_cv_va_copy+set}" = set; 
   $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; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	#include <stdarg.h>
@@ -13559,22 +13462,21 @@ else
 	  exit (1);
 	va_end (args1); va_end (args2);
 	}
-	int main() {
-	  f (0, 42);
-	  return 0;
-	}
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
   glib_cv_va_copy=yes
-
 else
   glib_cv_va_copy=no
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@ -13586,13 +13488,7 @@ if test "${glib_cv___va_copy+set}" = set
   $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; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	#include <stdarg.h>
@@ -13604,22 +13500,21 @@ else
 	  exit (1);
 	va_end (args1); va_end (args2);
 	}
-	int main() {
-	  f (0, 42);
-	  return 0;
-	}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  glib_cv___va_copy=yes
 
-else
-  glib_cv___va_copy=no
+int
+main ()
+{
 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  glib_cv_va___copy=yes
+else
+  glib_cv_va___copy=no
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@ -13631,13 +13526,7 @@ if test "${glib_cv_va_val_copy+set}" = s
   $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; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	#include <stdarg.h>
@@ -13649,22 +13538,21 @@ else
 	  exit (1);
 	va_end (args1); va_end (args2);
 	}
-	int main() {
-	  f (0, 42);
-	  return 0;
-	}
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
   glib_cv_va_val_copy=yes
-
 else
   glib_cv_va_val_copy=no
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@ -14910,6 +14798,15 @@ _ACEOF
 
 
 
+if test "$cross_compiling" = yes; then
+	{ echo "#define GLIB_SYSDEF_POLLIN =1"
+	echo "#define GLIB_SYSDEF_POLLPRI =2"
+	echo "#define GLIB_SYSDEF_POLLOUT =4"
+	echo "#define GLIB_SYSDEF_POLLERR =8"
+	echo "#define GLIB_SYSDEF_POLLHUP =16"
+	echo "#define GLIB_SYSDEF_POLLNVAL =32"
+	} > glibconfig-sysdefs.h
+else
 glib_sysdefso="glibconfig-sysdefs.h"
 glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ 	]*//g'`
 if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
@@ -14974,7 +14871,7 @@ fi
 
 rm -f confrun.c
 
-
+fi
 
 
 ac_config_commands="$ac_config_commands default-1"