Add some patch for gthread.

Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

5 files changed, 64 insertions, 1222 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index c9938f33c10b..87d9b6b93104 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,7 +3,7 @@
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.13 1999/01/20 18:30:57 vanilla Exp $
+# $Id: Makefile,v 1.14 1999/01/20 21:59:41 vanilla Exp $
 #
 
 DISTNAME=	glib-1.1.13
@@ -18,13 +18,6 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	INSTALL='$${INSTALL} -c'
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib11d
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} <= 300000
-CONFIGURE_ARGS+=	--with-threads=none
-.else
-CONFIGURE_ARGS+=	--with-threads=uthread
-.endif
 
 MAN1=		glib-config.1
 
@@ -34,4 +27,4 @@ post-install:
 	 fi
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/glib20/files/patch-ab b/devel/glib20/files/patch-ab
index 6d81325c0f4f..ce0e92a107d6 100644
--- a/devel/glib20/files/patch-ab
+++ b/devel/glib20/files/patch-ab
@@ -1,6 +1,6 @@
 --- Makefile.in.orig	Mon Jan 18 07:30:09 1999
-+++ Makefile.in	Thu Jan 21 04:27:54 1999
-@@ -89,14 +89,12 @@
++++ Makefile.in	Fri Jan 22 02:53:32 1999
+@@ -89,14 +89,14 @@
  RANLIB = @RANLIB@
  VERSION = @VERSION@
  
@@ -10,7 +10,8 @@
  #SUBDIRS = . gmodule gthread docs tests
  
 -configincludedir = $(pkglibdir)/include
--
++configincludedir = $(includedir)
+ 
 -bin_SCRIPTS=glib-config
 -BUILT_SOURCES=glib-config
 +bin_SCRIPTS=glib11d-config
@@ -18,7 +19,7 @@
  
  INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
  
-@@ -111,9 +109,9 @@
+@@ -111,9 +111,9 @@
  	makefile.msc		\
  	glibconfig.h.win32
  
@@ -30,15 +31,7 @@
  	garray.c	\
  	gcache.c	\
  	gcompletion.c	\
-@@ -141,28 +139,25 @@
- 	gutils.c
- 
- include_HEADERS = \
--	glib.h
--
--configinclude_DATA = \
-+	glib.h \
- 	glibconfig.h
+@@ -148,21 +148,20 @@
  
  BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
  
@@ -66,7 +59,7 @@
  LTLIBRARIES =  $(lib_LTLIBRARIES)
  
  
-@@ -170,8 +165,8 @@
+@@ -170,8 +169,8 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
@@ -77,7 +70,7 @@
  gdate.lo gerror.lo ghash.lo ghook.lo giochannel.lo giounix.lo glist.lo \
  gmain.lo gmem.lo gmessages.lo gmutex.lo gnode.lo gprimes.lo grel.lo \
  gscanner.lo gslist.lo gstrfuncs.lo gstring.lo gtimer.lo gtree.lo \
-@@ -180,15 +175,15 @@
+@@ -180,15 +179,15 @@
  
  testglib_SOURCES = testglib.c
  testglib_OBJECTS =  testglib.o
@@ -96,16 +89,7 @@
  testgdateparser_LDFLAGS = 
  SCRIPTS =  $(bin_SCRIPTS)
  
-@@ -196,7 +191,7 @@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
- LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
--DATA =  $(configinclude_DATA) $(m4data_DATA)
-+DATA =  $(m4data_DATA)
- 
- HEADERS =  $(include_HEADERS)
- 
-@@ -210,8 +205,8 @@
+@@ -210,8 +209,8 @@
  
  TAR = tar
  GZIP = --best
@@ -116,7 +100,7 @@
  
  all: all-recursive-am all-am
  
-@@ -252,7 +247,10 @@
+@@ -252,7 +251,10 @@
  	-rm -f config.h
  
  maintainer-clean-hdr:
@@ -128,7 +112,7 @@
  	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
  
  mostlyclean-libLTLIBRARIES:
-@@ -318,8 +316,8 @@
+@@ -318,8 +320,8 @@
  
  maintainer-clean-libtool:
  
@@ -139,80 +123,17 @@
  
  mostlyclean-noinstPROGRAMS:
  
