Upgrade to version 1.1.14

PR:		ports/9800
Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

5 files changed, 145 insertions, 146 deletions

diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 87d9b6b9310..0fae893f84d 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -3,10 +3,10 @@
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.14 1999/01/20 21:59:41 vanilla Exp $
+# $Id: Makefile,v 1.15 1999/01/21 19:18:20 vanilla Exp $
 #
 
-DISTNAME=	glib-1.1.13
+DISTNAME=	glib-1.1.14
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -16,7 +16,6 @@ MAINTAINER=	vanilla@FreeBSD.ORG
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	INSTALL='$${INSTALL} -c'
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib11d
 
 MAN1=		glib-config.1
diff --git a/devel/glib12/distinfo b/devel/glib12/distinfo
index c9f3309f784..c7a6832d6bd 100644
--- a/devel/glib12/distinfo
+++ b/devel/glib12/distinfo
@@ -1 +1 @@
-MD5 (glib-1.1.13.tar.gz) = 8a581841ff2c21ff0eec89b1de7a22b4
+MD5 (glib-1.1.14.tar.gz) = d894db61a2e77f0c345983800534aab6
diff --git a/devel/glib12/files/patch-ab b/devel/glib12/files/patch-ab
index ce0e92a107d..df40e4bbf00 100644
--- a/devel/glib12/files/patch-ab
+++ b/devel/glib12/files/patch-ab
@@ -1,45 +1,39 @@
---- Makefile.in.orig	Mon Jan 18 07:30:09 1999
-+++ Makefile.in	Fri Jan 22 02:53:32 1999
-@@ -89,14 +89,14 @@
- RANLIB = @RANLIB@
- VERSION = @VERSION@
+--- Makefile.in.orig	Thu Jan 28 22:53:35 1999
++++ Makefile.in	Thu Jan 28 22:59:44 1999
+@@ -89,11 +89,11 @@
  
--SUBDIRS = gmodule gthread docs tests
-+SUBDIRS = gmodule gthread docs
- # alpha `automake' supports this better
- #SUBDIRS = . gmodule gthread docs tests
+ AUTOMAKE_OPTIONS = 1.4
+ 
+-SUBDIRS = . gmodule gthread docs tests
++SUBDIRS = . gmodule gthread docs
  
 -configincludedir = $(pkglibdir)/include
 +configincludedir = $(includedir)
  
--bin_SCRIPTS=glib-config
--BUILT_SOURCES=glib-config
-+bin_SCRIPTS=glib11d-config
-+BUILT_SOURCES=glib11d-config
+-bin_SCRIPTS = glib-config
++bin_SCRIPTS = glib11d-config
+ 
+ BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
  
- INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
+@@ -102,9 +102,9 @@
+ EXTRA_DIST =  	glib.m4				glib.spec			acglib.m4			sanity_check			README.win32			glib.def			makefile.msc			giowin32.c			glibconfig.h.win32		config.h.win32
  
-@@ -111,9 +111,9 @@
- 	makefile.msc		\
- 	glibconfig.h.win32
  
 -lib_LTLIBRARIES = libglib.la
 +lib_LTLIBRARIES = libglib11d.la
  
--libglib_la_SOURCES = \
-+libglib11d_la_SOURCES = \
- 	garray.c	\
- 	gcache.c	\
- 	gcompletion.c	\
-@@ -148,21 +148,20 @@
+-libglib_la_SOURCES =  	garray.c		gcache.c		gcompletion.c		gdataset.c		gdate.c         	gerror.c		ghash.c			ghook.c			giochannel.c    	giounix.c       	glist.c			gmain.c         	gmem.c			gmessages.c		gmutex.c		gnode.c			gprimes.c		grel.c			gscanner.c		gslist.c		gstrfuncs.c		gstring.c		gtimer.c		gtree.c			gutils.c
++libglib11d_la_SOURCES =  	garray.c		gcache.c		gcompletion.c		gdataset.c		gdate.c         	gerror.c		ghash.c			ghook.c			giochannel.c    	giounix.c       	glist.c			gmain.c         	gmem.c			gmessages.c		gmutex.c		gnode.c			gprimes.c		grel.c			gscanner.c		gslist.c		gstrfuncs.c		gstring.c		gtimer.c		gtree.c			gutils.c
  
- BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
  
--libglib_la_LDFLAGS = \
--	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
--	-release $(LT_RELEASE)
-+libglib11d_la_LDFLAGS = \
-+	-version-info 2:1:0
+ include_HEADERS =  	glib.h
+@@ -113,20 +113,20 @@
+ configinclude_DATA =  	glibconfig.h
+ 
+ 
+-libglib_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libglib11d_la_LDFLAGS =  	-version-info 2:1:0
+ 
  
  noinst_PROGRAMS = testglib testgdate testgdateparser
 -testglib_LDADD = libglib.la
@@ -59,7 +53,7 @@
  LTLIBRARIES =  $(lib_LTLIBRARIES)
  
  
-@@ -170,8 +169,8 @@
+@@ -134,8 +134,8 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
@@ -70,7 +64,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 +179,15 @@
+@@ -144,15 +144,15 @@
  
  testglib_SOURCES = testglib.c
  testglib_OBJECTS =  testglib.o
@@ -89,18 +83,18 @@
  testgdateparser_LDFLAGS = 
  SCRIPTS =  $(bin_SCRIPTS)
  
-@@ -210,8 +209,8 @@
+@@ -175,8 +175,8 @@
  
  TAR = tar
- GZIP = --best
+ GZIP_ENV = --best
 -SOURCES = $(libglib_la_SOURCES) testglib.c testgdate.c testgdateparser.c
 -OBJECTS = $(libglib_la_OBJECTS) testglib.o testgdate.o testgdateparser.o
 +SOURCES = $(libglib11d_la_SOURCES) testglib.c testgdate.c testgdateparser.c
 +OBJECTS = $(libglib11d_la_OBJECTS) testglib.o testgdate.o testgdateparser.o
  
- all: all-recursive-am all-am
- 
-@@ -252,7 +251,10 @@
+ all: all-redirect
+ .SUFFIXES:
+@@ -223,7 +223,10 @@
  	-rm -f config.h
  
  maintainer-clean-hdr:
@@ -109,10 +103,10 @@
 +	cp glib-config.in glib11d-config.in
 +
 +glib11d-config: $(top_builddir)/config.status glib11d-config.in
- 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+ 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  
  mostlyclean-libLTLIBRARIES:
-@@ -318,8 +320,8 @@
+@@ -289,8 +292,8 @@
  
  maintainer-clean-libtool:
  
@@ -123,20 +117,20 @@
  
  mostlyclean-noinstPROGRAMS:
  
-@@ -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) $(DATA) $(HEADERS) config.h
+@@ -558,7 +561,7 @@
+ 		uninstall-configincludeDATA uninstall-m4dataDATA \
+ 		uninstall-includeHEADERS
+ uninstall: uninstall-recursive
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
++all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \
+ 		$(HEADERS) config.h
+ all-redirect: all-recursive-am
+ install-strip:
+--- gmodule/Makefile.in.orig	Thu Jan 28 23:01:00 1999
++++ gmodule/Makefile.in	Thu Jan 28 23:06:56 1999
+@@ -98,29 +98,29 @@
+ include_HEADERS =  		gmodule.h
  
- install-exec-am: install-libLTLIBRARIES install-binSCRIPTS
- 
---- gmodule/Makefile.in.orig	Mon Jan 18 07:30:13 1999
-+++ gmodule/Makefile.in	Fri Jan 22 02:55:56 1999
-@@ -103,30 +103,29 @@
- include_HEADERS = \
- 		gmodule.h
  
 -libglib = $(top_builddir)/libglib.la # -lglib
 +libglib = $(top_builddir)/libglib11d.la # -lglib
@@ -145,13 +139,10 @@
 +lib_LTLIBRARIES = libgmodule11d.la libgplugin11d_a.la libgplugin11d_b.la
  
 -libgmodule_la_SOURCES = gmodule.c
--libgmodule_la_LDFLAGS = \
+-libgmodule_la_LDFLAGS =  	@G_MODULE_LDFLAGS@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
 +libgmodule11d_la_SOURCES = gmodule.c
