From 8df304656c3482f01b8ea62cbbc1d8713ba22439 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 8 Sep 2005 01:51:36 +0000 Subject: [PATCH] fix shared library building --- package/libglib12/glib-1.2.10-gcc34-fix.patch | 41 + package/libglib12/libglib-libtool.patch.bz2 | Bin 0 -> 959 bytes package/libglib12/libglib12.mk | 11 +- package/libglib12/libglib_configure-patch.bz2 | Bin 8884 -> 0 bytes package/libglib12/libglib_configure.patch | 1800 +++++++++++++++++ package/libglib12/libglib_gcc3-patch | 25 - 6 files changed, 1847 insertions(+), 30 deletions(-) create mode 100644 package/libglib12/glib-1.2.10-gcc34-fix.patch create mode 100644 package/libglib12/libglib-libtool.patch.bz2 delete mode 100644 package/libglib12/libglib_configure-patch.bz2 create mode 100644 package/libglib12/libglib_configure.patch delete mode 100644 package/libglib12/libglib_gcc3-patch diff --git a/package/libglib12/glib-1.2.10-gcc34-fix.patch b/package/libglib12/glib-1.2.10-gcc34-fix.patch new file mode 100644 index 0000000000..1b896484d2 --- /dev/null +++ b/package/libglib12/glib-1.2.10-gcc34-fix.patch @@ -0,0 +1,41 @@ +--- glib-1.2.10/gstrfuncs.c.orig 2001-02-27 07:00:22.000000000 +0100 ++++ glib-1.2.10/gstrfuncs.c 2004-03-01 13:19:49.531603760 +0100 +@@ -867,7 +867,7 @@ + /* beware of positional parameters + */ + case '$': +- g_warning (G_GNUC_PRETTY_FUNCTION ++ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION, + "(): unable to handle positional parameters (%%n$)"); + len += 1024; /* try adding some safety padding */ + break; +@@ -1034,7 +1034,7 @@ + /* n . dddddddddddddddddddddddd E +- eeee */ + conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4; + if (spec.mod_extra_long) +- g_warning (G_GNUC_PRETTY_FUNCTION ++ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION, + "(): unable to handle long double, collecting double only"); + #ifdef HAVE_LONG_DOUBLE + #error need to implement special handling for long double +@@ -1077,7 +1077,7 @@ + conv_done = TRUE; + if (spec.mod_long) + { +- g_warning (G_GNUC_PRETTY_FUNCTION ++ g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION, + "(): unable to handle wide char strings"); + len += 1024; /* try adding some safety padding */ + } +@@ -1108,9 +1108,8 @@ + conv_len += format - spec_start; + break; + default: +- g_warning (G_GNUC_PRETTY_FUNCTION +- "(): unable to handle `%c' while parsing format", +- c); ++ g_warning ("%s(): unable to handle `%c' while parsing format", ++ G_GNUC_PRETTY_FUNCTION, c); + break; + } + conv_done |= conv_len > 0; diff --git a/package/libglib12/libglib-libtool.patch.bz2 b/package/libglib12/libglib-libtool.patch.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..9719c8de86be21efc0ab75a117d5095d6e0099f3 GIT binary patch literal 959 zcmV;w13>&jT4*^jL0KkKS$6(tj{pF|-+%xRUH||4e`j1T|Nr0aPy=sWjaHNuK!Hrv z7*oQJ)eIVqiVsr=G;JdUX|+8yG6RO1WMVLyU?G4_FpLuuA*M!#fM}UC5l50XiM0kz z27mwn000geX_1J+X@G_SG{P`UOoo{n8UZ3i1ksZ~0Zc?5pvmbTr=;|n4FkjytGTsb zsq^H`dD8_qwT9i0PnuyhGg%t@T0m|8U^8dv^r&qf&KB5*f<3pR;F+ipu<6;YxfyS`VZiN>}6G7 z(nzC+?EPWaoF~7BSo%qNoUA)}eO45=AOg|?Lx^jvTKlWwe1p2(k5FiLiBGguI+3RH z)4Mttvl&6$AD^@I&JcGc&)cb=Z6V_tLTf;H{5%W~ug})Q*h1II;PfvL??w>plnsX9 zdruKjssglelf1}gyw0^Cx;-!5n3t6pFCPMMu7ryNHttybNtUF$}1CxvH8Vjn40hc?Im%|B6Q37NaonUIv-ij-6Jjn!$>>Xk9 z$gj5BFjuMOYcXz3)3DdfnmOg88tuA7?S*=(qid-xTY1fK(GJM5R-oXS#2mv$6*6%W z2k?E9CIpW%DfdJfcj;nB{itp4pE@e3ErUh!IGju@0GZq8BH?jHVBJ(P^trlI4MRA@i9qFjNSoDxrz(bs*xx zP-%d~Q3Y8fjM+-Sz7T6#MahmH^fzS8@uRx6O#n};gX0|E47&`VgTIqL{pa8q0IXnP zikoevm8?QHMA>xcNfMi*gtRS|-PM}sawUDSE5_r8QlotE#g(pC%BW3i$=NebE8;0& zPQKj9WswUZxVHWI6lSW41NIQQtM}S4c&xQa1 literal 0 HcmV?d00001 diff --git a/package/libglib12/libglib12.mk b/package/libglib12/libglib12.mk index a4c56f614e..6de46d96e9 100644 --- a/package/libglib12/libglib12.mk +++ b/package/libglib12/libglib12.mk @@ -17,15 +17,16 @@ libglib12-source: $(DL_DIR)/$(LIBGLIB12_SOURCE) $(LIBGLIB12_DIR)/.unpacked: $(DL_DIR)/$(LIBGLIB12_SOURCE) $(LIBGLIB12_CAT) $(DL_DIR)/$(LIBGLIB12_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(LIBGLIB12_DIR) package/libglib12/ \*-patch\* + toolchain/patch-kernel.sh $(LIBGLIB12_DIR) package/libglib12/ \*.patch* + $(CONFIG_UPDATE) $(LIBGLIB12_DIR) touch $(LIBGLIB12_DIR)/.unpacked $(LIBGLIB12_DIR)/.configured: $(LIBGLIB12_DIR)/.unpacked (cd $(LIBGLIB12_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ + --host=$(REAL_GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ --prefix=/usr \ --exec-prefix=/usr \ --bindir=/usr/bin \ @@ -63,8 +64,8 @@ $(STAGING_DIR)/lib/$(LIBGLIB12_BINARY): $(LIBGLIB12_DIR)/.libs/$(LIBGLIB12_BINAR $(TARGET_DIR)/lib/$(LIBGLIB12_BINARY): $(STAGING_DIR)/lib/$(LIBGLIB12_BINARY) cp -a $(STAGING_DIR)/lib/$(LIBGLIB12_BINARY) $(TARGET_DIR)/lib/ - #cp -a $(STAGING_DIR)/lib/libglib.so $(TARGET_DIR)/lib/ - #cp -a $(STAGING_DIR)/lib/libglib-1.2.so.0 $(TARGET_DIR)/lib/ + cp -a $(STAGING_DIR)/lib/libglib.so $(TARGET_DIR)/lib/ + cp -a $(STAGING_DIR)/lib/libglib-1.2.so.0 $(TARGET_DIR)/lib/ $(STRIP) --strip-unneeded $(TARGET_DIR)/lib/$(LIBGLIB12_BINARY) libglib12: uclibc $(TARGET_DIR)/lib/$(LIBGLIB12_BINARY) diff --git a/package/libglib12/libglib_configure-patch.bz2 b/package/libglib12/libglib_configure-patch.bz2 deleted file mode 100644 index 883a8009d497b04db84d2cf8352bbe94f4f1e244..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8884 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 C*zo!Q diff --git a/package/libglib12/libglib_configure.patch b/package/libglib12/libglib_configure.patch new file mode 100644 index 0000000000..632669a4ea --- /dev/null +++ b/package/libglib12/libglib_configure.patch @@ -0,0 +1,1800 @@ +diff -urN glib-1.2.10/acglib.m4 glib-1.2.10-1/acglib.m4 +--- glib-1.2.10/acglib.m4 1999-01-04 16:37:40.000000000 -0700 ++++ glib-1.2.10-1/acglib.m4 2002-03-13 21:38:32.000000000 -0700 +@@ -122,6 +122,18 @@ + fi + echo "#define GLIB_SYSDEF_$glib_sysdef$glib_default" >>$glib_sysdefso + done +- AC_MSG_RESULT(failed)]) ++ AC_MSG_RESULT(failed)], ++[ for glib_sysdef_input in $2 ; do ++ glib_sysdef=`echo $glib_sysdef_input | sed 's/^\([[^:]]*\):.*$/\1/'` ++ glib_default=`echo $glib_sysdef_input | sed 's/^[[^:]]*:\(.*\)$/\1/'` ++ if test $glib_sysdef != $glib_default; then ++ glib_default=" $4$glib_default" ++ else ++ glib_default= ++ fi ++ echo "#define GLIB_SYSDEF_$glib_sysdef$glib_default" >>$glib_sysdefso ++ done ++ AC_MSG_WARN(cannot check it if cross compiling -- using defaults)] ++) + rm -f confrun.c + ]) +diff -urN glib-1.2.10/configure glib-1.2.10-1/configure +--- glib-1.2.10/configure 2001-03-15 08:44:01.000000000 -0700 ++++ glib-1.2.10-1/configure 2002-03-13 21:38:32.000000000 -0700 +@@ -2099,15 +2099,16 @@ + glib_save_LIBS=$LIBS + LIBS="$LIBS -lm" + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ echo "configure: warning: cannot check it if cross compiling -- defaulting to none needed" 1>&2 ++ + else + cat > conftest.$ac_ext < + int main (void) { return (log(1) != log(1.)); } + EOF +-if { (eval echo configure:2111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:2112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + echo "$ac_t""none needed" 1>&6 + else +@@ -2117,15 +2118,16 @@ + glib_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -std1" + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ echo "configure: warning: suppress autoconf warning message" 1>&2 ++ + else + cat > conftest.$ac_ext < + int main (void) { return (log(1) != log(1.)); } + EOF +-if { (eval echo configure:2129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:2131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + echo "$ac_t""-std1" 1>&6 + else +@@ -2135,12 +2137,10 @@ + echo "$ac_t""" 1>&6 + CFLAGS=$glib_save_CFLAGS + echo "configure: warning: No ANSI prototypes found in library. (-std1 didn't work.)" 1>&2 +- + fi + rm -fr conftest* + fi + +- + fi + rm -fr conftest* + fi +@@ -2544,7 +2544,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ ac_cv_sizeof_char=1 + else + cat > conftest.$ac_ext <&6 + else + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ ac_cv_sizeof_short=2 + else + cat > conftest.$ac_ext <&6 + else + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ ac_cv_sizeof_long=4 + else + cat > conftest.$ac_ext <&6 + else + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ ac_cv_sizeof_int=4 + else + cat > conftest.$ac_ext <&6 + else + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ ac_cv_sizeof_void_p=4 + else + cat > conftest.$ac_ext <&6 + else + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ ac_cv_sizeof_long_long=8 + else + cat > conftest.$ac_ext <&6 + else + +- if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } +-else +- cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then ++if { (eval echo configure:2870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* + glib_cv_has__inline=yes + + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +- rm -fr conftest* ++ rm -rf conftest* + glib_cv_has__inline=no +- +-fi +-rm -fr conftest* ++ + fi +- ++rm -f conftest* + + fi + +@@ -2891,36 +2889,34 @@ + + esac + echo $ac_n "checking for __inline__""... $ac_c" 1>&6 +-echo "configure:2895: checking for __inline__" >&5 ++echo "configure:2893: checking for __inline__" >&5 + if eval "test \"`echo '$''{'glib_cv_has__inline__'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + +- if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } +-else +- cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then ++if { (eval echo configure:2909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* + glib_cv_has__inline__=yes + + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +- rm -fr conftest* ++ rm -rf conftest* + glib_cv_has__inline__=no + + fi +-rm -fr conftest* +-fi +- ++rm -f conftest* + + fi + +@@ -2932,36 +2928,34 @@ + + esac + echo $ac_n "checking for inline""... $ac_c" 1>&6 +-echo "configure:2936: checking for inline" >&5 ++echo "configure:2932: checking for inline" >&5 + if eval "test \"`echo '$''{'glib_cv_hasinline'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + +- if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } +-else +- cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then ++if { (eval echo configure:2948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* + glib_cv_hasinline=yes + + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +- rm -fr conftest* ++ rm -rf conftest* + glib_cv_hasinline=no + + fi +-rm -fr conftest* +-fi +- ++rm -f conftest* + + fi + +@@ -2973,112 +2967,22 @@ + + esac + +-echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 +-echo "configure:2978: checking whether byte ordering is bigendian" >&5 +-if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_cv_c_bigendian=unknown +-# See if sys/param.h defines the BYTE_ORDER macro. +-cat > conftest.$ac_ext < +-#include +-int main() { +- +-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN +- bogus endian macros +-#endif +-; return 0; } +-EOF +-if { (eval echo configure:2996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- # It does; now see whether it defined to BIG_ENDIAN or not. +-cat > conftest.$ac_ext < +-#include +-int main() { +- +-#if BYTE_ORDER != BIG_ENDIAN +- not big endian +-#endif +-; return 0; } +-EOF +-if { (eval echo configure:3011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_c_bigendian=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_c_bigendian=no +-fi +-rm -f conftest* +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-if test $ac_cv_c_bigendian = unknown; then +-if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } +-else +- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- ac_cv_c_bigendian=no +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_cv_c_bigendian=yes +-fi +-rm -fr conftest* +-fi +- +-fi +-fi +- +-echo "$ac_t""$ac_cv_c_bigendian" 1>&6 +-if test $ac_cv_c_bigendian = yes; then +- cat >> confdefs.h <<\EOF +-#define WORDS_BIGENDIAN 1 +-EOF +- +-fi +- + + for ac_hdr in float.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3072: checking for $ac_hdr" >&5 ++echo "configure:2976: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3111,17 +3015,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3115: checking for $ac_hdr" >&5 ++echo "configure:3019: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3154,17 +3058,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3158: checking for $ac_hdr" >&5 ++echo "configure:3062: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3197,17 +3101,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3201: checking for $ac_hdr" >&5 ++echo "configure:3105: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3240,17 +3144,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3244: checking for $ac_hdr" >&5 ++echo "configure:3148: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3283,17 +3187,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3287: checking for $ac_hdr" >&5 ++echo "configure:3191: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3326,17 +3230,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3330: checking for $ac_hdr" >&5 ++echo "configure:3234: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3369,17 +3273,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3373: checking for $ac_hdr" >&5 ++echo "configure:3277: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3412,17 +3316,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3416: checking for $ac_hdr" >&5 ++echo "configure:3320: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3455,17 +3359,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:3459: checking for $ac_hdr" >&5 ++echo "configure:3363: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3499,12 +3403,12 @@ + for ac_func in lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:3503: checking for $ac_func" >&5 ++echo "configure:3407: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -3554,9 +3458,9 @@ + + # Check for sys_errlist + echo $ac_n "checking for sys_errlist""... $ac_c" 1>&6 +-echo "configure:3558: checking for sys_errlist" >&5 ++echo "configure:3462: checking for sys_errlist" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + glib_ok=yes + else +@@ -3587,9 +3491,9 @@ + + # Check for sys_siglist + echo $ac_n "checking for sys_siglist""... $ac_c" 1>&6 +-echo "configure:3591: checking for sys_siglist" >&5 ++echo "configure:3495: checking for sys_siglist" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + glib_ok=yes + else +@@ -3619,9 +3523,9 @@ + + # Check for sys_siglist decl (see Tue Jan 19 00:44:24 1999 in changelog) + echo $ac_n "checking for sys_siglist declaration""... $ac_c" 1>&6 +-echo "configure:3623: checking for sys_siglist declaration" >&5 ++echo "configure:3527: checking for sys_siglist declaration" >&5 + cat > conftest.$ac_ext < + int main() { +@@ -3630,7 +3534,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:3634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + glib_ok=yes + else +@@ -3650,16 +3554,16 @@ + + # Check if needs to be included for fd_set + echo $ac_n "checking for fd_set""... $ac_c" 1>&6 +-echo "configure:3654: checking for fd_set" >&5 ++echo "configure:3558: checking for fd_set" >&5 + cat > conftest.$ac_ext < + int main() { + fd_set readMask, writeMask; + ; return 0; } + EOF +-if { (eval echo configure:3663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + gtk_ok=yes + else +@@ -3673,7 +3577,7 @@ + echo "$ac_t""yes, found in sys/types.h" 1>&6 + else + cat > conftest.$ac_ext < + EOF +@@ -3707,14 +3611,14 @@ + # Check for wchar.h + + echo $ac_n "checking for wchar.h""... $ac_c" 1>&6 +-echo "configure:3711: checking for wchar.h" >&5 ++echo "configure:3615: checking for wchar.h" >&5 + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3738,14 +3642,14 @@ + # Check for wctype.h (for iswalnum) + + echo $ac_n "checking for wctype.h""... $ac_c" 1>&6 +-echo "configure:3742: checking for wctype.h" >&5 ++echo "configure:3646: checking for wctype.h" >&5 + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3769,12 +3673,12 @@ + oLIBS="$LIBS" + # in Solaris 2.5, `iswalnum' is in -lw + echo $ac_n "checking for iswalnum""... $ac_c" 1>&6 +-echo "configure:3773: checking for iswalnum" >&5 ++echo "configure:3677: checking for iswalnum" >&5 + if eval "test \"`echo '$''{'ac_cv_func_iswalnum'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_iswalnum=yes" + else +@@ -3815,7 +3719,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for iswalnum in -lw""... $ac_c" 1>&6 +-echo "configure:3819: checking for iswalnum in -lw" >&5 ++echo "configure:3723: checking for iswalnum in -lw" >&5 + ac_lib_var=`echo w'_'iswalnum | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -3823,7 +3727,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lw $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -3866,9 +3770,9 @@ + + # The following is necessary for Linux libc-5.4.38 + echo $ac_n "checking if iswalnum() and friends are properly defined""... $ac_c" 1>&6 +-echo "configure:3870: checking if iswalnum() and friends are properly defined" >&5 ++echo "configure:3774: checking if iswalnum() and friends are properly defined" >&5 + cat > conftest.$ac_ext < + int main() { +@@ -3888,7 +3792,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:3892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + glib_working_wctype=yes + else +@@ -3909,16 +3813,22 @@ + echo "$ac_t""$glib_working_wctype" 1>&6 + + echo $ac_n "checking whether realloc (NULL,) will work""... $ac_c" 1>&6 +-echo "configure:3913: checking whether realloc (NULL,) will work" >&5 ++echo "configure:3817: checking whether realloc (NULL,) will work" >&5 + if eval "test \"`echo '$''{'glib_cv_sane_realloc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ echo "configure: warning: cannot check it if cross compiling -- defaulting to yes" 1>&2 ++ glib_cv_sane_realloc=yes ++ cat >> confdefs.h <<\EOF ++#define REALLOC_0_WORKS 1 ++EOF ++ ++ + else + cat > conftest.$ac_ext < +@@ -3926,7 +3836,7 @@ + return realloc (0, sizeof (int)) == 0; + } + EOF +-if { (eval echo configure:3930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + glib_cv_sane_realloc=yes + cat >> confdefs.h <<\EOF +@@ -3951,16 +3861,18 @@ + + + echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 +-echo "configure:3955: checking for an implementation of va_copy()" >&5 ++echo "configure:3865: checking for an implementation of va_copy()" >&5 + if eval "test \"`echo '$''{'glib_cv_va_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ echo "configure: warning: cannot check it if cross compiling -- defaulting to no" 1>&2 ++ glib_cv_va_copy=no ++ + else + cat > conftest.$ac_ext < +@@ -3977,7 +3889,7 @@ + return 0; + } + EOF +-if { (eval echo configure:3981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + glib_cv_va_copy=yes + +@@ -3996,16 +3908,18 @@ + + echo "$ac_t""$glib_cv_va_copy" 1>&6 + echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 +-echo "configure:4000: checking for an implementation of __va_copy()" >&5 ++echo "configure:3912: checking for an implementation of __va_copy()" >&5 + if eval "test \"`echo '$''{'glib_cv___va_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ echo "configure: warning: cannot check it if cross compiling -- defaulting to yes" 1>&2 ++ glib_cv___va_copy=yes ++ + else + cat > conftest.$ac_ext < +@@ -4022,7 +3936,7 @@ + return 0; + } + EOF +-if { (eval echo configure:4026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + glib_cv___va_copy=yes + +@@ -4041,16 +3955,18 @@ + + echo "$ac_t""$glib_cv___va_copy" 1>&6 + echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 +-echo "configure:4045: checking whether va_lists can be copied by value" >&5 ++echo "configure:3959: checking whether va_lists can be copied by value" >&5 + if eval "test \"`echo '$''{'glib_cv_va_val_copy'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ echo "configure: warning: cannot check it if cross compiling -- defaulting to yes" 1>&2 ++ glib_cv_va_val_copy=yes ++ + else + cat > conftest.$ac_ext < +@@ -4067,7 +3983,7 @@ + return 0; + } + EOF +-if { (eval echo configure:4071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + glib_cv_va_val_copy=yes + +@@ -4112,12 +4028,12 @@ + G_MODULE_HAVE_DLERROR=0 + if test -z "$G_MODULE_IMPL"; then + echo $ac_n "checking for dlopen""... $ac_c" 1>&6 +-echo "configure:4116: checking for dlopen" >&5 ++echo "configure:4032: checking for dlopen" >&5 + if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_dlopen=yes" + else +@@ -4155,12 +4071,12 @@ + if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for dlsym""... $ac_c" 1>&6 +-echo "configure:4159: checking for dlsym" >&5 ++echo "configure:4075: checking for dlsym" >&5 + if eval "test \"`echo '$''{'ac_cv_func_dlsym'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_dlsym=yes" + else +@@ -4211,7 +4127,7 @@ + fi + if test -z "$G_MODULE_IMPL"; then + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "configure:4215: checking for dlopen in -ldl" >&5 ++echo "configure:4131: checking for dlopen in -ldl" >&5 + ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4219,7 +4135,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4246,7 +4162,7 @@ + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6 +-echo "configure:4250: checking for dlsym in -ldl" >&5 ++echo "configure:4166: checking for dlsym in -ldl" >&5 + ac_lib_var=`echo dl'_'dlsym | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4254,7 +4170,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4295,18 +4211,18 @@ + fi + if test -z "$G_MODULE_IMPL"; then + echo $ac_n "checking how to export all symbols""... $ac_c" 1>&6 +-echo "configure:4299: checking how to export all symbols" >&5 ++echo "configure:4215: checking how to export all symbols" >&5 + SAVED_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -Wl,-E" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + G_MODULE_LDFLAGS="-Wl,-E" + else +@@ -4316,14 +4232,14 @@ + + LDFLAGS="$SAVED_LDFLAGS -bexpall" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + G_MODULE_LDFLAGS="-bexpall" + else +@@ -4343,7 +4259,7 @@ + G_MODULE_LDFLAGS= + fi + echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 +-echo "configure:4347: checking for shl_load in -ldld" >&5 ++echo "configure:4263: checking for shl_load in -ldld" >&5 + ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4351,7 +4267,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldld $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4396,16 +4312,17 @@ + LIBS="$LIBS $G_MODULE_LIBS" + LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" + echo $ac_n "checking for RTLD_GLOBAL brokenness""... $ac_c" 1>&6 +-echo "configure:4400: checking for RTLD_GLOBAL brokenness" >&5 ++echo "configure:4316: checking for RTLD_GLOBAL brokenness" >&5 + if eval "test \"`echo '$''{'glib_cv_rtldglobal_broken'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ echo "configure: warning: cannot check it if cross compiling -- defaulting to no" 1>&2 ++ glib_cv_rtldglobal_broken=no + else + cat > conftest.$ac_ext < +@@ -4425,7 +4342,7 @@ + return global == local; + } + EOF +-if { (eval echo configure:4429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:4346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + glib_cv_rtldglobal_broken=no + else +@@ -4448,16 +4365,18 @@ + G_MODULE_BROKEN_RTLD_GLOBAL=0 + fi + echo $ac_n "checking for preceeding underscore in symbols""... $ac_c" 1>&6 +-echo "configure:4452: checking for preceeding underscore in symbols" >&5 ++echo "configure:4369: checking for preceeding underscore in symbols" >&5 + if eval "test \"`echo '$''{'glib_cv_uscore'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ echo "configure: warning: cannot check it if cross compiling -- defaulting to no" 1>&2 ++ glib_cv_uscore=no ++ + else + cat > conftest.$ac_ext < +@@ -4471,7 +4390,7 @@ + } return (!f2 || f1); + } + EOF +-if { (eval echo configure:4475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:4394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + glib_cv_uscore=yes + else +@@ -4496,12 +4415,12 @@ + + LDFLAGS="$LDFLAGS_orig" + echo $ac_n "checking for dlerror""... $ac_c" 1>&6 +-echo "configure:4500: checking for dlerror" >&5 ++echo "configure:4419: checking for dlerror" >&5 + if eval "test \"`echo '$''{'ac_cv_func_dlerror'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_dlerror=yes" + else +@@ -4608,7 +4527,7 @@ + case $host in + *-*-solaris*) + echo $ac_n "checking for cond_init in -lthread""... $ac_c" 1>&6 +-echo "configure:4612: checking for cond_init in -lthread" >&5 ++echo "configure:4531: checking for cond_init in -lthread" >&5 + ac_lib_var=`echo thread'_'cond_init | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4616,7 +4535,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lthread $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4654,17 +4573,17 @@ + if test "x$have_threads" = xnone; then + ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for pthread.h""... $ac_c" 1>&6 +-echo "configure:4658: checking for pthread.h" >&5 ++echo "configure:4577: checking for pthread.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:4668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -4690,7 +4609,7 @@ + if test "x$want_threads" = xyes || test "x$want_threads" = xnspr; then + if test "x$have_threads" = xnone; then + echo $ac_n "checking for PRP_NewNakedCondVar in -lnspr21""... $ac_c" 1>&6 +-echo "configure:4694: checking for PRP_NewNakedCondVar in -lnspr21" >&5 ++echo "configure:4613: checking for PRP_NewNakedCondVar in -lnspr21" >&5 + ac_lib_var=`echo nspr21'_'PRP_NewNakedCondVar | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4698,7 +4617,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lnspr21 $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4733,7 +4652,7 @@ + fi + + echo $ac_n "checking for thread implementation""... $ac_c" 1>&6 +-echo "configure:4737: checking for thread implementation" >&5 ++echo "configure:4656: checking for thread implementation" >&5 + + if test "x$have_threads" = xnone && test "x$want_threads" != xno; then + echo "$ac_t""none available" 1>&6 +@@ -4752,7 +4671,7 @@ + posix) + G_THREAD_LIBS=error + echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 +-echo "configure:4756: checking for pthread_attr_init in -lpthread" >&5 ++echo "configure:4675: checking for pthread_attr_init in -lpthread" >&5 + ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4760,7 +4679,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lpthread $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4793,7 +4712,7 @@ + + if test "x$G_THREAD_LIBS" = xerror; then + echo $ac_n "checking for pthread_attr_init in -lpthreads""... $ac_c" 1>&6 +-echo "configure:4797: checking for pthread_attr_init in -lpthreads" >&5 ++echo "configure:4716: checking for pthread_attr_init in -lpthreads" >&5 + ac_lib_var=`echo pthreads'_'pthread_attr_init | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4801,7 +4720,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lpthreads $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4835,7 +4754,7 @@ + fi + if test "x$G_THREAD_LIBS" = xerror; then + echo $ac_n "checking for pthread_attr_init in -lthread""... $ac_c" 1>&6 +-echo "configure:4839: checking for pthread_attr_init in -lthread" >&5 ++echo "configure:4758: checking for pthread_attr_init in -lthread" >&5 + ac_lib_var=`echo thread'_'pthread_attr_init | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4843,7 +4762,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lthread $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4877,7 +4796,7 @@ + fi + if test "x$G_THREAD_LIBS" = xerror; then + echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6 +-echo "configure:4881: checking for pthread_attr_init in -lc_r" >&5 ++echo "configure:4800: checking for pthread_attr_init in -lc_r" >&5 + ac_lib_var=`echo c_r'_'pthread_attr_init | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4885,7 +4804,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lc_r $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4919,12 +4838,12 @@ + fi + if test "x$G_THREAD_LIBS" = xerror; then + echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6 +-echo "configure:4923: checking for pthread_attr_init" >&5 ++echo "configure:4842: checking for pthread_attr_init" >&5 + if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_init'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_pthread_attr_init=yes" + else +@@ -4969,7 +4888,7 @@ + fi + if test "x$G_THREAD_LIBS" = xerror; then + echo $ac_n "checking for __d10_pthread_attr_init in -lthread""... $ac_c" 1>&6 +-echo "configure:4973: checking for __d10_pthread_attr_init in -lthread" >&5 ++echo "configure:4892: checking for __d10_pthread_attr_init in -lthread" >&5 + ac_lib_var=`echo thread'_'__d10_pthread_attr_init | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4977,7 +4896,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lthread $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5012,7 +4931,7 @@ + fi + if test "x$G_THREAD_LIBS" = xerror; then + echo $ac_n "checking for __pthread_attr_init_system in -lpthread""... $ac_c" 1>&6 +-echo "configure:5016: checking for __pthread_attr_init_system in -lpthread" >&5 ++echo "configure:4935: checking for __pthread_attr_init_system in -lpthread" >&5 + ac_lib_var=`echo pthread'_'__pthread_attr_init_system | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5020,7 +4939,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lpthread $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5061,7 +4980,7 @@ + solaris) + G_THREAD_LIBS=error + echo $ac_n "checking for cond_init in -lthread""... $ac_c" 1>&6 +-echo "configure:5065: checking for cond_init in -lthread" >&5 ++echo "configure:4984: checking for cond_init in -lthread" >&5 + ac_lib_var=`echo thread'_'cond_init | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5069,7 +4988,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lthread $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5108,7 +5027,7 @@ + ;; + nspr) + echo $ac_n "checking for PRP_NewNakedCondVar in -lnspr21""... $ac_c" 1>&6 +-echo "configure:5112: checking for PRP_NewNakedCondVar in -lnspr21" >&5 ++echo "configure:5031: checking for PRP_NewNakedCondVar in -lnspr21" >&5 + ac_lib_var=`echo nspr21'_'PRP_NewNakedCondVar | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5116,7 +5035,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lnspr21 $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5163,7 +5082,7 @@ + fi + + echo $ac_n "checking necessary linker options""... $ac_c" 1>&6 +-echo "configure:5167: checking necessary linker options" >&5 ++echo "configure:5086: checking necessary linker options" >&5 + echo "$ac_t""$G_THREAD_LIBS" 1>&6 + + +@@ -5191,7 +5110,7 @@ + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS" + cat > conftest.$ac_ext < + EOF +@@ -5208,7 +5127,7 @@ + CPPFLAGS=$old_CPPFLAGS + + echo $ac_n "checking necessary compiler options""... $ac_c" 1>&6 +-echo "configure:5212: checking necessary compiler options" >&5 ++echo "configure:5131: checking necessary compiler options" >&5 + + echo "$ac_t""$G_THREAD_CFLAGS" 1>&6 + else +@@ -5226,12 +5145,12 @@ + for ac_func in localtime_r rand_r + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:5230: checking for $ac_func" >&5 ++echo "configure:5149: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -5280,15 +5199,17 @@ + + if test "$ac_cv_header_pwd_h" = "yes"; then + echo $ac_n "checking for getpwuid_r""... $ac_c" 1>&6 +-echo "configure:5284: checking for getpwuid_r" >&5 ++echo "configure:5203: checking for getpwuid_r" >&5 + if eval "test \"`echo '$''{'ac_cv_func_getpwuid_r'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ echo "configure: warning: cannot check it if cross compiling -- defaulting to yes" 1>&2 ++ ac_cv_func_getpwuid_r=yes ++ + else + cat > conftest.$ac_ext < + int main () { char buffer[10000], *pointer; +@@ -5300,7 +5221,7 @@ + sizeof (buffer), &pointer); + return errno == ENOSYS || error == ENOSYS;} + EOF +-if { (eval echo configure:5304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:5225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_func_getpwuid_r=yes + else +@@ -5312,6 +5233,7 @@ + rm -fr conftest* + fi + ++ + fi + + if test "$ac_cv_func_getpwuid_r" = yes; then +@@ -5325,11 +5247,11 @@ + fi + if test "$ac_cv_func_getpwuid_r" = "yes"; then + echo $ac_n "checking whether getpwuid_r is posix like""... $ac_c" 1>&6 +-echo "configure:5329: checking whether getpwuid_r is posix like" >&5 ++echo "configure:5251: checking whether getpwuid_r is posix like" >&5 + # The signature for the POSIX version is: + # int getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **) + cat > conftest.$ac_ext < + #include +@@ -5338,7 +5260,7 @@ + getpwuid_r((uid_t)0, NULL, NULL, (size_t)0, NULL); + ; return 0; } + EOF +-if { (eval echo configure:5342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cat >> confdefs.h <<\EOF + #define HAVE_GETPWUID_R_POSIX 1 +@@ -5357,17 +5279,17 @@ + if test x"$have_threads" = xposix; then + LIBS="$LIBS $G_THREAD_LIBS" + echo $ac_n "checking whether pthread_getspecific is posix like""... $ac_c" 1>&6 +-echo "configure:5361: checking whether pthread_getspecific is posix like" >&5 ++echo "configure:5283: checking whether pthread_getspecific is posix like" >&5 + # PCThreads has pthread_getspecific(pthread_key_t, void **); + cat > conftest.$ac_ext < + int main() { + pthread_getspecific(0,NULL); + ; return 0; } + EOF +-if { (eval echo configure:5371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""no" 1>&6 + else +@@ -5382,20 +5304,25 @@ + fi + rm -f conftest* + echo $ac_n "checking whether pthread_mutex_trylock is posix like""... $ac_c" 1>&6 +-echo "configure:5386: checking whether pthread_mutex_trylock is posix like" >&5 ++echo "configure:5308: checking whether pthread_mutex_trylock is posix like" >&5 + # DCE Threads return 1 as success, posix 0. what a mess. + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ echo "configure: warning: cannot check it if cross compiling -- defaulting to yes" 1>&2 ++ cat >> confdefs.h <<\EOF ++#define HAVE_PTHREAD_MUTEX_TRYLOCK_POSIX 1 ++EOF ++ ++ + else + cat > conftest.$ac_ext < + pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; + int main () { + return !pthread_mutex_trylock (&mutex); } + EOF +-if { (eval echo configure:5399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:5326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + echo "$ac_t""no" 1>&6 + else +@@ -5412,13 +5339,18 @@ + fi + + echo $ac_n "checking whether pthread_cond_timedwait is posix like""... $ac_c" 1>&6 +-echo "configure:5416: checking whether pthread_cond_timedwait is posix like" >&5 ++echo "configure:5343: checking whether pthread_cond_timedwait is posix like" >&5 + # DCE Threads return -1 as failure, posix ETIMEDOUT. + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ echo "configure: warning: cannot check it if cross compiling -- defaulting to yes" 1>&2 ++ cat >> confdefs.h <<\EOF ++#define HAVE_PTHREAD_COND_TIMEDWAIT_POSIX 1 ++EOF ++ ++ + else + cat > conftest.$ac_ext < + int main () { +@@ -5432,7 +5364,7 @@ + return pthread_cond_timedwait (&cond,&mutex,&tspec) + != -1;} + EOF +-if { (eval echo configure:5436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:5368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + echo "$ac_t""no" 1>&6 + else +@@ -5475,15 +5407,16 @@ + case "$mutex_has_default" in + "yes") + echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6 +-echo "configure:5479: checking size of $mutex_default_type" >&5 ++echo "configure:5411: checking size of $mutex_default_type" >&5 + if eval "test \"`echo '$''{'glib_cv_sizeof_gmutex'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ glib_cv_sizeof_gmutex=24 ++ + else + cat > conftest.$ac_ext < + #include <$mutex_header_file> +@@ -5495,7 +5428,7 @@ + exit(0); + } + EOF +-if { (eval echo configure:5499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:5432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + glib_cv_sizeof_gmutex=`cat conftestval` + else +@@ -5515,7 +5448,7 @@ + + + echo $ac_n "checking byte contents of $mutex_default_type""... $ac_c" 1>&6 +-echo "configure:5519: checking byte contents of $mutex_default_type" >&5 ++echo "configure:5452: checking byte contents of $mutex_default_type" >&5 + if eval "test \"`echo '$''{'glib_cv_byte_contents_gmutex'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5523,7 +5456,7 @@ + glib_cv_byte_contents_gmutex=0 + else + cat > conftest.$ac_ext < + #include <$mutex_header_file> +@@ -5540,7 +5473,7 @@ + exit(0); + } + EOF +-if { (eval echo configure:5544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:5477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + glib_cv_byte_contents_gmutex=`cat conftestval` + else +@@ -5576,7 +5509,7 @@ + glib_nl='\n' + fi + echo $ac_n "checking system definitions for $glib_sysdef_msg""... $ac_c" 1>&6 +-echo "configure:5580: checking system definitions for $glib_sysdef_msg" >&5 ++echo "configure:5513: checking system definitions for $glib_sysdef_msg" >&5 + cat >confrun.c <<_______EOF + #include + #include +@@ -5600,14 +5533,25 @@ + done + echo "return 0; }" >>confrun.c + if test "$cross_compiling" = yes; then +- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ for glib_sysdef_input in POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 ; do ++ glib_sysdef=`echo $glib_sysdef_input | sed 's/^\([^:]*\):.*$/\1/'` ++ glib_default=`echo $glib_sysdef_input | sed 's/^[^:]*:\(.*\)$/\1/'` ++ if test $glib_sysdef != $glib_default; then ++ glib_default=" =$glib_default" ++ else ++ glib_default= ++ fi ++ echo "#define GLIB_SYSDEF_$glib_sysdef$glib_default" >>$glib_sysdefso ++ done ++ echo "configure: warning: cannot check it if cross compiling -- using defaults" 1>&2 ++ + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:5555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + echo "$ac_t""done" 1>&6 + else diff --git a/package/libglib12/libglib_gcc3-patch b/package/libglib12/libglib_gcc3-patch deleted file mode 100644 index 3a2b44d81e..0000000000 --- a/package/libglib12/libglib_gcc3-patch +++ /dev/null @@ -1,25 +0,0 @@ ---- glib-1.2.10/glib.orig.h 2004-10-14 01:11:45.000000000 -0600 -+++ glib-1.2.10/glib.h 2004-10-14 01:12:02.000000000 -0600 -@@ -271,14 +271,15 @@ - - /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with - * macros, so we can refer to them as strings unconditionally. -+ * usage not-recommended since gcc-3.0 - */ --#ifdef __GNUC__ --#define G_GNUC_FUNCTION __FUNCTION__ --#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ --#else /* !__GNUC__ */ --#define G_GNUC_FUNCTION "" --#define G_GNUC_PRETTY_FUNCTION "" --#endif /* !__GNUC__ */ -+#if defined (__GNUC__) && (__GNUC__ < 3) -+#define G_GNUC_FUNCTION __FUNCTION__ -+#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ -+#else /* !__GNUC__ */ -+#define G_GNUC_FUNCTION "" -+#define G_GNUC_PRETTY_FUNCTION "" -+#endif /* !__GNUC__ */ - - /* we try to provide a usefull equivalent for ATEXIT if it is - * not defined, but use is actually abandoned. people should -- 2.30.2