-@@ -361,44 +359,6 @@
- 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
- 	done
- 
--install-configincludeDATA: $(configinclude_DATA)
--	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(configincludedir)
--	@list='$(configinclude_DATA)'; for p in $$list; do \
--	  if test -f $(srcdir)/$$p; then \
--	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configincludedir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configincludedir)/$$p; \
--	  else if test -f $$p; then \
--	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(configincludedir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(DESTDIR)$(configincludedir)/$$p; \
--	  fi; fi; \
--	done
--
--uninstall-configincludeDATA:
--	@$(NORMAL_UNINSTALL)
--	list='$(configinclude_DATA)'; for p in $$list; do \
--	  rm -f $(DESTDIR)$(configincludedir)/$$p; \
--	done
--
--install-m4dataDATA: $(m4data_DATA)
--	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
--	@list='$(m4data_DATA)'; for p in $$list; do \
--	  if test -f $(srcdir)/$$p; then \
--	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p; \
--	  else if test -f $$p; then \
--	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p; \
--	  fi; fi; \
--	done
--
--uninstall-m4dataDATA:
--	@$(NORMAL_UNINSTALL)
--	list='$(m4data_DATA)'; for p in $$list; do \
--	  rm -f $(DESTDIR)$(m4datadir)/$$p; \
--	done
--
- install-includeHEADERS: $(include_HEADERS)
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(includedir)
-@@ -538,13 +498,13 @@
+@@ -538,7 +540,7 @@
  all-recursive-am: config.h
  	$(MAKE) all-recursive
  
 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) config.h
-+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(HEADERS) config.h
++all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) $(HEADERS) config.h
  
  install-exec-am: install-libLTLIBRARIES install-binSCRIPTS
  
--install-data-am: install-configincludeDATA install-m4dataDATA install-includeHEADERS
-+install-data-am: install-includeHEADERS
- 
--uninstall-am: uninstall-libLTLIBRARIES uninstall-binSCRIPTS uninstall-configincludeDATA uninstall-m4dataDATA uninstall-includeHEADERS
-+uninstall-am: uninstall-libLTLIBRARIES uninstall-binSCRIPTS uninstall-includeHEADERS
- 
- install-exec: install-exec-recursive install-exec-am
- 	@$(NORMAL_INSTALL)
-@@ -620,8 +580,7 @@
- maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
- distclean-noinstPROGRAMS clean-noinstPROGRAMS \
- maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
--uninstall-configincludeDATA install-configincludeDATA \
--uninstall-m4dataDATA install-m4dataDATA uninstall-includeHEADERS \
-+uninstall-includeHEADERS \
- install-includeHEADERS install-data-recursive uninstall-data-recursive \
- install-exec-recursive uninstall-exec-recursive installdirs-recursive \
- uninstalldirs-recursive all-recursive check-recursive \
 --- gmodule/Makefile.in.orig	Mon Jan 18 07:30:13 1999
-+++ gmodule/Makefile.in	Thu Jan 21 04:27:34 1999
++++ gmodule/Makefile.in	Fri Jan 22 02:55:56 1999
 @@ -103,30 +103,29 @@
  include_HEADERS = \
  		gmodule.h
@@ -258,7 +179,7 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
  CONFIG_CLEAN_FILES =  gmoduleconf.h
-@@ -137,17 +136,17 @@
+@@ -137,22 +136,22 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
@@ -283,6 +204,12 @@
  testgmodule_LDFLAGS = 
  CFLAGS = @CFLAGS@
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+-LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --mode=link $(CC) -export-dynamic $(CFLAGS) $(LDFLAGS) -o $@
+ HEADERS =  $(include_HEADERS)
+ 
+ DIST_COMMON =  AUTHORS COPYING ChangeLog Makefile.am Makefile.in \
 @@ -163,10 +162,10 @@
  
  TAR = tar
@@ -332,7 +259,7 @@
  	  echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
  	  $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
 --- gthread/Makefile.in.orig	Mon Jan 18 07:30:16 1999