-+libgmodule11d_la_LDFLAGS = \
- 	@G_MODULE_LDFLAGS@ \
--	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
--	-release $(LT_RELEASE)
-+	-version-info 2:1:0
++libgmodule11d_la_LDFLAGS =  	@G_MODULE_LDFLAGS@ 	-version-info 2:1:0
+ 
  
 -libgmodule_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
 +libgmodule11d_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
@@ -174,12 +165,13 @@
 +libgplugin11d_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib)
  
  noinst_PROGRAMS = testgmodule
+ testgmodule_LDFLAGS =  @G_MODULE_LDFLAGS@
 -testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
 +testgmodule_LDADD = libgmodule11d.la $(libglib) @G_MODULE_LIBS@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
  CONFIG_CLEAN_FILES =  gmoduleconf.h
-@@ -137,22 +136,22 @@
+@@ -131,22 +131,22 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
@@ -201,30 +193,27 @@
  testgmodule_OBJECTS =  testgmodule.o
 -testgmodule_DEPENDENCIES =  libgmodule.la $(top_builddir)/libglib.la
 +testgmodule_DEPENDENCIES =  libgmodule11d.la $(top_builddir)/libglib11d.la
- 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 $@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --mode=link $(CCLD) -export-dynamic $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
  HEADERS =  $(include_HEADERS)
  
  DIST_COMMON =  AUTHORS COPYING ChangeLog Makefile.am Makefile.in \
-@@ -163,10 +162,10 @@
+@@ -157,8 +157,8 @@
  
  TAR = tar
- GZIP = --best
+ GZIP_ENV = --best
 -SOURCES = $(libgmodule_la_SOURCES) $(libgplugin_a_la_SOURCES) $(libgplugin_b_la_SOURCES) testgmodule.c
 -OBJECTS = $(libgmodule_la_OBJECTS) $(libgplugin_a_la_OBJECTS) $(libgplugin_b_la_OBJECTS) testgmodule.o
 +SOURCES = $(libgmodule11d_la_SOURCES) $(libgplugin11d_a_la_SOURCES) $(libgplugin11d_b_la_SOURCES) testgmodule.c
 +OBJECTS = $(libgmodule11d_la_OBJECTS) $(libgplugin11d_a_la_OBJECTS) $(libgplugin11d_b_la_OBJECTS) testgmodule.o
  
--all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-+all: Makefile $(LTLIBRARIES) $(HEADERS)
- 
+ all: all-redirect
  .SUFFIXES:
- .SUFFIXES: .S .c .lo .o .s
-@@ -233,14 +232,14 @@
+@@ -226,14 +226,14 @@
  
  maintainer-clean-libtool:
  
@@ -245,7 +234,16 @@
  
  mostlyclean-noinstPROGRAMS:
  
-@@ -388,10 +387,10 @@
+@@ -327,7 +327,7 @@
+ install: install-am
+ uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
+ uninstall: uninstall-am
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
++all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ all-redirect: all-am
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+@@ -398,10 +398,10 @@
  	  echo $$p; \
  	done
  
@@ -258,11 +256,11 @@
  	 if test -f $$p; then \
  	  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	Fri Jan 22 02:46:01 1999
-@@ -95,19 +95,18 @@
- 		gthread-nspr.c		\
- 		gthread-none.c
+--- gthread/Makefile.in.orig	Thu Jan 28 23:07:14 1999
++++ gthread/Makefile.in	Thu Jan 28 23:09:35 1999
+@@ -92,18 +92,18 @@
+ EXTRA_DIST =  		gthread-posix.c				gthread-solaris.c			gthread-nspr.c				gthread-none.c				gthread.def
+ 
  
 -libglib = $(top_builddir)/libglib.la # -lglib
 +libglib = $(top_builddir)/libglib11d.la # -lglib
@@ -271,12 +269,10 @@
 +lib_LTLIBRARIES = libgthread11d.la
  
 -libgthread_la_SOURCES = gthread.c
--libgthread_la_LDFLAGS = \
--	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
--	-release $(LT_RELEASE)
+-libgthread_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
 +libgthread11d_la_SOURCES = gthread.c