-+++ gthread/Makefile.in	Thu Jan 21 04:27:34 1999
++++ gthread/Makefile.in	Fri Jan 22 02:46:01 1999
 @@ -95,19 +95,18 @@
  		gthread-nspr.c		\
  		gthread-none.c
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index f6665f36a48f..2486e7af74f2 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,146 +1,6 @@
---- configure.orig	Mon Jan 18 05:35:47 1999
-+++ configure	Thu Jan 21 02:09:05 1999
-@@ -34,7 +34,7 @@
-   --enable-threads        turn on basic thread support [default=yes]
-                           ([=no] will override --with-threads)"
- ac_help="$ac_help
--  --with-threads=[none/posix/solaris/nspr] specify a thread implementation to use"
-+  --with-threads=[none/posix/solaris/nspr/uthread] specify a thread implementation to use"
- 
- # Initialize some variables set by options.
- # The variables have the same names as the options, with
-@@ -3349,7 +3349,7 @@
- fi
- done
- 
--for ac_hdr in sys/poll.h
-+for ac_hdr in sys/select.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -3384,7 +3384,7 @@
- #define $ac_tr_hdr 1
- EOF
-  cat >> confdefs.h <<\EOF
--#define HAVE_SYS_POLL_H 1
-+#define HAVE_SYS_SELECT_H 1
- EOF
- 
- else
-@@ -3392,7 +3392,7 @@
- fi
- done
- 
--for ac_hdr in sys/select.h
-+for ac_hdr in sys/time.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -3427,7 +3427,7 @@
- #define $ac_tr_hdr 1
- EOF
-  cat >> confdefs.h <<\EOF
--#define HAVE_SYS_SELECT_H 1
-+#define HAVE_SYS_TIME_H 1
- EOF
- 
- else
-@@ -3435,7 +3435,7 @@
- fi
- done
- 
--for ac_hdr in sys/time.h
-+for ac_hdr in sys/times.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -3470,7 +3470,7 @@
- #define $ac_tr_hdr 1
- EOF
-  cat >> confdefs.h <<\EOF
--#define HAVE_SYS_TIME_H 1
-+#define HAVE_SYS_TIMES_H 1
- EOF
- 
- else
-@@ -3478,7 +3478,7 @@
- fi
- done
- 
--for ac_hdr in sys/times.h
-+for ac_hdr in unistd.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -3513,7 +3513,7 @@
- #define $ac_tr_hdr 1
- EOF
-  cat >> confdefs.h <<\EOF
--#define HAVE_SYS_TIMES_H 1
-+#define HAVE_UNISTD_H 1
- EOF
- 
- else
-@@ -3521,7 +3521,7 @@
- fi
- done
- 
--for ac_hdr in unistd.h
-+for ac_hdr in values.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -3556,49 +3556,6 @@
- #define $ac_tr_hdr 1
- EOF
-  cat >> confdefs.h <<\EOF
--#define HAVE_UNISTD_H 1
--EOF
--
--else
--  echo "$ac_t""no" 1>&6
--fi
--done
--
--for ac_hdr in values.h
--do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:3572: 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
--#line 3577 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
--if test -z "$ac_err"; then
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=yes"
--else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
--fi
--rm -f conftest*
--fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_hdr 1
--EOF
-- cat >> confdefs.h <<\EOF
- #define HAVE_VALUES_H 1
- EOF
- 
-@@ -3609,15 +3566,15 @@
+--- configure.orig	Sun Jan 17 23:35:47 1999
++++ configure	Thu Jan 21 18:58:35 1999
+@@ -3609,7 +3609,7 @@
  
  
  # Check for some functions
@@ -148,944 +8,8 @@
 +for ac_func in localtime_r rand_r lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3616: checking for $ac_func" >&5