-+libgthread11d_la_LDFLAGS = \
-+	-version-info 2:1:0
++libgthread11d_la_LDFLAGS =  	-version-info 2:1:0
+ 
  
 -libgthread_la_LIBADD = @G_THREAD_LIBS@
 +libgthread11d_la_LIBADD = @G_THREAD_LIBS@
@@ -287,7 +283,7 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
  CONFIG_CLEAN_FILES = 
-@@ -118,13 +117,13 @@
+@@ -114,13 +114,13 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
@@ -303,22 +299,19 @@
 +testgthread_DEPENDENCIES =  ../libglib11d.la libgthread11d.la
  testgthread_LDFLAGS = 
  CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-@@ -137,10 +136,10 @@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -134,8 +134,8 @@
  
  TAR = tar
- GZIP = --best
+ GZIP_ENV = --best
 -SOURCES = $(libgthread_la_SOURCES) testgthread.c
 -OBJECTS = $(libgthread_la_OBJECTS) testgthread.o
 +SOURCES = $(libgthread11d_la_SOURCES) testgthread.c
 +OBJECTS = $(libgthread11d_la_OBJECTS) testgthread.o
  
--all: Makefile $(LTLIBRARIES) $(PROGRAMS)
-+all: Makefile $(LTLIBRARIES)
- 
+ all: all-redirect
  .SUFFIXES:
- .SUFFIXES: .S .c .lo .o .s
-@@ -215,8 +214,8 @@
+@@ -211,8 +211,8 @@
  
  maintainer-clean-libtool:
  
@@ -329,3 +322,12 @@
  
  mostlyclean-noinstPROGRAMS:
  
+@@ -291,7 +291,7 @@
+ install: install-am
+ uninstall-am: uninstall-libLTLIBRARIES
+ uninstall: uninstall-am
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
++all-am: Makefile $(LTLIBRARIES)
+ all-redirect: all-am
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
diff --git a/devel/glib12/files/patch-ad b/devel/glib12/files/patch-ad
index 9968cfa4611..6ad303c7ab4 100644
--- a/devel/glib12/files/patch-ad
+++ b/devel/glib12/files/patch-ad
@@ -1,15 +1,15 @@
---- configure.in.orig	Sun Jan 17 23:32:45 1999
-+++ configure.in	Tue Jan 19 11:43:21 1999
-@@ -247,7 +247,7 @@
+--- configure.in.orig	Thu Jan 28 09:59:01 1999
++++ configure.in	Thu Jan 28 23:13:01 1999
+@@ -250,7 +250,7 @@
  AC_CHECK_HEADERS(values.h, AC_DEFINE(HAVE_VALUES_H))
  
  # Check for some functions
--AC_CHECK_FUNCS(localtime_r rand_r lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll)
-+AC_CHECK_FUNCS(localtime_r rand_r lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp)
+-AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll)
++AC_CHECK_FUNCS(lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp)
  
  # Check for sys_errlist
  AC_MSG_CHECKING(for sys_errlist)
-@@ -682,11 +682,14 @@
+@@ -732,11 +732,13 @@
              	        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
  		fi
  		;;
@@ -21,7 +21,6 @@
 +	*-*-freebsd2.2* | *-*-freebsd3* | *-*-freebsd4*)
 +		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"
@@ -29,7 +28,7 @@
  		;;
      esac
  
-@@ -735,6 +738,9 @@
+@@ -785,6 +788,9 @@
  dnl ****************************************
  dnl *** GLib POLL* compatibility defines ***
  dnl ****************************************
diff --git a/devel/glib12/files/patch-ae b/devel/glib12/files/patch-ae
index 919ccf7fb70..0d750ce0a17 100644
--- a/devel/glib12/files/patch-ae
+++ b/devel/glib12/files/patch-ae
@@ -1,15 +1,15 @@
---- configure.orig	Sun Jan 17 23:35:47 1999
-+++ configure	Thu Jan 21 18:58:35 1999
-@@ -3609,7 +3609,7 @@
+--- configure.orig	Thu Jan 28 10:10:34 1999
++++ configure	Thu Jan 28 23:13:58 1999
+@@ -3750,7 +3750,7 @@
  
  
  # Check for some functions
--for ac_func in localtime_r rand_r lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll
-+for ac_func in localtime_r rand_r lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp
+-for ac_func in lstat strerror strsignal memmove vsnprintf strcasecmp strncasecmp poll
++for ac_func in 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
-@@ -5168,11 +5168,14 @@
+ echo "configure:3757: checking for $ac_func" >&5
+@@ -5453,11 +5453,13 @@
              	        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
  		fi
  		;;
@@ -21,7 +21,6 @@
 +	*-*-freebsd2.2* | *-*-freebsd3* | *-*-freebsd4*)
 +		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"
@@ -29,79 +28,79 @@
  		;;
      esac
  
-@@ -5181,7 +5184,7 @@
+@@ -5466,7 +5469,7 @@
      old_CPPFLAGS=$CPPFLAGS
      CPPFLAGS="$CPPFLAGS $G_THREAD_CFLAGS"
      cat > conftest.$ac_ext <<EOF
--#line 5185 "configure"
-+#line 5188 "configure"
+-#line 5470 "configure"
++#line 5473 "configure"
  #include "confdefs.h"
  #include <time.h>
  EOF
-@@ -5198,7 +5201,7 @@
+@@ -5483,7 +5486,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:5205: checking necessary compiler options" >&5
+-echo "configure:5487: checking necessary compiler options" >&5
++echo "configure:5490: checking necessary compiler options" >&5
  
      echo "$ac_t""$G_THREAD_CFLAGS" 1>&6
  else
-@@ -5218,7 +5221,7 @@
+@@ -5503,7 +5506,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:5225: checking size of $mutex_default_type" >&5
+-echo "configure:5507: checking size of $mutex_default_type" >&5
++echo "configure:5510: 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 +5229,7 @@
+@@ -5511,7 +5514,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 5233 "configure"
+-#line 5515 "configure"
++#line 5518 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #include <$mutex_header_file>
-@@ -5238,7 +5241,7 @@
+@@ -5523,7 +5526,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:5245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:5527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5530: \"$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
-@@ -5258,7 +5261,7 @@
+@@ -5543,7 +5546,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:5265: checking byte contents of $mutex_default_type" >&5
+-echo "configure:5547: checking byte contents of $mutex_default_type" >&5
++echo "configure:5550: 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 +5269,7 @@
+@@ -5551,7 +5554,7 @@
    glib_cv_byte_contents_gmutex=0
  else
    cat > conftest.$ac_ext <<EOF
--#line 5270 "configure"
-+#line 5273 "configure"
+-#line 5555 "configure"
++#line 5558 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #include <$mutex_header_file>
-@@ -5283,7 +5286,7 @@
+@@ -5568,7 +5571,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:5290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:5572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5575: \"$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
-@@ -5311,6 +5314,63 @@
+@@ -5596,6 +5599,63 @@
  
  
  
@@ -109,12 +108,12 @@
 +	for ac_func in poll
 +do
 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:5322: checking for $ac_func" >&5
++echo "configure:5607: 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 5327 "configure"
++#line 5612 "configure"
 +#include "confdefs.h"
 +/* System header to define __stub macros and hopefully few prototypes,
 +    which can conflict with char $ac_func(); below.  */
@@ -137,7 +136,7 @@
 +
 +; return 0; }
 +EOF
-+if { (eval echo configure:5350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:5635: \"$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
@@ -165,26 +164,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 +5379,7 @@
+@@ -5604,7 +5664,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:5383: checking system definitions for $glib_sysdef_msg" >&5
+-echo "configure:5608: checking system definitions for $glib_sysdef_msg" >&5
++echo "configure:5668: checking system definitions for $glib_sysdef_msg" >&5
  cat >confrun.c <<_______EOF
  #include <stdio.h>
  #include <sys/types.h>
-@@ -5346,11 +5406,11 @@
+@@ -5631,11 +5691,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 5410 "configure"
+-#line 5635 "configure"
++#line 5695 "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:5414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:5639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:5699: \"$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