-+echo "configure:3573: 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 <<EOF
--#line 3621 "configure"
-+#line 3578 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -3640,7 +3597,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -3667,9 +3624,9 @@
- 
- # Check for sys_errlist
- echo $ac_n "checking for sys_errlist""... $ac_c" 1>&6
--echo "configure:3671: checking for sys_errlist" >&5
-+echo "configure:3628: checking for sys_errlist" >&5
- cat > conftest.$ac_ext <<EOF
--#line 3673 "configure"
-+#line 3630 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -3680,7 +3637,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   glib_ok=yes
- else
-@@ -3700,9 +3657,9 @@
- 
- # Check for sys_siglist
- echo $ac_n "checking for sys_siglist""... $ac_c" 1>&6
--echo "configure:3704: checking for sys_siglist" >&5
-+echo "configure:3661: checking for sys_siglist" >&5
- cat > conftest.$ac_ext <<EOF
--#line 3706 "configure"
-+#line 3663 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -3712,7 +3669,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   glib_ok=yes
- else
-@@ -3732,16 +3689,16 @@
- 
- # Check if <sys/select.h> needs to be included for fd_set
- echo $ac_n "checking for fd_set""... $ac_c" 1>&6
--echo "configure:3736: checking for fd_set" >&5
-+echo "configure:3693: checking for fd_set" >&5
- cat > conftest.$ac_ext <<EOF
--#line 3738 "configure"
-+#line 3695 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int main() {
- fd_set readMask, writeMask;
- ; return 0; }
- EOF
--if { (eval echo configure:3745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3702: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gtk_ok=yes
- else
-@@ -3755,7 +3712,7 @@
-     echo "$ac_t""yes, found in sys/types.h" 1>&6
- else
-     cat > conftest.$ac_ext <<EOF
--#line 3759 "configure"
-+#line 3716 "configure"
- #include "confdefs.h"
- #include <sys/select.h>
- EOF
-@@ -3789,14 +3746,14 @@
- # Check for wchar.h
- 
- echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
--echo "configure:3793: checking for wchar.h" >&5
-+echo "configure:3750: checking for wchar.h" >&5
- cat > conftest.$ac_ext <<EOF
--#line 3795 "configure"
-+#line 3752 "configure"
- #include "confdefs.h"
- #include <wchar.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3757: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -3820,14 +3777,14 @@
- # Check for wctype.h (for iswalnum)
- 
- echo $ac_n "checking for wctype.h""... $ac_c" 1>&6
--echo "configure:3824: checking for wctype.h" >&5
-+echo "configure:3781: checking for wctype.h" >&5
- cat > conftest.$ac_ext <<EOF
--#line 3826 "configure"
-+#line 3783 "configure"
- #include "confdefs.h"
- #include <wctype.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -3851,12 +3808,12 @@
- oLIBS="$LIBS"
- # in Solaris 2.5, `iswalnum' is in -lw
- echo $ac_n "checking for iswalnum""... $ac_c" 1>&6
--echo "configure:3855: checking for iswalnum" >&5
-+echo "configure:3812: 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 <<EOF
--#line 3860 "configure"
-+#line 3817 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char iswalnum(); below.  */
-@@ -3879,7 +3836,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_func_iswalnum=yes"
- else
-@@ -3897,7 +3854,7 @@
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for iswalnum in -lw""... $ac_c" 1>&6
--echo "configure:3901: checking for iswalnum in -lw" >&5
-+echo "configure:3858: 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
-@@ -3905,7 +3862,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lw  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3909 "configure"
-+#line 3866 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3916,7 +3873,7 @@
- iswalnum()
- ; return 0; }
- EOF
--if { (eval echo configure:3920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3948,9 +3905,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:3952: checking if iswalnum() and friends are properly defined" >&5
-+echo "configure:3909: checking if iswalnum() and friends are properly defined" >&5
- cat > conftest.$ac_ext <<EOF
--#line 3954 "configure"
-+#line 3911 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- int main() {
-@@ -3970,7 +3927,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   glib_working_wctype=yes
- else
-@@ -3992,7 +3949,7 @@
- 
- 
- echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6
--echo "configure:3996: checking for an implementation of va_copy()" >&5
-+echo "configure:3953: 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
-@@ -4001,7 +3958,7 @@
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4005 "configure"
-+#line 3962 "configure"
- #include "confdefs.h"
- 
- 	#include <stdarg.h>
-@@ -4018,7 +3975,7 @@
- 	  return 0;
- 	}
- EOF
--if { (eval echo configure:4022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
- then
-   glib_cv_va_copy=yes
- 	
-@@ -4037,7 +3994,7 @@
- 
- 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:4041: checking for an implementation of __va_copy()" >&5
-+echo "configure:3998: 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
-@@ -4046,7 +4003,7 @@
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4050 "configure"
-+#line 4007 "configure"
- #include "confdefs.h"
- 
- 	#include <stdarg.h>
-@@ -4063,7 +4020,7 @@
- 	  return 0;
- 	}
- EOF
--if { (eval echo configure:4067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
- then
-   glib_cv___va_copy=yes
- 	
-@@ -4082,7 +4039,7 @@
- 
- 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:4086: checking whether va_lists can be copied by value" >&5
-+echo "configure:4043: 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
-@@ -4091,7 +4048,7 @@
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4095 "configure"
-+#line 4052 "configure"
- #include "confdefs.h"
- 
- 	#include <stdarg.h>
-@@ -4108,7 +4065,7 @@
- 	  return 0;
- 	}
- EOF
--if { (eval echo configure:4112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
- then
-   glib_cv_va_val_copy=yes
- 	
-@@ -4153,12 +4110,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:4157: checking for dlopen" >&5
-+echo "configure:4114: 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 <<EOF
--#line 4162 "configure"
-+#line 4119 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char dlopen(); below.  */
-@@ -4181,7 +4138,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_func_dlopen=yes"
- else
-@@ -4204,7 +4161,7 @@
- fi
- if test -z "$G_MODULE_IMPL"; then
- 	echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:4208: checking for dlopen in -ldl" >&5
-+echo "configure:4165: 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
-@@ -4212,7 +4169,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4216 "configure"
-+#line 4173 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4223,7 +4180,7 @@
- dlopen()
- ; return 0; }
- EOF
--if { (eval echo configure:4227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4248,18 +4205,18 @@
- fi
- if test -z "$G_MODULE_IMPL"; then
-         echo $ac_n "checking how to export all symbols""... $ac_c" 1>&6
--echo "configure:4252: checking how to export all symbols" >&5
-+echo "configure:4209: checking how to export all symbols" >&5
-         SAVED_LDFLAGS=$LDFLAGS
-         LDFLAGS="$LDFLAGS -Wl,-E"
-         cat > conftest.$ac_ext <<EOF
--#line 4256 "configure"
-+#line 4213 "configure"
- #include "confdefs.h"
- 
- int main() {
-  return 0; 
- ; return 0; }
- EOF
--if { (eval echo configure:4263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-    G_MODULE_LDFLAGS="-Wl,-E" 
- else
-@@ -4269,14 +4226,14 @@
-   
-                 LDFLAGS="$SAVED_LDFLAGS -bexpall"
-                 cat > conftest.$ac_ext <<EOF
--#line 4273 "configure"
-+#line 4230 "configure"
- #include "confdefs.h"
- 
- int main() {
-  return 0; 
- ; return 0; }
- EOF
--if { (eval echo configure:4280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   G_MODULE_LDFLAGS="-bexpall"
- else
-@@ -4296,7 +4253,7 @@
-                 G_MODULE_LDFLAGS=
-         fi
- 	echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
--echo "configure:4300: checking for shl_load in -ldld" >&5
-+echo "configure:4257: 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
-@@ -4304,7 +4261,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldld  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4308 "configure"
-+#line 4265 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4315,7 +4272,7 @@
- shl_load()
- ; return 0; }
- EOF
--if { (eval echo configure:4319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4349,7 +4306,7 @@
- 	LIBS="$LIBS $G_MODULE_LIBS"
- 	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
- 	echo $ac_n "checking for preceeding underscore in symbols""... $ac_c" 1>&6
--echo "configure:4353: checking for preceeding underscore in symbols" >&5
-+echo "configure:4310: 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
-@@ -4358,7 +4315,7 @@
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4362 "configure"
-+#line 4319 "configure"
- #include "confdefs.h"
- 
- 		#include <dlfcn.h>
-@@ -4372,7 +4329,7 @@
- 		  } return (!f2 || f1);
- 		}
- EOF
--if { (eval echo configure:4376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
- then
-   glib_cv_uscore=yes
- else
-@@ -4397,12 +4354,12 @@
- 	
- 	LDFLAGS="$LDFLAGS_orig"
- 	echo $ac_n "checking for dlerror""... $ac_c" 1>&6
--echo "configure:4401: checking for dlerror" >&5
-+echo "configure:4358: 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 <<EOF
--#line 4406 "configure"
-+#line 4363 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char dlerror(); below.  */
-@@ -4425,7 +4382,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_func_dlerror=yes"
- else
-@@ -4499,7 +4456,7 @@
-        	case $host in
-                	*-*-solaris*)
-               	echo $ac_n "checking for cond_init in -lthread""... $ac_c" 1>&6
--echo "configure:4503: checking for cond_init in -lthread" >&5
-+echo "configure:4460: 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
-@@ -4507,7 +4464,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4511 "configure"
-+#line 4468 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4518,7 +4475,7 @@
- cond_init()
- ; return 0; }
- EOF
--if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4544,7 +4501,7 @@
- if test "x$want_threads" = xyes || test "x$want_threads" = xposix; then
-         if test "x$have_threads" = xnone; then
-                 echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
--echo "configure:4548: checking for pthread_attr_init in -lpthread" >&5
-+echo "configure:4505: 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
-@@ -4552,7 +4509,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lpthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4556 "configure"
-+#line 4513 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4563,7 +4520,7 @@
- pthread_attr_init()
- ; return 0; }
- EOF
--if { (eval echo configure:4567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4586,7 +4543,7 @@
- 	fi
-         if test "x$have_threads" = xnone; then
-      	        echo $ac_n "checking for pthread_attr_init in -lpthreads""... $ac_c" 1>&6
--echo "configure:4590: checking for pthread_attr_init in -lpthreads" >&5
-+echo "configure:4547: 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
-@@ -4594,7 +4551,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lpthreads  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4598 "configure"
-+#line 4555 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4605,7 +4562,7 @@
- pthread_attr_init()
- ; return 0; }
- EOF
--if { (eval echo configure:4609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4628,7 +4585,7 @@
- 	fi
-         if test "x$have_threads" = xnone; then
-      	        echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6
--echo "configure:4632: checking for pthread_attr_init in -lc_r" >&5
-+echo "configure:4589: 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
-@@ -4636,7 +4593,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lc_r  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4640 "configure"
-+#line 4597 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4647,7 +4604,7 @@
- pthread_attr_init()
- ; return 0; }
- EOF
--if { (eval echo configure:4651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4670,12 +4627,12 @@
- 	fi
-         if test "x$have_threads" = xnone; then
- 		echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6
--echo "configure:4674: checking for pthread_attr_init" >&5
-+echo "configure:4631: 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 <<EOF
--#line 4679 "configure"
-+#line 4636 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char pthread_attr_init(); below.  */
-@@ -4698,7 +4655,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_func_pthread_attr_init=yes"
- else
-@@ -4720,7 +4677,7 @@
- 	fi
- 	        if test "x$have_threads" = xnone; then
-                 echo $ac_n "checking for __d10_pthread_attr_init in -lthread""... $ac_c" 1>&6
--echo "configure:4724: checking for __d10_pthread_attr_init in -lthread" >&5
-+echo "configure:4681: 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
-@@ -4728,7 +4685,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4732 "configure"
-+#line 4689 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4739,7 +4696,7 @@
- __d10_pthread_attr_init()
- ; return 0; }
- EOF
--if { (eval echo configure:4743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4764,7 +4721,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:4768: checking for PRP_NewNakedCondVar in -lnspr21" >&5
-+echo "configure:4725: 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
-@@ -4772,7 +4729,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lnspr21  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4776 "configure"
-+#line 4733 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4783,7 +4740,7 @@
- PRP_NewNakedCondVar()
- ; return 0; }
- EOF
--if { (eval echo configure:4787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4805,9 +4762,53 @@
- 
- 	fi
- fi
-+if test "x$want_threads" = xyes || test "x$want_threads" = xuthread; then
-+        if test "x$have_threads" = xnone; then
-+	        echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6
-+echo "configure:4769: 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
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lc_r  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 4777 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char pthread_attr_init();
-+
-+int main() {
-+pthread_attr_init()
-+; return 0; }
-+EOF
-+if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  have_threads=uthread
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+        fi
-+fi
- 
- echo $ac_n "checking for thread implementation""... $ac_c" 1>&6
--echo "configure:4811: checking for thread implementation" >&5
-+echo "configure:4812: checking for thread implementation" >&5
- 
- if test "x$have_threads" = xnone && test "x$want_threads" != xno; then
- 	echo "$ac_t""none available" 1>&6
-@@ -4826,7 +4827,7 @@
-         posix)
- 		G_THREAD_LIBS=error
- 		echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
--echo "configure:4830: checking for pthread_attr_init in -lpthread" >&5
-+echo "configure:4831: 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
-@@ -4834,7 +4835,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lpthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4838 "configure"
-+#line 4839 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4845,7 +4846,7 @@
- pthread_attr_init()
- ; return 0; }
- EOF
--if { (eval echo configure:4849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4867,7 +4868,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:4871: checking for pthread_attr_init in -lpthreads" >&5
-+echo "configure:4872: 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
-@@ -4875,7 +4876,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lpthreads  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4879 "configure"
-+#line 4880 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4886,7 +4887,7 @@
- pthread_attr_init()
- ; return 0; }
- EOF
--if { (eval echo configure:4890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4909,7 +4910,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:4913: checking for pthread_attr_init in -lc_r" >&5
-+echo "configure:4914: 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
-@@ -4917,7 +4918,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lc_r  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4921 "configure"
-+#line 4922 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4928,7 +4929,7 @@
- pthread_attr_init()
- ; return 0; }
- EOF
--if { (eval echo configure:4932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4951,12 +4952,12 @@
- 		fi
- 		if test "x$G_THREAD_LIBS" = xerror; then
- 			echo $ac_n "checking for pthread_attr_init""... $ac_c" 1>&6
--echo "configure:4955: checking for pthread_attr_init" >&5
-+echo "configure:4956: 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 <<EOF
--#line 4960 "configure"
-+#line 4961 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char pthread_attr_init(); below.  */
-@@ -4979,7 +4980,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_func_pthread_attr_init=yes"
- else
-@@ -5001,7 +5002,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:5005: checking for __d10_pthread_attr_init in -lthread" >&5
-+echo "configure:5006: 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
-@@ -5009,7 +5010,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5013 "configure"
-+#line 5014 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5020,7 +5021,7 @@
- __d10_pthread_attr_init()
- ; return 0; }
- EOF
--if { (eval echo configure:5024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5051,7 +5052,7 @@
-         solaris)
- 		G_THREAD_LIBS=error
-                 echo $ac_n "checking for cond_init in -lthread""... $ac_c" 1>&6
--echo "configure:5055: checking for cond_init in -lthread" >&5
-+echo "configure:5056: 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
-@@ -5059,7 +5060,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5063 "configure"
-+#line 5064 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5070,7 +5071,7 @@
- cond_init()
- ; return 0; }
- EOF
--if { (eval echo configure:5074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5098,7 +5099,7 @@
-                 ;;
- 	nspr)
- 		echo $ac_n "checking for PRP_NewNakedCondVar in -lnspr21""... $ac_c" 1>&6
--echo "configure:5102: checking for PRP_NewNakedCondVar in -lnspr21" >&5
-+echo "configure:5103: 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
-@@ -5106,7 +5107,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lnspr21  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5110 "configure"
-+#line 5111 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5117,7 +5118,7 @@
- PRP_NewNakedCondVar()
- ; return 0; }
- EOF
--if { (eval echo configure:5121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:5122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5139,6 +5140,52 @@
- 
- 		g_threads_impl="NSPR"
- 		;;
-+	uthread)
-+		echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6
-+echo "configure:5146: 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
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lc_r  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 5154 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char pthread_attr_init();
-+
-+int main() {
-+pthread_attr_init()
-+; return 0; }
-+EOF
-+if { (eval echo configure:5165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  G_THREAD_LIBS="-pthread"
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+		mutex_has_default=yes
-+		mutex_default_type='pthread_mutex_t'
-+		mutex_default_init='PTHREAD_MUTEX_INITIALIZER'
-+		mutex_header_file='pthread.h'
-+		;;
-         none)
- 		g_threads_impl="NONE"
-                 ;;
-@@ -5153,7 +5200,7 @@
- fi
- 
- echo $ac_n "checking necessary linker options""... $ac_c" 1>&6
--echo "configure:5157: checking necessary linker options" >&5
-+echo "configure:5204: checking necessary linker options" >&5
- echo "$ac_t""$G_THREAD_LIBS" 1>&6
- 
- 
-@@ -5168,11 +5215,17 @@
+ echo "configure:3616: checking for $ac_func" >&5
+@@ -5168,11 +5168,14 @@
              	        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
  		fi
  		;;
@@ -1094,93 +18,90 @@
 -
 -		# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
 -		# -mthreads flag.
-+	*-freebsd*)
-+		case $have_threads in
-+		    posix)
-+		    	   G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
-+			   ;;
-+		    uthread)
-+		    	   G_THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
-+			   have_threads=posix
-+			   have_poll=no
-+			   ;;
-+		esac
++	*-*-freebsd2.2* | *-*-freebsd3*)
++		if test x"$G_THREAD_LIBS" = x"-lc_r"; then
++			G_THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
++			G_THREAD_LIBS=""
++			have_poll=no
++		else
++			G_THREAD_CFLAGS="-D_THREAD_SAFE"
++		fi
  		;;
      esac
  
-@@ -5181,7 +5234,7 @@
+@@ -5181,7 +5184,7 @@
      old_CPPFLAGS=$CPPFLAGS
      CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS"
      cat > conftest.$ac_ext <<EOF
 -#line 5185 "configure"
-+#line 5238 "configure"
++#line 5188 "configure"
  #include "confdefs.h"
  #include <time.h>
  EOF
-@@ -5198,7 +5251,7 @@
+@@ -5198,7 +5201,7 @@
      CPPFLAGS=$old_CPPFLAGS
  
      echo $ac_n "checking necessary compiler options""... $ac_c" 1>&6
 -echo "configure:5202: checking necessary compiler options" >&5
-+echo "configure:5255: checking necessary compiler options" >&5
++echo "configure:5205: checking necessary compiler options" >&5
  
      echo "$ac_t""$G_THREAD_CFLAGS" 1>&6
  else
-@@ -5218,7 +5271,7 @@
+@@ -5218,7 +5221,7 @@
          case "$mutex_has_default" in
          "yes")
                  echo $ac_n "checking size of $mutex_default_type""... $ac_c" 1>&6
 -echo "configure:5222: checking size of $mutex_default_type" >&5
-+echo "configure:5275: checking size of $mutex_default_type" >&5
++echo "configure:5225: 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
-@@ -5226,7 +5279,7 @@
+@@ -5226,7 +5229,7 @@
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
 -#line 5230 "configure"
-+#line 5283 "configure"
++#line 5233 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #include <$mutex_header_file>
-@@ -5238,7 +5291,7 @@
+@@ -5238,7 +5241,7 @@
    exit(0);
  }
  EOF
 -if { (eval echo configure:5242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    glib_cv_sizeof_gmutex=`cat conftestval`
  else
-@@ -5258,7 +5311,7 @@
+@@ -5258,7 +5261,7 @@
  
  
  	echo $ac_n "checking byte contents of $mutex_default_type""... $ac_c" 1>&6
 -echo "configure:5262: checking byte contents of $mutex_default_type" >&5
-+echo "configure:5315: checking byte contents of $mutex_default_type" >&5
++echo "configure:5265: 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
-@@ -5266,7 +5319,7 @@
+@@ -5266,7 +5269,7 @@
    glib_cv_byte_contents_gmutex=0
  else
    cat > conftest.$ac_ext <<EOF
 -#line 5270 "configure"
-+#line 5323 "configure"
++#line 5273 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #include <$mutex_header_file>
-@@ -5283,7 +5336,7 @@
+@@ -5283,7 +5286,7 @@
    exit(0);
  }
  EOF
 -if { (eval echo configure:5287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    glib_cv_byte_contents_gmutex=`cat conftestval`
  else
-@@ -5311,6 +5364,63 @@
+@@ -5311,6 +5314,63 @@
  
  
  
@@ -1188,12 +109,12 @@
 +	for ac_func in poll
 +do
 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:5372: checking for $ac_func" >&5
++echo "configure:5322: 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 <<EOF
-+#line 5377 "configure"
++#line 5327 "configure"
 +#include "confdefs.h"
 +/* System header to define __stub macros and hopefully few prototypes,
 +    which can conflict with char $ac_func(); below.  */
@@ -1216,7 +137,7 @@
 +
 +; return 0; }
 +EOF
-+if { (eval echo configure:5400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:5350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
 +  rm -rf conftest*
 +  eval "ac_cv_func_$ac_func=yes"
 +else
@@ -1244,26 +165,26 @@
  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
-@@ -5319,7 +5429,7 @@
+@@ -5319,7 +5379,7 @@
    glib_nl='\n'
  fi
  echo $ac_n "checking system definitions for $glib_sysdef_msg""... $ac_c" 1>&6
 -echo "configure:5323: checking system definitions for $glib_sysdef_msg" >&5
-+echo "configure:5433: checking system definitions for $glib_sysdef_msg" >&5
++echo "configure:5383: checking system definitions for $glib_sysdef_msg" >&5
  cat >confrun.c <<_______EOF
  #include <stdio.h>
  #include <sys/types.h>
-@@ -5346,11 +5456,11 @@
+@@ -5346,11 +5406,11 @@
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
 -#line 5350 "configure"
-+#line 5460 "configure"
++#line 5410 "configure"
  #include "confdefs.h"
  `cat confrun.c`
  EOF
 -if { (eval echo configure:5354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    echo "$ac_t""done" 1>&6
  else
diff --git a/devel/glib20/pkg-descr b/devel/glib20/pkg-descr
index 8f29db36da6e..469154423427 100644
--- a/devel/glib20/pkg-descr
+++ b/devel/glib20/pkg-descr
@@ -1,4 +1,4 @@
-This is GLib version 1.1.0.   GLib, is a library which includes support
+This is GLib version 1.1.   GLib, is a library which includes support
 routines for C such as lists, trees, hashes, memory allocation, and
 many other things.
 
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 623c216b34f1..a2c5ff7fd2f2 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -20,4 +20,5 @@ lib/libgthread11d.so
 lib/libgthread11d.so.2.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/aclocal/glib.m4
 @dirrm include/glib11d