path: root/source/l/gtk+/gtk+-1.2.10-autotools.patch

--- Makefile.in
+++ Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -133,7 +133,98 @@ bin_SCRIPTS = gtk-config
 # require automake 1.4
 AUTOMAKE_OPTIONS = 1.4
 
-EXTRA_DIST =  	HACKING			gtk+.spec.in	        gtk.m4          	makecopyright		TODO			NEWS.pre-1-0		ChangeLog.pre-1-0		README.cvs-commits		intl/libgettext.h		intl/po2tbl.sed.in		examples/aspectframe/Makefile  	examples/aspectframe/aspectframe.c  	examples/Makefile  	examples/README.1ST  	examples/extract.awk  	examples/extract.sh  	examples/base/Makefile  	examples/base/base.c  	examples/buttons/Makefile  	examples/buttons/buttons.c  	examples/buttons/info.xpm  	examples/calendar/Makefile  	examples/calendar/calendar.c  	examples/clist/Makefile  	examples/clist/clist.c  	examples/entry/Makefile  	examples/entry/entry.c  	examples/eventbox/Makefile  	examples/eventbox/eventbox.c  	examples/filesel/Makefile  	examples/filesel/filesel.c  	examples/gtkdial/Makefile  	examples/gtkdial/dial_test.c  	examples/gtkdial/gtkdial.c  	examples/gtkdial/gtkdial.h  	examples/helloworld/Makefile  	examples/helloworld/helloworld.c  	examples/helloworld2/Makefile  	examples/helloworld2/helloworld2.c  	examples/list/Makefile  	examples/list/list.c  	examples/menu/Makefile  	examples/menu/menu.c  	examples/menu/itemfactory.c  	examples/notebook/Makefile  	examples/notebook/notebook.c  	examples/packbox/Makefile  	examples/packbox/packbox.c  	examples/packer/Makefile  	examples/packer/pack.c  	examples/paned/Makefile  	examples/paned/paned.c  	examples/pixmap/Makefile  	examples/pixmap/pixmap.c  	examples/progressbar/Makefile  	examples/progressbar/progressbar.c  	examples/radiobuttons/Makefile  	examples/radiobuttons/radiobuttons.c  	examples/rangewidgets/Makefile  	examples/rangewidgets/rangewidgets.c  	examples/rulers/Makefile  	examples/rulers/rulers.c  	examples/scribble-simple/Makefile  	examples/scribble-simple/scribble-simple.c  	examples/scrolledwin/Makefile  	examples/scrolledwin/scrolledwin.c  	examples/selection/Makefile  	examples/selection/gettargets.c  	examples/selection/setselection.c  	examples/statusbar/Makefile  	examples/statusbar/statusbar.c  	examples/table/Makefile  	examples/table/table.c  	examples/text/Makefile  	examples/text/text.c  	examples/tictactoe/Makefile  	examples/tictactoe/tictactoe.c  	examples/tictactoe/tictactoe.h  	examples/tictactoe/ttt_test.c  	examples/tree/Makefile  	examples/tree/tree.c  	examples/wheelbarrow/Makefile  	examples/wheelbarrow/wheelbarrow.c  	examples/fixed/fixed.c  	examples/fixed/Makefile  	examples/frame/frame.c  	examples/frame/Makefile  	examples/spinbutton/spinbutton.c  	examples/spinbutton/Makefile  	examples/find-examples.sh 	gdk.pc.in gtk+.pc.in
+EXTRA_DIST = \
+	HACKING		\
+	gtk+.spec.in	\
+        gtk.m4          \
+	makecopyright	\
+	TODO		\
+	NEWS.pre-1-0	\
+	ChangeLog.pre-1-0	\
+	README.cvs-commits	\
+	intl/libgettext.h	\
+	intl/po2tbl.sed.in	\
+	examples/aspectframe/Makefile  \
+	examples/aspectframe/aspectframe.c  \
+	examples/Makefile  \
+	examples/README.1ST  \
+	examples/extract.awk  \
+	examples/extract.sh  \
+	examples/base/Makefile  \
+	examples/base/base.c  \
+	examples/buttons/Makefile  \
+	examples/buttons/buttons.c  \
+	examples/buttons/info.xpm  \
+	examples/calendar/Makefile  \
+	examples/calendar/calendar.c  \
+	examples/clist/Makefile  \
+	examples/clist/clist.c  \
+	examples/entry/Makefile  \
+	examples/entry/entry.c  \
+	examples/eventbox/Makefile  \
+	examples/eventbox/eventbox.c  \
+	examples/filesel/Makefile  \
+	examples/filesel/filesel.c  \
+	examples/gtkdial/Makefile  \
+	examples/gtkdial/dial_test.c  \
+	examples/gtkdial/gtkdial.c  \
+	examples/gtkdial/gtkdial.h  \
+	examples/helloworld/Makefile  \
+	examples/helloworld/helloworld.c  \
+	examples/helloworld2/Makefile  \
+	examples/helloworld2/helloworld2.c  \
+	examples/list/Makefile  \
+	examples/list/list.c  \
+	examples/menu/Makefile  \
+	examples/menu/menu.c  \
+	examples/menu/itemfactory.c  \
+	examples/notebook/Makefile  \
+	examples/notebook/notebook.c  \
+	examples/packbox/Makefile  \
+	examples/packbox/packbox.c  \
+	examples/packer/Makefile  \
+	examples/packer/pack.c  \
+	examples/paned/Makefile  \
+	examples/paned/paned.c  \
+	examples/pixmap/Makefile  \
+	examples/pixmap/pixmap.c  \
+	examples/progressbar/Makefile  \
+	examples/progressbar/progressbar.c  \
+	examples/radiobuttons/Makefile  \
+	examples/radiobuttons/radiobuttons.c  \
+	examples/rangewidgets/Makefile  \
+	examples/rangewidgets/rangewidgets.c  \
+	examples/rulers/Makefile  \
+	examples/rulers/rulers.c  \
+	examples/scribble-simple/Makefile  \
+	examples/scribble-simple/scribble-simple.c  \
+	examples/scrolledwin/Makefile  \
+	examples/scrolledwin/scrolledwin.c  \
+	examples/selection/Makefile  \
+	examples/selection/gettargets.c  \
+	examples/selection/setselection.c  \
+	examples/statusbar/Makefile  \
+	examples/statusbar/statusbar.c  \
+	examples/table/Makefile  \
+	examples/table/table.c  \
+	examples/text/Makefile  \
+	examples/text/text.c  \
+	examples/tictactoe/Makefile  \
+	examples/tictactoe/tictactoe.c  \
+	examples/tictactoe/tictactoe.h  \
+	examples/tictactoe/ttt_test.c  \
+	examples/tree/Makefile  \
+	examples/tree/tree.c  \
+	examples/wheelbarrow/Makefile  \
+	examples/wheelbarrow/wheelbarrow.c  \
+	examples/fixed/fixed.c  \
+	examples/fixed/Makefile  \
+	examples/frame/frame.c  \
+	examples/frame/Makefile  \
+	examples/spinbutton/spinbutton.c  \
+	examples/spinbutton/Makefile  \
+	examples/find-examples.sh \
+	gdk.pc.in gtk+.pc.in
 
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -163,9 +254,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -282,7 +373,7 @@ uninstall-pkgconfigDATA:
 all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive  \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
+	@set fnord $$MAKEFLAGS; amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -302,11 +393,11 @@ check-recursive installcheck-recursive i
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
+	@set fnord $$MAKEFLAGS; amf=$$2; \
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
+	  test "$$subdir" != "." || dot_seen=yes; \
 	done; \
 	test "$$dot_seen" = "no" && rev=". $$rev"; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -396,7 +487,12 @@ dist-all: distdir
 distdir: $(DISTFILES)
 	-rm -rf $(distdir)
 	mkdir $(distdir)
-	-chmod 777 $(distdir)
+	-chmod 755 $(distdir)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
 	$(mkinstalldirs) $(distdir)/examples $(distdir)/examples/aspectframe \
 	   $(distdir)/examples/base $(distdir)/examples/buttons \
 	   $(distdir)/examples/calendar $(distdir)/examples/clist \
@@ -433,7 +529,7 @@ distdir: $(DISTFILES)
 	    test -d $(distdir)/$$subdir \
 	    || mkdir $(distdir)/$$subdir \
 	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
+	    chmod 755 $(distdir)/$$subdir; \
 	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
 	      || exit 1; \
 	  fi; \
--- docs/Makefile.in
+++ docs/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -129,19 +129,135 @@ info_TEXINFOS = gdk.texi gtk.texi
 
 man_MANS = gtk-config.1
 
-TUTORIAL_FR_FILES = html/gtk_tut_fr-1.html   	html/gtk_tut_fr-2.html   	html/gtk_tut_fr-3.html   	html/gtk_tut_fr-4.html   	html/gtk_tut_fr-5.html   	html/gtk_tut_fr-6.html   	html/gtk_tut_fr-7.html   	html/gtk_tut_fr-8.html   	html/gtk_tut_fr-9.html   	html/gtk_tut_fr-10.html  	html/gtk_tut_fr-11.html  	html/gtk_tut_fr-12.html  	html/gtk_tut_fr-13.html  	html/gtk_tut_fr-14.html  	html/gtk_tut_fr-15.html  	html/gtk_tut_fr-16.html  	html/gtk_tut_fr-17.html  	html/gtk_tut_fr-18.html  	html/gtk_tut_fr-19.html  	html/gtk_tut_fr-20.html  	html/gtk_tut_fr-21.html  	html/gtk_tut_fr-22.html  	html/gtk_tut_fr-23.html  	html/gtk_tut_fr-24.html  	html/gtk_tut_fr.html text/gtk_tut_fr.txt
-
-
-TUTORIAL_FILES = text/gtk_tut.txt html/gtk_tut.html html/gtk_tut.html        	html/gtk_tut-1.html      	html/gtk_tut-2.html      	html/gtk_tut-3.html      	html/gtk_tut-4.html      	html/gtk_tut-5.html      	html/gtk_tut-6.html      	html/gtk_tut-7.html      	html/gtk_tut-8.html      	html/gtk_tut-9.html      	html/gtk_tut-10.html     	html/gtk_tut-11.html     	html/gtk_tut-12.html     	html/gtk_tut-13.html     	html/gtk_tut-14.html     	html/gtk_tut-15.html     	html/gtk_tut-16.html     	html/gtk_tut-17.html     	html/gtk_tut-18.html     	html/gtk_tut-19.html     	html/gtk_tut-20.html     	html/gtk_tut-21.html     	html/gtk_tut-22.html     	html/gtk_tut-23.html     	html/gtk_tut-24.html     	html/gtk_tut-25.html     	html/gtk_tut-26.html     	html/gtk_tut-27.html     	html/gtk_tut-28.html     	html/gtk_tut-29.html     	html/gtk_tut-30.html     	html/gtk_tut-31.html
-
-
-TUTORIAL_IT_FILES = html/gtk_tut_it.html     		html/gtk_tut_it-1.html   		html/gtk_tut_it-2.html   		html/gtk_tut_it-3.html   		html/gtk_tut_it-4.html   		html/gtk_tut_it-5.html   		html/gtk_tut_it-6.html   		html/gtk_tut_it-7.html   		html/gtk_tut_it-8.html   		html/gtk_tut_it-9.html   		html/gtk_tut_it-10.html  		html/gtk_tut_it-11.html  		html/gtk_tut_it-12.html  		html/gtk_tut_it-13.html  		html/gtk_tut_it-14.html  		html/gtk_tut_it-15.html  		html/gtk_tut_it-16.html  		html/gtk_tut_it-17.html  		html/gtk_tut_it-18.html  		html/gtk_tut_it-19.html  		html/gtk_tut_it-20.html  		html/gtk_tut_it-21.html  		html/gtk_tut_it-22.html  		html/gtk_tut_it-23.html  		html/gtk_tut_it-24.html			text/gtk_tut_it.txt
-
-
-FAQ_FILES = html/gtkfaq.html			html/gtkfaq-1.html       		html/gtkfaq-2.html       		html/gtkfaq-3.html       		html/gtkfaq-4.html       		html/gtkfaq-5.html       		html/gtkfaq-6.html       		html/gtkfaq-7.html			text/gtkfaq.txt
-
-
-EXTRA_DIST =  	Changes-1.2.txt				debugging.txt				developers.txt				refcounting.txt				styles.txt				text_widget.txt 			widget_system.txt 			generation.txt			        gtk-config.txt  	        	gtk-config.1.in				texinfo.tex 				macros.texi				gtkdocs_fix				gtkfaq.sgml				gtk_tut.sgml				gtk_tut_it.sgml				gtk_tut_fr.sgml				gtk_tut_packbox1.gif 			gtk_tut_packbox2.gif 			html/gtk_tut_table.gif			html/gtk_tut_packbox1.gif 		html/gtk_tut_packbox2.gif 		gtk_tut_table.gif			$(TUTORIAL_FILES)			$(TUTORIAL_FR_FILES)			$(TUTORIAL_IT_FILES)			$(FAQ_FILES)
+TUTORIAL_FR_FILES = html/gtk_tut_fr-1.html   	\
+html/gtk_tut_fr-2.html   	\
+html/gtk_tut_fr-3.html   	\
+html/gtk_tut_fr-4.html   	\
+html/gtk_tut_fr-5.html   	\
+html/gtk_tut_fr-6.html   	\
+html/gtk_tut_fr-7.html   	\
+html/gtk_tut_fr-8.html   	\
+html/gtk_tut_fr-9.html   	\
+html/gtk_tut_fr-10.html  	\
+html/gtk_tut_fr-11.html  	\
+html/gtk_tut_fr-12.html  	\
+html/gtk_tut_fr-13.html  	\
+html/gtk_tut_fr-14.html  	\
+html/gtk_tut_fr-15.html  	\
+html/gtk_tut_fr-16.html  	\
+html/gtk_tut_fr-17.html  	\
+html/gtk_tut_fr-18.html  	\
+html/gtk_tut_fr-19.html  	\
+html/gtk_tut_fr-20.html  	\
+html/gtk_tut_fr-21.html  	\
+html/gtk_tut_fr-22.html  	\
+html/gtk_tut_fr-23.html  	\
+html/gtk_tut_fr-24.html  	\
+html/gtk_tut_fr.html text/gtk_tut_fr.txt
+
+
+TUTORIAL_FILES = text/gtk_tut.txt html/gtk_tut.html \
+html/gtk_tut.html        	\
+html/gtk_tut-1.html      	\
+html/gtk_tut-2.html      	\
+html/gtk_tut-3.html      	\
+html/gtk_tut-4.html      	\
+html/gtk_tut-5.html      	\
+html/gtk_tut-6.html      	\
+html/gtk_tut-7.html      	\
+html/gtk_tut-8.html      	\
+html/gtk_tut-9.html      	\
+html/gtk_tut-10.html     	\
+html/gtk_tut-11.html     	\
+html/gtk_tut-12.html     	\
+html/gtk_tut-13.html     	\
+html/gtk_tut-14.html     	\
+html/gtk_tut-15.html     	\
+html/gtk_tut-16.html     	\
+html/gtk_tut-17.html     	\
+html/gtk_tut-18.html     	\
+html/gtk_tut-19.html     	\
+html/gtk_tut-20.html     	\
+html/gtk_tut-21.html     	\
+html/gtk_tut-22.html     	\
+html/gtk_tut-23.html     	\
+html/gtk_tut-24.html     	\
+html/gtk_tut-25.html     	\
+html/gtk_tut-26.html     	\
+html/gtk_tut-27.html     	\
+html/gtk_tut-28.html     	\
+html/gtk_tut-29.html     	\
+html/gtk_tut-30.html     	\
+html/gtk_tut-31.html
+
+
+TUTORIAL_IT_FILES = html/gtk_tut_it.html     	\
+	html/gtk_tut_it-1.html   	\
+	html/gtk_tut_it-2.html   	\
+	html/gtk_tut_it-3.html   	\
+	html/gtk_tut_it-4.html   	\
+	html/gtk_tut_it-5.html   	\
+	html/gtk_tut_it-6.html   	\
+	html/gtk_tut_it-7.html   	\
+	html/gtk_tut_it-8.html   	\
+	html/gtk_tut_it-9.html   	\
+	html/gtk_tut_it-10.html  	\
+	html/gtk_tut_it-11.html  	\
+	html/gtk_tut_it-12.html  	\
+	html/gtk_tut_it-13.html  	\
+	html/gtk_tut_it-14.html  	\
+	html/gtk_tut_it-15.html  	\
+	html/gtk_tut_it-16.html  	\
+	html/gtk_tut_it-17.html  	\
+	html/gtk_tut_it-18.html  	\
+	html/gtk_tut_it-19.html  	\
+	html/gtk_tut_it-20.html  	\
+	html/gtk_tut_it-21.html  	\
+	html/gtk_tut_it-22.html  	\
+	html/gtk_tut_it-23.html  	\
+	html/gtk_tut_it-24.html		\
+	text/gtk_tut_it.txt
+
+
+FAQ_FILES = html/gtkfaq.html		\
+	html/gtkfaq-1.html       	\
+	html/gtkfaq-2.html       	\
+	html/gtkfaq-3.html       	\
+	html/gtkfaq-4.html       	\
+	html/gtkfaq-5.html       	\
+	html/gtkfaq-6.html       	\
+	html/gtkfaq-7.html		\
+	text/gtkfaq.txt
+
+
+EXTRA_DIST =  \
+	Changes-1.2.txt			\
+	debugging.txt			\
+	developers.txt			\
+	refcounting.txt			\
+	styles.txt			\
+	text_widget.txt 		\
+	widget_system.txt 		\
+	generation.txt			\
+        gtk-config.txt  	        \
+	gtk-config.1.in			\
+	texinfo.tex 			\
+	macros.texi			\
+	gtkdocs_fix			\
+	gtkfaq.sgml			\
+	gtk_tut.sgml			\
+	gtk_tut_it.sgml			\
+	gtk_tut_fr.sgml			\
+	gtk_tut_packbox1.gif 		\
+	gtk_tut_packbox2.gif 		\
+	html/gtk_tut_table.gif		\
+	html/gtk_tut_packbox1.gif 	\
+	html/gtk_tut_packbox2.gif 	\
+	gtk_tut_table.gif		\
+	$(TUTORIAL_FILES)		\
+	$(TUTORIAL_FR_FILES)		\
+	$(TUTORIAL_IT_FILES)		\
+	$(FAQ_FILES)
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
@@ -165,9 +281,9 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps docs/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -257,7 +373,7 @@ uninstall-info:
 	else ii=; fi; \
 	list='$(INFO_DEPS)'; \
 	for file in $$list; do \
-	  test -z "$ii" \
+	  test -z "$$ii" \
 	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
 	done
 	@$(NORMAL_UNINSTALL)
@@ -343,6 +459,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
 subdir = docs
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu docs/Makefile
 	$(mkinstalldirs) $(distdir)/html $(distdir)/text
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
--- gdk/Makefile.in
+++ gdk/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,15 @@ x_ldflags = @x_ldflags@
 x_libs = @x_libs@
 xinput_progs = @xinput_progs@
 
-INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gdk\"		-I$(top_srcdir)			@GTK_DEBUG_FLAGS@ 		@GTK_XIM_FLAGS@			@GTK_LOCALE_FLAGS@		@GLIB_CFLAGS@			@x_cflags@ 		@STRIP_END@
+INCLUDES = @STRIP_BEGIN@ \
+	-DG_LOG_DOMAIN=\"Gdk\"	\
+	-I$(top_srcdir)		\
+	@GTK_DEBUG_FLAGS@ 	\
+	@GTK_XIM_FLAGS@		\
+	@GTK_LOCALE_FLAGS@	\
+	@GLIB_CFLAGS@		\
+	@x_cflags@ 		\
+@STRIP_END@
 
 
 #
@@ -135,16 +143,65 @@ lib_LTLIBRARIES = libgdk.la
 
 # libtool stuff: set version and export symbols for resolving
 libgdkincludedir = $(includedir)/gtk-1.2/gdk
-libgdk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	-export-dynamic 	@GLIB_DEPLIBS@		@x_ldflags@		@x_libs@		-lm		@STRIP_END@
+libgdk_la_LDFLAGS = @STRIP_BEGIN@ \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+	-release $(LT_RELEASE) \
+	-export-dynamic \
+	-no-undefined -Wl,--no-undefined \
+	$(filter-out -lgmodule -ldl, @GLIB_DEPLIBS@) \
+	@x_ldflags@	\
+	@x_libs@	\
+@STRIP_END@
 
 
 #
 # setup source file variables
 #
 # GDK header files for public installation (non-generated)
-gdk_public_h_sources = @STRIP_BEGIN@ 	gdk.h			gdkcursors.h		gdkrgb.h		gdki18n.h		gdkkeysyms.h		gdkprivate.h		gdktypes.h		gdkx.h		@STRIP_END@
-
-gdk_c_sources = @STRIP_BEGIN@ 	gdk.c			gdkcc.c			gdkcolor.c		gdkcursor.c		gdkdnd.c		gdkdraw.c		gdkevents.c     	gdkfont.c		gdkgc.c			gdkglobals.c		gdkim.c			gdkimage.c		gdkinput.c		gdkinput.h		gdkinputnone.h  	gdkinputcommon.h 	gdkinputgxi.h		gdkinputxfree.h		gdkpixmap.c		gdkproperty.c		gdkrgb.c		gdkrectangle.c		gdkregion.c		gdkselection.c		gdkvisual.c		gdkwindow.c		gdkxid.c 		MwmUtil.h       	gxid_lib.h		gxid_proto.h	        gxid_lib.c	@STRIP_END@
+gdk_public_h_sources = @STRIP_BEGIN@ \
+	gdk.h		\
+	gdkcursors.h	\
+	gdkrgb.h	\
+	gdki18n.h	\
+	gdkkeysyms.h	\
+	gdkprivate.h	\
+	gdktypes.h	\
+	gdkx.h		\
+@STRIP_END@
+
+gdk_c_sources = @STRIP_BEGIN@ \
+	gdk.c		\
+	gdkcc.c		\
+	gdkcolor.c	\
+	gdkcursor.c	\
+	gdkdnd.c	\
+	gdkdraw.c	\
+	gdkevents.c     \
+	gdkfont.c	\
+	gdkgc.c		\
+	gdkglobals.c	\
+	gdkim.c		\
+	gdkimage.c	\
+	gdkinput.c	\
+	gdkinput.h	\
+	gdkinputnone.h  \
+	gdkinputcommon.h\
+	gdkinputgxi.h	\
+	gdkinputxfree.h	\
+	gdkpixmap.c	\
+	gdkproperty.c	\
+	gdkrgb.c	\
+	gdkrectangle.c	\
+	gdkregion.c	\
+	gdkselection.c	\
+	gdkvisual.c	\
+	gdkwindow.c	\
+	gdkxid.c 	\
+	MwmUtil.h       \
+	gxid_lib.h	\
+	gxid_proto.h	\
+        gxid_lib.c	\
+@STRIP_END@
 
 
 #
@@ -161,7 +218,12 @@ EXTRA_DIST =
 #
 EXTRA_PROGRAMS = gxid
 bin_PROGRAMS = @xinput_progs@
-LDADDS = @STRIP_BEGIN@ 	@x_ldflags@		@x_libs@		@GLIB_LIBS@		-lm		@STRIP_END@
+LDADDS = @STRIP_BEGIN@ \
+	@x_ldflags@	\
+	@x_libs@	\
+	@GLIB_LIBS@	\
+	-lm		\
+@STRIP_END@
 
 gxid_SOURCES = gxid.c
 gxid_LDADD = $(LDADDS)
@@ -204,6 +266,13 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
 
 TAR = gtar
 GZIP_ENV = --best
+DEP_FILES =  .deps/gdk.P .deps/gdkcc.P .deps/gdkcolor.P \
+.deps/gdkcursor.P .deps/gdkdnd.P .deps/gdkdraw.P .deps/gdkevents.P \
+.deps/gdkfont.P .deps/gdkgc.P .deps/gdkglobals.P .deps/gdkim.P \
+.deps/gdkimage.P .deps/gdkinput.P .deps/gdkpixmap.P .deps/gdkproperty.P \
+.deps/gdkrectangle.P .deps/gdkregion.P .deps/gdkrgb.P \
+.deps/gdkselection.P .deps/gdkvisual.P .deps/gdkwindow.P .deps/gdkxid.P \
+.deps/gxid.P .deps/gxid_lib.P
 SOURCES = $(libgdk_la_SOURCES) $(gxid_SOURCES)
 OBJECTS = $(libgdk_la_OBJECTS) $(gxid_OBJECTS)
 
@@ -211,9 +280,9 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps gdk/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu gdk/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -243,9 +312,6 @@ uninstall-libLTLIBRARIES:
 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
 	done
 
-.c.o:
-	$(COMPILE) -c $<
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -262,9 +328,6 @@ distclean-compile:
 
 maintainer-clean-compile:
 
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
 .s.lo:
 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 
@@ -362,6 +425,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
 subdir = gdk
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu gdk/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -372,55 +440,38 @@ distdir: $(DISTFILES)
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-gdk.lo gdk.o : gdk.c ../config.h gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
-	gdkprivate.h gdkinput.h gdkx.h gdkprivate.h gdki18n.h \
-	gdkkeysyms.h
-gdkcc.lo gdkcc.o : gdkcc.c gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
-	gdkprivate.h gdkx.h gdkprivate.h
-gdkcolor.lo gdkcolor.o : gdkcolor.c gdk.h gdktypes.h gdkcursors.h \
-	gdkrgb.h gdkprivate.h gdkx.h gdkprivate.h
-gdkcursor.lo gdkcursor.o : gdkcursor.c gdk.h gdktypes.h gdkcursors.h \
-	gdkrgb.h gdkprivate.h
-gdkdnd.lo gdkdnd.o : gdkdnd.c gdkx.h gdkprivate.h gdktypes.h \
-	gdkcursors.h gdk.h gdkrgb.h
-gdkdraw.lo gdkdraw.o : gdkdraw.c gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
-	gdkprivate.h
-gdkevents.lo gdkevents.o : gdkevents.c gdk.h gdktypes.h gdkcursors.h \
-	gdkrgb.h gdkx.h gdkprivate.h gdkprivate.h gdkkeysyms.h \
-	../config.h gdkinput.h
-gdkfont.lo gdkfont.o : gdkfont.c gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
-	gdkprivate.h ../config.h
-gdkgc.lo gdkgc.o : gdkgc.c gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
-	gdkprivate.h
-gdkglobals.lo gdkglobals.o : gdkglobals.c gdktypes.h gdkcursors.h \
-	gdkprivate.h gdktypes.h ../config.h
-gdkim.lo gdkim.o : gdkim.c gdk.h gdktypes.h gdkcursors.h gdkrgb.h \
-	gdkprivate.h gdki18n.h gdkx.h gdkprivate.h ../config.h
-gdkimage.lo gdkimage.o : gdkimage.c ../config.h gdk.h gdktypes.h \
-	gdkcursors.h gdkrgb.h gdkprivate.h
-gdkinput.lo gdkinput.o : gdkinput.c ../config.h gdk.h gdktypes.h \
-	gdkcursors.h gdkrgb.h gdkx.h gdkprivate.h gdkprivate.h \
-	gdkinput.h gdkinputnone.h gdkinputcommon.h gdkinputxfree.h \
-	gdkinputgxi.h
-gdkpixmap.lo gdkpixmap.o : gdkpixmap.c ../config.h gdk.h gdktypes.h \
-	gdkcursors.h gdkrgb.h gdkprivate.h
-gdkproperty.lo gdkproperty.o : gdkproperty.c gdk.h gdktypes.h \
-	gdkcursors.h gdkrgb.h gdkprivate.h
-gdkrectangle.lo gdkrectangle.o : gdkrectangle.c gdk.h gdktypes.h \
-	gdkcursors.h gdkrgb.h
-gdkregion.lo gdkregion.o : gdkregion.c gdk.h gdktypes.h gdkcursors.h \
-	gdkrgb.h gdkprivate.h
-gdkrgb.lo gdkrgb.o : gdkrgb.c ../config.h gdk.h gdktypes.h gdkcursors.h \
-	gdkrgb.h gdkprivate.h gdkrgb.h
-gdkselection.lo gdkselection.o : gdkselection.c gdk.h gdktypes.h \
-	gdkcursors.h gdkrgb.h gdkprivate.h gdkx.h gdkprivate.h
-gdkvisual.lo gdkvisual.o : gdkvisual.c gdk.h gdktypes.h gdkcursors.h \
-	gdkrgb.h gdkprivate.h gdkx.h gdkprivate.h
-gdkwindow.lo gdkwindow.o : gdkwindow.c gdk.h gdktypes.h gdkcursors.h \
-	gdkrgb.h ../config.h gdkinput.h gdkprivate.h MwmUtil.h
-gdkxid.lo gdkxid.o : gdkxid.c gdkprivate.h gdktypes.h gdkcursors.h
-gxid_lib.lo gxid_lib.o : gxid_lib.c ../config.h gxid_lib.h gxid_proto.h
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -462,19 +513,19 @@ maintainer-clean-generic:
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-binPROGRAMS \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
 clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool \
-		clean-binPROGRAMS clean-tags clean-generic \
+		clean-binPROGRAMS clean-tags clean-depend clean-generic \
 		mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-libLTLIBRARIES distclean-compile \
 		distclean-libtool distclean-binPROGRAMS distclean-tags \
-		distclean-generic clean-am
+		distclean-depend distclean-generic clean-am
 	-rm -f libtool
 
 distclean: distclean-am
@@ -482,7 +533,8 @@ distclean: distclean-am
 maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-binPROGRAMS maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -497,12 +549,13 @@ maintainer-clean-libtool mostlyclean-bin
 clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
 install-binPROGRAMS uninstall-libgdkincludeHEADERS \
 install-libgdkincludeHEADERS tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 #
--- gtk/Makefile.in
+++ gtk/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -125,7 +125,20 @@ x_ldflags = @x_ldflags@
 x_libs = @x_libs@
 xinput_progs = @xinput_progs@
 
-INCLUDES = @STRIP_BEGIN@ 	-DG_LOG_DOMAIN=\"Gtk\"					-DGTK_DISABLE_COMPAT_H					-DGTK_LIBDIR=\"$(libdir)\"	     	        	-DGTK_DATA_PREFIX=\"$(prefix)\"				-DGTK_SYSCONFDIR=\"$(sysconfdir)\"			-DGTK_LOCALEDIR=\"$(gtklocaledir)\"			-I$(top_srcdir)						@GTK_DEBUG_FLAGS@					@GTK_XIM_FLAGS@						@GTK_LOCALE_FLAGS@					@GLIB_CFLAGS@						@x_cflags@					@STRIP_END@
+INCLUDES = @STRIP_BEGIN@ \
+	-DG_LOG_DOMAIN=\"Gtk\"				\
+	-DGTK_DISABLE_COMPAT_H				\
+	-DGTK_LIBDIR=\"$(libdir)\"	     	        \
+	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
+	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
+	-DGTK_LOCALEDIR=\"$(gtklocaledir)\"		\
+	-I$(top_srcdir)					\
+	@GTK_DEBUG_FLAGS@				\
+	@GTK_XIM_FLAGS@					\
+	@GTK_LOCALE_FLAGS@				\
+	@GLIB_CFLAGS@					\
+	@x_cflags@					\
+@STRIP_END@
 
 
 #
@@ -135,7 +148,20 @@ lib_LTLIBRARIES = libgtk.la
 
 # libtool stuff: set version and export symbols for resolving
 libgtkincludedir = $(includedir)/gtk-1.2/gtk
-libgtk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)		-release $(LT_RELEASE) 						-export-dynamic							@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm							@STRIP_END@
+
+libgtk_la_DEPENDENCIES = $(top_builddir)/gdk/libgdk.la
+libgtk_la_LIBADD = $(top_builddir)/gdk/libgdk.la
+
+libgtk_la_LDFLAGS = @STRIP_BEGIN@ \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
+	-release $(LT_RELEASE) 					\
+	-export-dynamic						\
+	-no-undefined -Wl,--no-undefined			\
+	$(filter-out -ldl, @GLIB_DEPLIBS@)			\
+	@x_ldflags@						\
+	$(filter-out -lXi -lXext, @x_libs@)			\
+	-lm							\
+@STRIP_END@
 
 #	$(top_builddir)/gdk/libgdk.la
 
@@ -143,13 +169,233 @@ libgtk_la_LDFLAGS = @STRIP_BEGIN@ 	-vers
 # setup source file variables
 #
 # GTK+ header files for public installation (non-generated)
-gtk_public_h_sources = @STRIP_BEGIN@ 	gtk.h				gtkaccelgroup.h			gtkaccellabel.h			gtkadjustment.h			gtkalignment.h			gtkarg.h			gtkarrow.h			gtkaspectframe.h		gtkbin.h			gtkbindings.h			gtkbbox.h			gtkbox.h			gtkbutton.h			gtkcalendar.h			gtkcheckbutton.h		gtkcheckmenuitem.h		gtkclist.h			gtkcolorsel.h			gtkcombo.h			gtkcompat.h			gtkcontainer.h			gtkctree.h			gtkcurve.h			gtkdata.h			gtkdebug.h              	gtkdialog.h			gtkdnd.h			gtkdrawingarea.h		gtkeditable.h           	gtkentry.h			gtkenums.h			gtkeventbox.h			gtkfilesel.h			gtkfixed.h			gtkfontsel.h			gtkframe.h			gtkgamma.h			gtkgc.h				gtkhandlebox.h			gtkhbbox.h			gtkhbox.h			gtkhpaned.h			gtkhruler.h			gtkhscale.h			gtkhscrollbar.h			gtkhseparator.h			gtkimage.h			gtkinputdialog.h		gtkinvisible.h			gtkitem.h			gtkitemfactory.h		gtklabel.h			gtklayout.h             	gtklist.h			gtklistitem.h			gtkmain.h			gtkmenu.h			gtkmenubar.h			gtkmenufactory.h		gtkmenuitem.h			gtkmenushell.h			gtkmisc.h			gtknotebook.h			gtkobject.h			gtkoptionmenu.h			gtkpacker.h			gtkpaned.h			gtkpixmap.h			gtkplug.h			gtkpreview.h			gtkprivate.h			gtkprogress.h			gtkprogressbar.h		gtkradiobutton.h		gtkradiomenuitem.h		gtkrange.h			gtkrc.h				gtkruler.h			gtkscale.h			gtkscrollbar.h			gtkscrolledwindow.h		gtkselection.h			gtkseparator.h			gtksignal.h			gtksocket.h			gtkspinbutton.h			gtkstyle.h			gtkstatusbar.h			gtktable.h			gtktearoffmenuitem.h    	gtktext.h			gtkthemes.h			gtktipsquery.h			gtktogglebutton.h		gtktoolbar.h			gtktooltips.h			gtktree.h			gtktreeitem.h			gtktypeutils.h			gtkvbbox.h			gtkvbox.h			gtkviewport.h			gtkvpaned.h			gtkvruler.h			gtkvscale.h			gtkvscrollbar.h			gtkvseparator.h			gtkwidget.h			gtkwindow.h		@STRIP_END@
+gtk_public_h_sources = @STRIP_BEGIN@ \
+	gtk.h			\
+	gtkaccelgroup.h		\
+	gtkaccellabel.h		\
+	gtkadjustment.h		\
+	gtkalignment.h		\
+	gtkarg.h		\
+	gtkarrow.h		\
+	gtkaspectframe.h	\
+	gtkbin.h		\
+	gtkbindings.h		\
+	gtkbbox.h		\
+	gtkbox.h		\
+	gtkbutton.h		\
+	gtkcalendar.h		\
+	gtkcheckbutton.h	\
+	gtkcheckmenuitem.h	\
+	gtkclist.h		\
+	gtkcolorsel.h		\
+	gtkcombo.h		\
+	gtkcompat.h		\
+	gtkcontainer.h		\
+	gtkctree.h		\
+	gtkcurve.h		\
+	gtkdata.h		\
+	gtkdebug.h              \
+	gtkdialog.h		\
+	gtkdnd.h		\
+	gtkdrawingarea.h	\
+	gtkeditable.h           \
+	gtkentry.h		\
+	gtkenums.h		\
+	gtkeventbox.h		\
+	gtkfilesel.h		\
+	gtkfixed.h		\
+	gtkfontsel.h		\
+	gtkframe.h		\
+	gtkgamma.h		\
+	gtkgc.h			\
+	gtkhandlebox.h		\
+	gtkhbbox.h		\
+	gtkhbox.h		\
+	gtkhpaned.h		\
+	gtkhruler.h		\
+	gtkhscale.h		\
+	gtkhscrollbar.h		\
+	gtkhseparator.h		\
+	gtkimage.h		\
+	gtkinputdialog.h	\
+	gtkinvisible.h		\
+	gtkitem.h		\
+	gtkitemfactory.h	\
+	gtklabel.h		\
+	gtklayout.h             \
+	gtklist.h		\
+	gtklistitem.h		\
+	gtkmain.h		\
+	gtkmenu.h		\
+	gtkmenubar.h		\
+	gtkmenufactory.h	\
+	gtkmenuitem.h		\
+	gtkmenushell.h		\
+	gtkmisc.h		\
+	gtknotebook.h		\
+	gtkobject.h		\
+	gtkoptionmenu.h		\
+	gtkpacker.h		\
+	gtkpaned.h		\
+	gtkpixmap.h		\
+	gtkplug.h		\
+	gtkpreview.h		\
+	gtkprivate.h		\
+	gtkprogress.h		\
+	gtkprogressbar.h	\
+	gtkradiobutton.h	\
+	gtkradiomenuitem.h	\
+	gtkrange.h		\
+	gtkrc.h			\
+	gtkruler.h		\
+	gtkscale.h		\
+	gtkscrollbar.h		\
+	gtkscrolledwindow.h	\
+	gtkselection.h		\
+	gtkseparator.h		\
+	gtksignal.h		\
+	gtksocket.h		\
+	gtkspinbutton.h		\
+	gtkstyle.h		\
+	gtkstatusbar.h		\
+	gtktable.h		\
+	gtktearoffmenuitem.h    \
+	gtktext.h		\
+	gtkthemes.h		\
+	gtktipsquery.h		\
+	gtktogglebutton.h	\
+	gtktoolbar.h		\
+	gtktooltips.h		\
+	gtktree.h		\
+	gtktreeitem.h		\
+	gtktypeutils.h		\
+	gtkvbbox.h		\
+	gtkvbox.h		\
+	gtkviewport.h		\
+	gtkvpaned.h		\
+	gtkvruler.h		\
+	gtkvscale.h		\
+	gtkvscrollbar.h		\
+	gtkvseparator.h		\
+	gtkwidget.h		\
+	gtkwindow.h		\
+@STRIP_END@
 
 # GTK+ header files that don't get installed
-gtk_private_h_sources = @STRIP_BEGIN@ @STRIP_END@
+gtk_private_h_sources = @STRIP_BEGIN@ \
+@STRIP_END@
 
 # GTK+ C sources to build the library from
-gtk_c_sources = @STRIP_BEGIN@ 	gtkaccelgroup.c			gtkaccellabel.c			gtkadjustment.c			gtkalignment.c			gtkarg.c			gtkarrow.c			gtkaspectframe.c		gtkbin.c			gtkbindings.c			gtkbbox.c			gtkbox.c			gtkbutton.c			gtkcalendar.c			gtkcheckbutton.c		gtkcheckmenuitem.c		gtkclist.c			gtkcolorsel.c			gtkcombo.c			gtkcontainer.c			gtkctree.c			gtkcurve.c			gtkdata.c			gtkdialog.c			gtkdnd.c			gtkdrawingarea.c		gtkeditable.c           	gtkentry.c			gtkeventbox.c			gtkfilesel.c			gtkfixed.c			gtkfontsel.c            	gtkframe.c			gtkgamma.c			gtkgc.c				gtkhandlebox.c			gtkhbbox.c			gtkhbox.c			gtkhpaned.c			gtkhruler.c			gtkhscale.c			gtkhscrollbar.c			gtkhseparator.c			gtkimage.c			gtkinputdialog.c		gtkintl.h			gtkinvisible.c			gtkitem.c			gtkitemfactory.c		gtklabel.c			gtklayout.c			gtklist.c			gtklistitem.c			gtkmain.c			gtkmarshal.c			gtkmenu.c			gtkmenubar.c			gtkmenufactory.c		gtkmenuitem.c			gtkmenushell.c			gtkmisc.c			gtknotebook.c			gtkobject.c			gtkoptionmenu.c			gtkpacker.c			gtkpaned.c			gtkpixmap.c			gtkplug.c               	gtkpreview.c			gtkprogress.c			gtkprogressbar.c		gtkradiobutton.c		gtkradiomenuitem.c		gtkrange.c			gtkrc.c				gtkruler.c			gtkscale.c			gtkscrollbar.c			gtkscrolledwindow.c		gtkselection.c			gtkseparator.c			gtksignal.c			gtksocket.c             	gtkspinbutton.c			gtkstyle.c			gtkstatusbar.c			gtktable.c			gtktearoffmenuitem.c    	gtktext.c			gtkthemes.c			gtktipsquery.c			gtktogglebutton.c		gtktoolbar.c			gtktooltips.c			gtktree.c			gtktreeitem.c			gtktypeutils.c			gtkvbbox.c			gtkvbox.c			gtkviewport.c			gtkvpaned.c			gtkvruler.c			gtkvscale.c			gtkvscrollbar.c			gtkvseparator.c			gtkwidget.c			gtkwindow.c			fnmatch.c			fnmatch.h		@STRIP_END@
+gtk_c_sources = @STRIP_BEGIN@ \
+	gtkaccelgroup.c		\
+	gtkaccellabel.c		\
+	gtkadjustment.c		\
+	gtkalignment.c		\
+	gtkarg.c		\
+	gtkarrow.c		\
+	gtkaspectframe.c	\
+	gtkbin.c		\
+	gtkbindings.c		\
+	gtkbbox.c		\
+	gtkbox.c		\
+	gtkbutton.c		\
+	gtkcalendar.c		\
+	gtkcheckbutton.c	\
+	gtkcheckmenuitem.c	\
+	gtkclist.c		\
+	gtkcolorsel.c		\
+	gtkcombo.c		\
+	gtkcontainer.c		\
+	gtkctree.c		\
+	gtkcurve.c		\
+	gtkdata.c		\
+	gtkdialog.c		\
+	gtkdnd.c		\
+	gtkdrawingarea.c	\
+	gtkeditable.c           \
+	gtkentry.c		\
+	gtkeventbox.c		\
+	gtkfilesel.c		\
+	gtkfixed.c		\
+	gtkfontsel.c            \
+	gtkframe.c		\
+	gtkgamma.c		\
+	gtkgc.c			\
+	gtkhandlebox.c		\
+	gtkhbbox.c		\
+	gtkhbox.c		\
+	gtkhpaned.c		\
+	gtkhruler.c		\
+	gtkhscale.c		\
+	gtkhscrollbar.c		\
+	gtkhseparator.c		\
+	gtkimage.c		\
+	gtkinputdialog.c	\
+	gtkintl.h		\
+	gtkinvisible.c		\
+	gtkitem.c		\
+	gtkitemfactory.c	\
+	gtklabel.c		\
+	gtklayout.c		\
+	gtklist.c		\
+	gtklistitem.c		\
+	gtkmain.c		\
+	gtkmarshal.c		\
+	gtkmenu.c		\
+	gtkmenubar.c		\
+	gtkmenufactory.c	\
+	gtkmenuitem.c		\
+	gtkmenushell.c		\
+	gtkmisc.c		\
+	gtknotebook.c		\
+	gtkobject.c		\
+	gtkoptionmenu.c		\
+	gtkpacker.c		\
+	gtkpaned.c		\
+	gtkpixmap.c		\
+	gtkplug.c               \
+	gtkpreview.c		\
+	gtkprogress.c		\
+	gtkprogressbar.c	\
+	gtkradiobutton.c	\
+	gtkradiomenuitem.c	\
+	gtkrange.c		\
+	gtkrc.c			\
+	gtkruler.c		\
+	gtkscale.c		\
+	gtkscrollbar.c		\
+	gtkscrolledwindow.c	\
+	gtkselection.c		\
+	gtkseparator.c		\
+	gtksignal.c		\
+	gtksocket.c             \
+	gtkspinbutton.c		\
+	gtkstyle.c		\
+	gtkstatusbar.c		\
+	gtktable.c		\
+	gtktearoffmenuitem.c    \
+	gtktext.c		\
+	gtkthemes.c		\
+	gtktipsquery.c		\
+	gtktogglebutton.c	\
+	gtktoolbar.c		\
+	gtktooltips.c		\
+	gtktree.c		\
+	gtktreeitem.c		\
+	gtktypeutils.c		\
+	gtkvbbox.c		\
+	gtkvbox.c		\
+	gtkviewport.c		\
+	gtkvpaned.c		\
+	gtkvruler.c		\
+	gtkvscale.c		\
+	gtkvscrollbar.c		\
+	gtkvseparator.c		\
+	gtkwidget.c		\
+	gtkwindow.c		\
+	fnmatch.c		\
+	fnmatch.h		\
+@STRIP_END@
 
 # we use our own built_sources variable rules to avoid automake's
 # BUILT_SOURCES oddities
@@ -158,18 +404,43 @@ gtk_c_sources = @STRIP_BEGIN@ 	gtkaccelg
 # content
 #
 # built sources that don't get installed
-gtk_built_sources = @STRIP_BEGIN@ 	stamp-gtk.defs			stamp-gtktypebuiltins.h		stamp-gtkmarshal.h		gtktypebuiltins_vars.c		gtktypebuiltins_ids.c		gtktypebuiltins_evals.c		gtkmarshal.c			gtk.defs		@STRIP_END@
+gtk_built_sources = @STRIP_BEGIN@ \
+	stamp-gtk.defs		\
+	stamp-gtktypebuiltins.h	\
+	stamp-gtkmarshal.h	\
+	gtktypebuiltins_vars.c	\
+	gtktypebuiltins_ids.c	\
+	gtktypebuiltins_evals.c	\
+	gtkmarshal.c		\
+	gtk.defs		\
+@STRIP_END@
 
 # built sources that get installed with the header files
-gtk_built_public_sources = @STRIP_BEGIN@ 	gtkmarshal.h			gtktypebuiltins.h	@STRIP_END@
+gtk_built_public_sources = @STRIP_BEGIN@ \
+	gtkmarshal.h		\
+	gtktypebuiltins.h	\
+@STRIP_END@
 
 # non-header sources (headers should be specified in the above variables)
 # that don't serve as direct make target sources, i.e. they don't have
 # their own .lo rules and don't get publically installed
-gtk_extra_sources = @STRIP_BEGIN@ 	gtkfeatures.h.in		makeenums.pl			makeenums.awk			maketypes.awk			makeenums.h			gtkargcollector.c		gtk-boxed.defs			genmarshal.pl			gtkmarshal.list		@STRIP_END@
+gtk_extra_sources = @STRIP_BEGIN@ \
+	gtkfeatures.h.in	\
+	makeenums.pl		\
+	makeenums.awk		\
+	maketypes.awk		\
+	makeenums.h		\
+	gtkargcollector.c	\
+	gtk-boxed.defs		\
+	genmarshal.pl		\
+	gtkmarshal.list		\
+@STRIP_END@
 
 # Extra headers that are used for enum type array/id generation
-gdk_headers = @STRIP_BEGIN@ 	../gdk/gdktypes.h		../gdk/gdkrgb.h		@STRIP_END@
+gdk_headers = @STRIP_BEGIN@ \
+	../gdk/gdktypes.h	\
+	../gdk/gdkrgb.h		\
+@STRIP_END@
 
 
 #
@@ -180,7 +451,29 @@ libgtk_la_SOURCES = $(gtk_c_sources)
 MAINTAINERCLEANFILES =  $(gtk_built_public_sources) $(gtk_built_sources)
 EXTRA_HEADERS =  
 
-EXTRA_DIST =  $(gtk_private_h_sources) $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources) @STRIP_BEGIN@ 	testgtk.1 			testgtkrc 			testgtkrc2 			circles.xbm			line-arrow.xbm 			line-wrap.xbm 			tree_plus.xbm			tree_minus.xbm          	3DRings.xpm			FilesQueue.xpm			Modeller.xpm			check-y.xpm			check-n.xpm			marble.xpm			tree_minus.xpm			tree_plus.xpm			test.xpm			check-y.xpm			check-n.xpm			test.xpm			$(gtkconf_DATA)		@STRIP_END@
+EXTRA_DIST =  $(gtk_private_h_sources) $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources) @STRIP_BEGIN@ \
+	testgtk.1 		\
+	testgtkrc 		\
+	testgtkrc2 		\
+	circles.xbm		\
+	line-arrow.xbm 		\
+	line-wrap.xbm 		\
+	tree_plus.xbm		\
+	tree_minus.xbm          \
+	3DRings.xpm		\
+	FilesQueue.xpm		\
+	Modeller.xpm		\
+	check-y.xpm		\
+	check-n.xpm		\
+	marble.xpm		\
+	tree_minus.xpm		\
+	tree_plus.xpm		\
+	test.xpm		\
+	check-y.xpm		\
+	check-n.xpm		\
+	test.xpm		\
+	$(gtkconf_DATA)		\
+@STRIP_END@
 
 
 #
@@ -191,7 +484,14 @@ gen_sources = xgen-gdef xgen-gtbh xgen-g
 CLEANFILES =  $(gen_sources)
 
 gtkconfdir = $(sysconfdir)/gtk
-gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja 	gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 	gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 	gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 	gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps 	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
+gtkconf_DATA = gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \
+	gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk \
+	gtkrc.utf8 gtkrc.iso88592 \
+	gtkrc.iso88593 gtkrc.iso88595 gtkrc.iso88597 \
+	gtkrc.iso88599 gtkrc.iso885913 gtkrc.iso885914 \
+	gtkrc.iso885915 gtkrc.zh_CN gtkrc.zh_TW.big5 \
+	gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \
+	gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
 
 
 #
@@ -199,7 +499,15 @@ gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.e
 #
 noinst_PROGRAMS = testgtk testinput testselection testrgb testdnd simple # testthreads
 DEPS = libgtk.la $(top_builddir)/gdk/libgdk.la
-LDADDS = @STRIP_BEGIN@ 	libgtk.la				$(top_builddir)/gdk/libgdk.la		@x_ldflags@				@x_libs@				@GDK_WLIBS@				@GLIB_LIBS@				-lm				@STRIP_END@
+LDADDS = @STRIP_BEGIN@ \
+	libgtk.la			\
+	$(top_builddir)/gdk/libgdk.la	\
+	@x_ldflags@			\
+	@x_libs@			\
+	@GDK_WLIBS@			\
+	@GLIB_LIBS@			\
+	-lm				\
+@STRIP_END@
 
 testgtk_DEPENDENCIES = $(DEPS)
 testinput_DEPENDENCIES = $(DEPS)
@@ -228,7 +536,6 @@ X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libgtk_la_LIBADD = 
 libgtk_la_OBJECTS =  gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \
 gtkalignment.lo gtkarg.lo gtkarrow.lo gtkaspectframe.lo gtkbin.lo \
 gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcalendar.lo \
@@ -288,6 +595,40 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
 
 TAR = gtar
 GZIP_ENV = --best
+DEP_FILES =  .deps/fnmatch.P .deps/gtkaccelgroup.P .deps/gtkaccellabel.P \
+.deps/gtkadjustment.P .deps/gtkalignment.P .deps/gtkarg.P \
+.deps/gtkarrow.P .deps/gtkaspectframe.P .deps/gtkbbox.P .deps/gtkbin.P \
+.deps/gtkbindings.P .deps/gtkbox.P .deps/gtkbutton.P \
+.deps/gtkcalendar.P .deps/gtkcheckbutton.P .deps/gtkcheckmenuitem.P \
+.deps/gtkclist.P .deps/gtkcolorsel.P .deps/gtkcombo.P \
+.deps/gtkcontainer.P .deps/gtkctree.P .deps/gtkcurve.P .deps/gtkdata.P \
+.deps/gtkdialog.P .deps/gtkdnd.P .deps/gtkdrawingarea.P \
+.deps/gtkeditable.P .deps/gtkentry.P .deps/gtkeventbox.P \
+.deps/gtkfilesel.P .deps/gtkfixed.P .deps/gtkfontsel.P .deps/gtkframe.P \
+.deps/gtkgamma.P .deps/gtkgc.P .deps/gtkhandlebox.P .deps/gtkhbbox.P \
+.deps/gtkhbox.P .deps/gtkhpaned.P .deps/gtkhruler.P .deps/gtkhscale.P \
+.deps/gtkhscrollbar.P .deps/gtkhseparator.P .deps/gtkimage.P \
+.deps/gtkinputdialog.P .deps/gtkinvisible.P .deps/gtkitem.P \
+.deps/gtkitemfactory.P .deps/gtklabel.P .deps/gtklayout.P \
+.deps/gtklist.P .deps/gtklistitem.P .deps/gtkmain.P .deps/gtkmarshal.P \
+.deps/gtkmenu.P .deps/gtkmenubar.P .deps/gtkmenufactory.P \
+.deps/gtkmenuitem.P .deps/gtkmenushell.P .deps/gtkmisc.P \
+.deps/gtknotebook.P .deps/gtkobject.P .deps/gtkoptionmenu.P \
+.deps/gtkpacker.P .deps/gtkpaned.P .deps/gtkpixmap.P .deps/gtkplug.P \
+.deps/gtkpreview.P .deps/gtkprogress.P .deps/gtkprogressbar.P \
+.deps/gtkradiobutton.P .deps/gtkradiomenuitem.P .deps/gtkrange.P \
+.deps/gtkrc.P .deps/gtkruler.P .deps/gtkscale.P .deps/gtkscrollbar.P \
+.deps/gtkscrolledwindow.P .deps/gtkselection.P .deps/gtkseparator.P \
+.deps/gtksignal.P .deps/gtksocket.P .deps/gtkspinbutton.P \
+.deps/gtkstatusbar.P .deps/gtkstyle.P .deps/gtktable.P \
+.deps/gtktearoffmenuitem.P .deps/gtktext.P .deps/gtkthemes.P \
+.deps/gtktipsquery.P .deps/gtktogglebutton.P .deps/gtktoolbar.P \
+.deps/gtktooltips.P .deps/gtktree.P .deps/gtktreeitem.P \
+.deps/gtktypeutils.P .deps/gtkvbbox.P .deps/gtkvbox.P \
+.deps/gtkviewport.P .deps/gtkvpaned.P .deps/gtkvruler.P \
+.deps/gtkvscale.P .deps/gtkvscrollbar.P .deps/gtkvseparator.P \
+.deps/gtkwidget.P .deps/gtkwindow.P .deps/simple.P .deps/testdnd.P \
+.deps/testgtk.P .deps/testinput.P .deps/testrgb.P .deps/testselection.P
 SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c testrgb.c testdnd.c simple.c
 OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o testrgb.o testdnd.o simple.o
 
@@ -295,9 +636,9 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps gtk/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -329,9 +670,6 @@ uninstall-libLTLIBRARIES:
 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
 	done
 
-.c.o:
-	$(COMPILE) -c $<
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -348,9 +686,6 @@ distclean-compile:
 
 maintainer-clean-compile:
 
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
 .s.lo:
 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 
@@ -471,6 +806,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
 subdir = gtk
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu gtk/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -481,866 +821,38 @@ distdir: $(DISTFILES)
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-fnmatch.lo fnmatch.o : fnmatch.c ../config.h fnmatch.h
-gtkaccelgroup.lo gtkaccelgroup.o : gtkaccelgroup.c gtkaccelgroup.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h ../gdk/gdkkeysyms.h \
-	gtksignal.h gtkmarshal.h gtkwidget.h gtkaccelgroup.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h
-gtkaccellabel.lo gtkaccellabel.o : gtkaccellabel.c gtkmain.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h \
-	gtkaccellabel.h gtklabel.h gtkmisc.h
-gtkadjustment.lo gtkadjustment.o : gtkadjustment.c gtkadjustment.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkdata.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtksignal.h \
-	gtkmarshal.h
-gtkalignment.lo gtkalignment.o : gtkalignment.c gtkalignment.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkbin.h gtkcontainer.h gtkenums.h gtkwidget.h \
-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
-	gtkstyle.h
-gtkarg.lo gtkarg.o : gtkarg.c gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkargcollector.c
-gtkarrow.lo gtkarrow.o : gtkarrow.c gtkarrow.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmisc.h \
-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h
-gtkaspectframe.lo gtkaspectframe.o : gtkaspectframe.c gtkaspectframe.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkbin.h gtkcontainer.h gtkenums.h gtkwidget.h \
-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
-	gtkstyle.h gtkframe.h
-gtkbbox.lo gtkbbox.o : gtkbbox.c gtkbbox.h gtkbox.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
-gtkbin.lo gtkbin.o : gtkbin.c gtkbin.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkcontainer.h gtkenums.h \
-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
-	gtkstyle.h
-gtkbindings.lo gtkbindings.o : gtkbindings.c gtkbindings.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkenums.h gtkdebug.h gtksignal.h gtkmarshal.h gtkwidget.h \
-	gtkaccelgroup.h gtkadjustment.h gtkdata.h gtkstyle.h gtkrc.h \
-	gtkwidget.h
-gtkbox.lo gtkbox.o : gtkbox.c gtkbox.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkcontainer.h gtkenums.h \
-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
-	gtkstyle.h
-gtkbutton.lo gtkbutton.o : gtkbutton.c gtkbutton.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtklabel.h \
-	gtkmisc.h gtkmain.h gtksignal.h gtkmarshal.h
-gtkcalendar.lo gtkcalendar.o : gtkcalendar.c gtkcalendar.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtksignal.h gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkwidget.h \
-	gtkaccelgroup.h gtkadjustment.h gtkdata.h gtkstyle.h \
-	../gdk/gdkkeysyms.h
-gtkcheckbutton.lo gtkcheckbutton.o : gtkcheckbutton.c gtkcheckbutton.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtktogglebutton.h gtkbutton.h gtkbin.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtklabel.h \
-	gtkmisc.h
-gtkcheckmenuitem.lo gtkcheckmenuitem.o : gtkcheckmenuitem.c \
-	gtkcheckmenuitem.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmenuitem.h gtkitem.h \
-	gtkbin.h gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkaccellabel.h \
-	gtklabel.h gtkmisc.h gtksignal.h gtkmarshal.h
-gtkclist.lo gtkclist.o : gtkclist.c ../config.h gtkmain.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtkclist.h gtksignal.h gtkmarshal.h \
-	gtkalignment.h gtkbin.h gtkcontainer.h gtklabel.h gtkmisc.h \
-	gtkbutton.h gtkhscrollbar.h gtkscrollbar.h gtkrange.h \
-	gtkvscrollbar.h gtkbindings.h gtkdnd.h gtkselection.h \
-	gtkwindow.h ../gdk/gdkx.h ../gdk/gdkprivate.h \
-	../gdk/gdkkeysyms.h
-gtkcolorsel.lo gtkcolorsel.o : gtkcolorsel.c ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkcolorsel.h gtkwindow.h gtkaccelgroup.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h gtkbin.h \
-	gtkcontainer.h gtkwidget.h gtkadjustment.h gtkdata.h gtkstyle.h \
-	gtkvbox.h gtkbox.h gtkframe.h gtkpreview.h gtkbutton.h \
-	gtkentry.h gtkeditable.h gtkhbox.h gtklabel.h gtkmisc.h \
-	gtkmain.h gtksignal.h gtkmarshal.h gtkrange.h gtkscale.h \
-	gtkhscale.h gtktable.h gtkeventbox.h gtkwindow.h gtkhbbox.h \
-	gtkbbox.h gtkintl.h ../config.h gtkdnd.h gtkselection.h \
-	gtkselection.h
-gtkcombo.lo gtkcombo.o : gtkcombo.c gtkarrow.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmisc.h \
-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtklabel.h gtklist.h gtkcontainer.h \
-	gtklistitem.h gtkitem.h gtkbin.h gtkentry.h gtkeditable.h \
-	gtkeventbox.h gtkbutton.h gtklistitem.h gtkscrolledwindow.h \
-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
-	gtkviewport.h gtkmain.h gtksignal.h gtkmarshal.h gtkwindow.h \
-	../gdk/gdkkeysyms.h gtkcombo.h gtkhbox.h gtkbox.h gtkframe.h
-gtkcontainer.lo gtkcontainer.o : gtkcontainer.c gtkcontainer.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkprivate.h \
-	gtksignal.h gtkmarshal.h gtkmain.h
-gtkctree.lo gtkctree.o : gtkctree.c gtkctree.h gtkclist.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtksignal.h gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkalignment.h \
-	gtkbin.h gtkcontainer.h gtkwidget.h gtkaccelgroup.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h gtklabel.h gtkmisc.h \
-	gtkbutton.h gtkhscrollbar.h gtkscrollbar.h gtkrange.h \
-	gtkvscrollbar.h gtkbindings.h gtkmain.h gtkdnd.h gtkselection.h \
-	../gdk/gdkx.h ../gdk/gdkprivate.h ../gdk/gdkkeysyms.h
-gtkcurve.lo gtkcurve.o : gtkcurve.c gtkcurve.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkdrawingarea.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h gtkdrawingarea.h gtkmain.h \
-	gtkradiobutton.h gtkcheckbutton.h gtktogglebutton.h gtkbutton.h \
-	gtkbin.h gtkcontainer.h gtksignal.h gtkmarshal.h gtktable.h
-gtkdata.lo gtkdata.o : gtkdata.c gtkdata.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkenums.h gtkdebug.h gtksignal.h gtkmarshal.h
-gtkdialog.lo gtkdialog.o : gtkdialog.c gtkbutton.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkdialog.h \
-	gtkwindow.h gtkhbox.h gtkbox.h gtkhseparator.h gtkseparator.h \
-	gtkvbox.h
-gtkdnd.lo gtkdnd.o : gtkdnd.c ../gdk/gdkx.h ../gdk/gdkprivate.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkkeysyms.h \
-	gtkdnd.h ../gdk/gdk.h ../gdk/gdkrgb.h gtkenums.h gtkwidget.h \
-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
-	gtkstyle.h gtkselection.h gtkinvisible.h gtkbin.h \
-	gtkcontainer.h gtkmain.h gtksignal.h gtkmarshal.h gtkwindow.h
-gtkdrawingarea.lo gtkdrawingarea.o : gtkdrawingarea.c gtkdrawingarea.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h
-gtkeditable.lo gtkeditable.o : gtkeditable.c ../gdk/gdkx.h \
-	../gdk/gdkprivate.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkkeysyms.h ../gdk/gdki18n.h gtkeditable.h ../gdk/gdk.h \
-	../gdk/gdkrgb.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h gtkmain.h gtkselection.h \
-	gtksignal.h gtkmarshal.h
-gtkentry.lo gtkentry.o : gtkentry.c ../gdk/gdkkeysyms.h ../gdk/gdki18n.h \
-	gtkentry.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkeditable.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
-	gtkmain.h gtkselection.h gtksignal.h gtkmarshal.h gtkstyle.h
-gtkeventbox.lo gtkeventbox.o : gtkeventbox.c gtksignal.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkeventbox.h \
-	gtkbin.h gtkcontainer.h gtkwidget.h gtkaccelgroup.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h
-gtkfilesel.lo gtkfilesel.o : gtkfilesel.c fnmatch.h ../gdk/gdkkeysyms.h \
-	gtkbutton.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkbin.h gtkcontainer.h gtkenums.h gtkwidget.h \
-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
-	gtkstyle.h gtkentry.h gtkeditable.h gtkfilesel.h gtkwindow.h \
-	gtkhbox.h gtkbox.h gtkhbbox.h gtkbbox.h gtklabel.h gtkmisc.h \
-	gtklist.h gtklistitem.h gtkitem.h gtklistitem.h gtkmain.h \
-	gtkscrolledwindow.h gtkhscrollbar.h gtkscrollbar.h gtkrange.h \
-	gtkvscrollbar.h gtkviewport.h gtksignal.h gtkmarshal.h \
-	gtkvbox.h gtkmenu.h gtkmenushell.h gtkmenuitem.h \
-	gtkoptionmenu.h gtkbutton.h gtkclist.h gtksignal.h \
-	gtkalignment.h gtklabel.h gtkdialog.h gtkintl.h ../config.h
-gtkfixed.lo gtkfixed.o : gtkfixed.c gtkfixed.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
-gtkfontsel.lo gtkfontsel.o : gtkfontsel.c ../gdk/gdkx.h \
-	../gdk/gdkprivate.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkkeysyms.h gtkbutton.h ../gdk/gdk.h ../gdk/gdkrgb.h \
-	gtkbin.h gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
-	gtkcheckbutton.h gtktogglebutton.h gtkbutton.h gtkclist.h \
-	gtksignal.h gtkmarshal.h gtkalignment.h gtklabel.h gtkmisc.h \
-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
-	gtkentry.h gtkeditable.h gtkfontsel.h gtkwindow.h gtknotebook.h \
-	gtkframe.h gtkhbbox.h gtkbbox.h gtkbox.h gtkhbox.h gtklabel.h \
-	gtknotebook.h gtkradiobutton.h gtkcheckbutton.h gtksignal.h \
-	gtktable.h gtkvbox.h gtkscrolledwindow.h gtkviewport.h \
-	gtkintl.h ../config.h
-gtkframe.lo gtkframe.o : gtkframe.c gtkframe.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
-gtkgamma.lo gtkgamma.o : gtkgamma.c gtkgamma.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkvbox.h \
-	gtkbox.h gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkcurve.h \
-	gtkdrawingarea.h gtkdialog.h gtkwindow.h gtkbin.h \
-	gtkdrawingarea.h gtkentry.h gtkeditable.h gtkhbox.h gtklabel.h \
-	gtkmisc.h gtkmain.h gtkpixmap.h gtkradiobutton.h \
-	gtkcheckbutton.h gtktogglebutton.h gtkbutton.h gtksignal.h \
-	gtkmarshal.h gtktable.h gtkvbox.h gtkwindow.h gtkintl.h \
-	../config.h
-gtkgc.lo gtkgc.o : gtkgc.c gtkgc.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h
-gtkhandlebox.lo gtkhandlebox.o : gtkhandlebox.c ../gdk/gdkx.h \
-	../gdk/gdkprivate.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	gtkhandlebox.h ../gdk/gdk.h ../gdk/gdkrgb.h gtkbin.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkinvisible.h \
-	gtkmain.h gtksignal.h gtkmarshal.h gtkwindow.h
-gtkhbbox.lo gtkhbbox.o : gtkhbbox.c gtkhbbox.h gtkbbox.h gtkbox.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkcontainer.h gtkenums.h gtkwidget.h \
-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
-	gtkstyle.h
-gtkhbox.lo gtkhbox.o : gtkhbox.c gtkhbox.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbox.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
-gtkhpaned.lo gtkhpaned.o : gtkhpaned.c gtkhpaned.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkpaned.h gtkcontainer.h gtkenums.h gtkwidget.h \
-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
-	gtkstyle.h gtkmain.h gtksignal.h gtkmarshal.h
-gtkhruler.lo gtkhruler.o : gtkhruler.c gtkhruler.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkruler.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h
-gtkhscale.lo gtkhscale.o : gtkhscale.c gtkhscale.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkscale.h gtkrange.h gtkadjustment.h gtkdata.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkwidget.h gtkaccelgroup.h gtkstyle.h gtksignal.h gtkmarshal.h \
-	../gdk/gdkkeysyms.h
-gtkhscrollbar.lo gtkhscrollbar.o : gtkhscrollbar.c gtkhscrollbar.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkscrollbar.h gtkrange.h gtkadjustment.h \
-	gtkdata.h gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkenums.h gtkdebug.h gtkwidget.h gtkaccelgroup.h gtkstyle.h \
-	gtksignal.h gtkmarshal.h ../gdk/gdkkeysyms.h
-gtkhseparator.lo gtkhseparator.o : gtkhseparator.c gtkhseparator.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkseparator.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
-gtkimage.lo gtkimage.o : gtkimage.c gtkcontainer.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtkimage.h gtkmisc.h
-gtkinputdialog.lo gtkinputdialog.o : gtkinputdialog.c \
-	../gdk/gdkkeysyms.h gtkbutton.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h gtkcontainer.h \
-	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtkentry.h gtkeditable.h gtkhbox.h \
-	gtkbox.h gtkhseparator.h gtkseparator.h gtkinputdialog.h \
-	gtkdialog.h gtkwindow.h gtklabel.h gtkmisc.h gtklistitem.h \
-	gtkitem.h gtkmain.h gtkmenu.h gtkmenushell.h gtkmenuitem.h \
-	gtknotebook.h gtkoptionmenu.h gtkbutton.h gtkscrolledwindow.h \
-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
-	gtkviewport.h gtksignal.h gtkmarshal.h gtktable.h gtkvbox.h \
-	gtkintl.h ../config.h
-gtkinvisible.lo gtkinvisible.o : gtkinvisible.c gtksignal.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkinvisible.h \
-	gtkbin.h gtkcontainer.h gtkwidget.h gtkaccelgroup.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h
-gtkitem.lo gtkitem.o : gtkitem.c gtkitem.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtksignal.h \
-	gtkmarshal.h
-gtkitemfactory.lo gtkitemfactory.o : gtkitemfactory.c gtkitemfactory.h \
-	gtkwidget.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h gtkmenufactory.h \
-	gtkbindings.h gtksignal.h gtkmarshal.h gtkoptionmenu.h \
-	gtkbutton.h gtkbin.h gtkcontainer.h gtkmenubar.h gtkmenushell.h \
-	gtkmenu.h gtkmenuitem.h gtkitem.h gtkradiomenuitem.h \
-	gtkcheckmenuitem.h gtktearoffmenuitem.h gtkaccellabel.h \
-	gtklabel.h gtkmisc.h ../gdk/gdkkeysyms.h
-gtklabel.lo gtklabel.o : gtklabel.c gtklabel.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmisc.h \
-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h ../gdk/gdkkeysyms.h ../gdk/gdki18n.h
-gtklayout.lo gtklayout.o : gtklayout.c gtklayout.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtksignal.h \
-	gtkmarshal.h gtkprivate.h ../gdk/gdkx.h ../gdk/gdkprivate.h
-gtklist.lo gtklist.o : gtklist.c gtklist.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkenums.h gtkcontainer.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtklistitem.h \
-	gtkitem.h gtkbin.h gtklistitem.h gtkmain.h gtksignal.h \
-	gtkmarshal.h gtklabel.h gtkmisc.h
-gtklistitem.lo gtklistitem.o : gtklistitem.c gtkbindings.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkenums.h gtkdebug.h gtklabel.h gtkmisc.h gtkwidget.h \
-	gtkaccelgroup.h gtkadjustment.h gtkdata.h gtkstyle.h \
-	gtklistitem.h gtkitem.h gtkbin.h gtkcontainer.h gtklist.h \
-	gtklistitem.h gtksignal.h gtkmarshal.h ../gdk/gdkkeysyms.h
-gtkmain.lo gtkmain.o : gtkmain.c gtkbutton.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkdnd.h \
-	gtkselection.h gtkfeatures.h gtkhscrollbar.h gtkscrollbar.h \
-	gtkrange.h gtkhseparator.h gtkseparator.h gtkmain.h \
-	gtkpreview.h gtkrc.h gtkscrolledwindow.h gtkhscrollbar.h \
-	gtkvscrollbar.h gtkviewport.h gtkselection.h gtksignal.h \
-	gtkmarshal.h gtktable.h gtktext.h gtkeditable.h gtkvbox.h \
-	gtkbox.h gtkvscrollbar.h gtkwidget.h gtkwindow.h gtkprivate.h \
-	../gdk/gdki18n.h ../config.h gtkdebug.h gtkintl.h
-gtkmarshal.lo gtkmarshal.o : gtkmarshal.c gtkmarshal.h gtktypeutils.h \
-	gtktypebuiltins.h gtkobject.h gtkarg.h gtkenums.h gtkdebug.h
-gtkmenu.lo gtkmenu.o : gtkmenu.c ../gdk/gdkkeysyms.h gtkbindings.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtklabel.h gtkmisc.h \
-	gtkwidget.h gtkaccelgroup.h gtkadjustment.h gtkdata.h \
-	gtkstyle.h gtkmain.h gtkmenu.h gtkmenushell.h gtkcontainer.h \
-	gtkmenuitem.h gtkitem.h gtkbin.h gtksignal.h gtkmarshal.h \
-	gtkwindow.h
-gtkmenubar.lo gtkmenubar.o : gtkmenubar.c ../gdk/gdkkeysyms.h \
-	gtkbindings.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkmain.h gtkwidget.h gtkaccelgroup.h gtkadjustment.h gtkdata.h \
-	gtkstyle.h gtkmenubar.h gtkmenushell.h gtkcontainer.h \
-	gtkmenuitem.h gtkitem.h gtkbin.h
-gtkmenufactory.lo gtkmenufactory.o : gtkmenufactory.c gtkcheckmenuitem.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkmenuitem.h gtkitem.h gtkbin.h gtkcontainer.h \
-	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtkmenu.h gtkmenushell.h gtkmenubar.h \
-	gtkmenufactory.h gtkmenuitem.h gtksignal.h gtkmarshal.h
-gtkmenuitem.lo gtkmenuitem.o : gtkmenuitem.c gtkaccellabel.h gtklabel.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkmisc.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
-	gtkmain.h gtkmenu.h gtkmenushell.h gtkcontainer.h gtkmenubar.h \
-	gtkmenuitem.h gtkitem.h gtkbin.h gtksignal.h gtkmarshal.h
-gtkmenushell.lo gtkmenushell.o : gtkmenushell.c ../gdk/gdkkeysyms.h \
-	gtkbindings.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkmain.h gtkwidget.h gtkaccelgroup.h gtkadjustment.h gtkdata.h \
-	gtkstyle.h gtkmenuitem.h gtkitem.h gtkbin.h gtkcontainer.h \
-	gtktearoffmenuitem.h gtkmenuitem.h gtkmenushell.h gtksignal.h \
-	gtkmarshal.h
-gtkmisc.lo gtkmisc.o : gtkmisc.c gtkcontainer.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtkmisc.h
-gtknotebook.lo gtknotebook.o : gtknotebook.c gtknotebook.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtksignal.h \
-	gtkmarshal.h gtkmain.h gtkmenu.h gtkmenushell.h gtkmenuitem.h \
-	gtkitem.h gtkbin.h gtklabel.h gtkmisc.h ../gdk/gdkkeysyms.h \
-	gtkintl.h ../config.h
-gtkobject.lo gtkobject.o : gtkobject.c gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtksignal.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkobject.h gtkmarshal.h
-gtkoptionmenu.lo gtkoptionmenu.o : gtkoptionmenu.c gtkmenu.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkmenushell.h gtkcontainer.h gtkwidget.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtkmenuitem.h gtkitem.h gtkbin.h \
-	gtkoptionmenu.h gtkbutton.h gtksignal.h gtkmarshal.h \
-	../gdk/gdkkeysyms.h
-gtkpacker.lo gtkpacker.o : gtkpacker.c gtkpacker.h gtkcontainer.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
-gtkpaned.lo gtkpaned.o : gtkpaned.c gtkpaned.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtkhpaned.h \
-	gtkpaned.h
-gtkpixmap.lo gtkpixmap.o : gtkpixmap.c gtkcontainer.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtkpixmap.h gtkmisc.h
-gtkplug.lo gtkplug.o : gtkplug.c ../gdk/gdkx.h ../gdk/gdkprivate.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkkeysyms.h \
-	gtkplug.h ../gdk/gdk.h ../gdk/gdkrgb.h gtkwindow.h \
-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkbin.h gtkcontainer.h \
-	gtkwidget.h gtkadjustment.h gtkdata.h gtkstyle.h
-gtkpreview.lo gtkpreview.o : gtkpreview.c ../gdk/gdkx.h \
-	../gdk/gdkprivate.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkpreview.h gtkwidget.h ../gdk/gdk.h \
-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h
-gtkprogress.lo gtkprogress.o : gtkprogress.c gtkprogress.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h
-gtkprogressbar.lo gtkprogressbar.o : gtkprogressbar.c ../config.h \
-	gtkprogressbar.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkprogress.h gtkwidget.h \
-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h
-gtkradiobutton.lo gtkradiobutton.o : gtkradiobutton.c gtklabel.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkmisc.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
-	gtkradiobutton.h gtkcheckbutton.h gtktogglebutton.h gtkbutton.h \
-	gtkbin.h gtkcontainer.h gtksignal.h gtkmarshal.h
-gtkradiomenuitem.lo gtkradiomenuitem.o : gtkradiomenuitem.c \
-	gtkaccellabel.h gtklabel.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmisc.h gtkwidget.h \
-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtkradiomenuitem.h gtkcheckmenuitem.h \
-	gtkmenuitem.h gtkitem.h gtkbin.h gtkcontainer.h
-gtkrange.lo gtkrange.o : gtkrange.c gtkmain.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtkrange.h gtksignal.h gtkmarshal.h
-gtkrc.lo gtkrc.o : gtkrc.c gtkrc.h gtkstyle.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkbindings.h gtkthemes.h gtkintl.h ../config.h
-gtkruler.lo gtkruler.o : gtkruler.c gtkruler.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h
-gtkscale.lo gtkscale.o : gtkscale.c gtkcontainer.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtkscale.h gtkrange.h
-gtkscrollbar.lo gtkscrollbar.o : gtkscrollbar.c gtkscrollbar.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkrange.h gtkadjustment.h gtkdata.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkenums.h gtkdebug.h gtkwidget.h gtkaccelgroup.h gtkstyle.h
-gtkscrolledwindow.lo gtkscrolledwindow.o : gtkscrolledwindow.c \
-	gtkscrolledwindow.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkhscrollbar.h \
-	gtkscrollbar.h gtkrange.h gtkadjustment.h gtkdata.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkwidget.h gtkaccelgroup.h gtkstyle.h gtkvscrollbar.h \
-	gtkviewport.h gtkbin.h gtkcontainer.h gtksignal.h gtkmarshal.h
-gtkselection.lo gtkselection.o : gtkselection.c ../gdk/gdkx.h \
-	../gdk/gdkprivate.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	gtkmain.h ../gdk/gdk.h ../gdk/gdkrgb.h gtkwidget.h \
-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtkselection.h gtksignal.h gtkmarshal.h
-gtkseparator.lo gtkseparator.o : gtkseparator.c gtkseparator.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h
-gtksignal.lo gtksignal.o : gtksignal.c gtksignal.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkargcollector.c
-gtksocket.lo gtksocket.o : gtksocket.c ../gdk/gdkx.h ../gdk/gdkprivate.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkkeysyms.h \
-	gtkwindow.h ../gdk/gdk.h ../gdk/gdkrgb.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkenums.h gtkdebug.h gtkbin.h gtkcontainer.h gtkwidget.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h \
-	gtksocket.h gtkdnd.h gtkselection.h
-gtkspinbutton.lo gtkspinbutton.o : gtkspinbutton.c ../gdk/gdkkeysyms.h \
-	gtkspinbutton.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkentry.h gtkeditable.h \
-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtkmain.h gtksignal.h gtkmarshal.h
-gtkstatusbar.lo gtkstatusbar.o : gtkstatusbar.c gtkframe.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtklabel.h \
-	gtkmisc.h gtksignal.h gtkmarshal.h gtkstatusbar.h gtkhbox.h \
-	gtkbox.h
-gtkstyle.lo gtkstyle.o : gtkstyle.c gtkgc.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkrc.h \
-	gtkstyle.h gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkdebug.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h gtkwidget.h gtkthemes.h \
-	../gdk/gdkprivate.h
-gtktable.lo gtktable.o : gtktable.c gtktable.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
-gtktearoffmenuitem.lo gtktearoffmenuitem.o : gtktearoffmenuitem.c \
-	gtkmenu.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkmenushell.h gtkcontainer.h gtkwidget.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtksignal.h gtkmarshal.h \
-	gtktearoffmenuitem.h gtkmenuitem.h gtkitem.h gtkbin.h
-gtktext.lo gtktext.o : gtktext.c ../gdk/gdkkeysyms.h ../gdk/gdki18n.h \
-	gtkmain.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h gtkselection.h gtksignal.h \
-	gtkmarshal.h gtktext.h gtkeditable.h line-wrap.xbm \
-	line-arrow.xbm
-gtkthemes.lo gtkthemes.o : gtkthemes.c gtkthemes.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkstyle.h gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkdebug.h \
-	gtkadjustment.h gtkdata.h gtkmain.h gtkrc.h gtkselection.h \
-	gtksignal.h gtkmarshal.h gtkwidget.h ../config.h gtkintl.h
-gtktipsquery.lo gtktipsquery.o : gtktipsquery.c gtktipsquery.h \
-	gtklabel.h ../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkmisc.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
-	gtksignal.h gtkmarshal.h gtktooltips.h gtkmain.h gtkintl.h \
-	../config.h
-gtktogglebutton.lo gtktogglebutton.o : gtktogglebutton.c gtklabel.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkmisc.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
-	gtkmain.h gtksignal.h gtkmarshal.h gtktogglebutton.h \
-	gtkbutton.h gtkbin.h gtkcontainer.h
-gtktoolbar.lo gtktoolbar.o : gtktoolbar.c gtkbutton.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbin.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h \
-	gtktogglebutton.h gtkbutton.h gtkradiobutton.h gtkcheckbutton.h \
-	gtktogglebutton.h gtklabel.h gtkmisc.h gtkvbox.h gtkbox.h \
-	gtktoolbar.h gtkpixmap.h gtksignal.h gtkmarshal.h gtktooltips.h
-gtktooltips.lo gtktooltips.o : gtktooltips.c gtkmain.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtkwidget.h gtkwindow.h gtkbin.h \
-	gtkcontainer.h gtksignal.h gtkmarshal.h gtkstyle.h \
-	gtktooltips.h
-gtktree.lo gtktree.o : gtktree.c gtktree.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h gtktreeitem.h \
-	gtkitem.h gtkbin.h gtkmain.h gtksignal.h gtkmarshal.h gtklist.h \
-	gtklistitem.h
-gtktreeitem.lo gtktreeitem.o : gtktreeitem.c gtklabel.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkmisc.h \
-	gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkenums.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtktree.h gtkcontainer.h gtktreeitem.h \
-	gtkitem.h gtkbin.h gtkeventbox.h gtkpixmap.h gtkmain.h \
-	gtksignal.h gtkmarshal.h tree_plus.xpm tree_minus.xpm
-gtktypeutils.lo gtktypeutils.o : gtktypeutils.c gtktypeutils.h \
-	gtktypebuiltins.h makeenums.h ../gdk/gdkprivate.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdk.h \
-	../gdk/gdkrgb.h gtk.h gtkaccelgroup.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtkenums.h gtkdebug.h gtkaccellabel.h gtklabel.h \
-	gtkmisc.h gtkwidget.h gtkadjustment.h gtkdata.h gtkstyle.h \
-	gtkalignment.h gtkbin.h gtkcontainer.h gtkaspectframe.h \
-	gtkframe.h gtkarrow.h gtkbindings.h gtkbox.h gtkbbox.h \
-	gtkbutton.h gtkcalendar.h gtksignal.h gtkmarshal.h \
-	gtkcheckbutton.h gtktogglebutton.h gtkcheckmenuitem.h \
-	gtkmenuitem.h gtkitem.h gtkclist.h gtkhscrollbar.h \
-	gtkscrollbar.h gtkrange.h gtkvscrollbar.h gtkcolorsel.h \
-	gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h gtkeditable.h \
-	gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h gtktable.h \
-	gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h gtkcurve.h \
-	gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
-	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
-	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
-	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
-	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
-	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
-	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
-	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
-	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
-	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
-	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
-	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
-	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h \
-	gtkprivate.h gtktypebuiltins_vars.c gtktypebuiltins_evals.c \
-	gtktypebuiltins_ids.c
-gtkvbbox.lo gtkvbbox.o : gtkvbbox.c gtkvbbox.h gtkbbox.h gtkbox.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkcontainer.h gtkenums.h gtkwidget.h \
-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
-	gtkstyle.h
-gtkvbox.lo gtkvbox.o : gtkvbox.c gtkvbox.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkbox.h \
-	gtkcontainer.h gtkenums.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
-gtkviewport.lo gtkviewport.o : gtkviewport.c gtksignal.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkenums.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkdebug.h gtkmarshal.h gtkviewport.h \
-	gtkadjustment.h gtkdata.h gtkbin.h gtkcontainer.h gtkwidget.h \
-	gtkaccelgroup.h gtkstyle.h
-gtkvpaned.lo gtkvpaned.o : gtkvpaned.c gtkvpaned.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkpaned.h gtkcontainer.h gtkenums.h gtkwidget.h \
-	gtkaccelgroup.h gtkobject.h gtkarg.h gtktypeutils.h \
-	gtktypebuiltins.h gtkdebug.h gtkadjustment.h gtkdata.h \
-	gtkstyle.h gtkmain.h gtksignal.h gtkmarshal.h
-gtkvruler.lo gtkvruler.o : gtkvruler.c gtkvruler.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkruler.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h
-gtkvscale.lo gtkvscale.o : gtkvscale.c gtkvscale.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkscale.h gtkrange.h gtkadjustment.h gtkdata.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkwidget.h gtkaccelgroup.h gtkstyle.h gtksignal.h gtkmarshal.h \
-	../gdk/gdkkeysyms.h
-gtkvscrollbar.lo gtkvscrollbar.o : gtkvscrollbar.c gtkvscrollbar.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkscrollbar.h gtkrange.h gtkadjustment.h \
-	gtkdata.h gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkenums.h gtkdebug.h gtkwidget.h gtkaccelgroup.h gtkstyle.h \
-	gtksignal.h gtkmarshal.h ../gdk/gdkkeysyms.h
-gtkvseparator.lo gtkvseparator.o : gtkvseparator.c gtkvseparator.h \
-	../gdk/gdk.h ../gdk/gdktypes.h ../gdk/gdkcursors.h \
-	../gdk/gdkrgb.h gtkseparator.h gtkwidget.h gtkaccelgroup.h \
-	gtkobject.h gtkarg.h gtktypeutils.h gtktypebuiltins.h \
-	gtkenums.h gtkdebug.h gtkadjustment.h gtkdata.h gtkstyle.h
-gtkwidget.lo gtkwidget.o : gtkwidget.c gtkcontainer.h ../gdk/gdk.h \
-	../gdk/gdktypes.h ../gdk/gdkcursors.h ../gdk/gdkrgb.h \
-	gtkenums.h gtkwidget.h gtkaccelgroup.h gtkobject.h gtkarg.h \
-	gtktypeutils.h gtktypebuiltins.h gtkdebug.h gtkadjustment.h \
-	gtkdata.h gtkstyle.h gtkmain.h gtkrc.h gtkselection.h \
-	gtksignal.h gtkmarshal.h gtkwidget.h gtkwindow.h gtkbin.h \
-	gtkcontainer.h gtkbindings.h gtkprivate.h ../gdk/gdkx.h \
-	../gdk/gdkprivate.h
-gtkwindow.lo gtkwindow.o : gtkwindow.c ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h ../gdk/gdkkeysyms.h \
-	../gdk/gdkx.h ../gdk/gdkprivate.h gtkprivate.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkwidget.h gtkaccelgroup.h gtkadjustment.h gtkdata.h \
-	gtkstyle.h gtkrc.h gtksignal.h gtkmarshal.h gtkwindow.h \
-	gtkbin.h gtkcontainer.h gtkbindings.h gtkmain.h
-simple.o: simple.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
-	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
-	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
-	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
-	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
-	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
-	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
-	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
-	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
-	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
-	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
-	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
-	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
-	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
-	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
-	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
-	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
-	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
-	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
-	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
-	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h \
-	../gdk/gdkprivate.h
-testdnd.o: testdnd.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
-	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
-	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
-	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
-	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
-	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
-	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
-	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
-	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
-	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
-	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
-	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
-	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
-	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
-	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
-	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
-	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
-	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
-	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
-	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
-	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h
-testgtk.o: testgtk.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
-	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
-	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
-	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
-	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
-	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
-	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
-	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
-	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
-	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
-	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
-	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
-	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
-	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
-	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
-	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
-	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
-	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
-	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
-	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
-	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h \
-	../gdk/gdkx.h ../gdk/gdkprivate.h ../gdk/gdkkeysyms.h \
-	circles.xbm
-testinput.o: testinput.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
-	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
-	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
-	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
-	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
-	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
-	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
-	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
-	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
-	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
-	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
-	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
-	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
-	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
-	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
-	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
-	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
-	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
-	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
-	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
-	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h
-testrgb.o: testrgb.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
-	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
-	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
-	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
-	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
-	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
-	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
-	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
-	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
-	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
-	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
-	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
-	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
-	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
-	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
-	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
-	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
-	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
-	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
-	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
-	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h
-testselection.o: testselection.c gtk.h ../gdk/gdk.h ../gdk/gdktypes.h \
-	../gdk/gdkcursors.h ../gdk/gdkrgb.h gtkaccelgroup.h gtkobject.h \
-	gtkarg.h gtktypeutils.h gtktypebuiltins.h gtkenums.h gtkdebug.h \
-	gtkaccellabel.h gtklabel.h gtkmisc.h gtkwidget.h \
-	gtkadjustment.h gtkdata.h gtkstyle.h gtkalignment.h gtkbin.h \
-	gtkcontainer.h gtkaspectframe.h gtkframe.h gtkarrow.h \
-	gtkbindings.h gtkbox.h gtkbbox.h gtkbutton.h gtkcalendar.h \
-	gtksignal.h gtkmarshal.h gtkcheckbutton.h gtktogglebutton.h \
-	gtkcheckmenuitem.h gtkmenuitem.h gtkitem.h gtkclist.h \
-	gtkhscrollbar.h gtkscrollbar.h gtkrange.h gtkvscrollbar.h \
-	gtkcolorsel.h gtkwindow.h gtkvbox.h gtkpreview.h gtkentry.h \
-	gtkeditable.h gtkhbox.h gtkmain.h gtkscale.h gtkhscale.h \
-	gtktable.h gtkeventbox.h gtkcombo.h gtkcompat.h gtkctree.h \
-	gtkcurve.h gtkdrawingarea.h gtkdialog.h gtkdnd.h gtkselection.h \
-	gtkfeatures.h gtkfilesel.h gtkfixed.h gtkfontsel.h \
-	gtknotebook.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h \
-	gtkhpaned.h gtkpaned.h gtkhruler.h gtkruler.h gtkhseparator.h \
-	gtkseparator.h gtkimage.h gtkinputdialog.h gtkitemfactory.h \
-	gtkmenufactory.h gtklayout.h gtklist.h gtklistitem.h gtkmenu.h \
-	gtkmenushell.h gtkmenubar.h gtkoptionmenu.h gtkpacker.h \
-	gtkpixmap.h gtkplug.h gtkprogress.h gtkprogressbar.h \
-	gtkradiobutton.h gtkradiomenuitem.h gtkrc.h gtkscrolledwindow.h \
-	gtkviewport.h gtksocket.h gtkspinbutton.h gtkstatusbar.h \
-	gtktearoffmenuitem.h gtktext.h gtkthemes.h gtktipsquery.h \
-	gtktoolbar.h gtktooltips.h gtktree.h gtktreeitem.h gtkvbbox.h \
-	gtkvpaned.h gtkvruler.h gtkvscale.h gtkvseparator.h
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -1384,19 +896,20 @@ maintainer-clean-generic:
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
 		mostlyclean-libtool mostlyclean-noinstPROGRAMS \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
 clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool \
-		clean-noinstPROGRAMS clean-tags clean-generic \
-		mostlyclean-am
+		clean-noinstPROGRAMS clean-tags clean-depend \
+		clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-libLTLIBRARIES distclean-compile \
 		distclean-libtool distclean-noinstPROGRAMS \
-		distclean-tags distclean-generic clean-am
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
 	-rm -f libtool
 
 distclean: distclean-am
@@ -1404,7 +917,8 @@ distclean: distclean-am
 maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -1420,10 +934,11 @@ distclean-noinstPROGRAMS clean-noinstPRO
 maintainer-clean-noinstPROGRAMS uninstall-gtkconfDATA \
 install-gtkconfDATA uninstall-libgtkincludeHEADERS \
 install-libgtkincludeHEADERS tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-local uninstall-am uninstall all-redirect all-am all \
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-local install-data-am install-data install-am \
+install uninstall-local uninstall-am uninstall all-redirect all-am all \
 installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
@@ -1486,11 +1001,11 @@ install-data-local:
 	cd $(DESTDIR)$(gtkconfdir) && \
 	  for i in cs hr hu pl ro sk sl sq sr ; do \
 	    rm -f gtkrc.$$i ; \
-	    ln -s gtkrc.iso-8859-2 gtkrc.$$i ; \
+	    ln -s gtkrc.iso88592 gtkrc.$$i ; \
 	  done ; \
 	  for i in bg_BG.iso88595 mk sp ru_RU.iso88595 ; do \
 	    rm -f gtkrc.$$i ; \
-	    ln -s gtkrc.iso-8859-5 gtkrc.$$i ; \
+	    ln -s gtkrc.iso88595 gtkrc.$$i ; \
 	  done ; \
 	  for i in he_IL.cp1255 he_IL.microsoftcp1255 yi ; do \
 	    rm -f gtkrc.$$i ; \
@@ -1499,12 +1014,12 @@ install-data-local:
 	rm -f gtkrc.lt gtkrc.lv gtkrc.cy gtkrc.ga gtkrc.et gtkrc.ka \
 	     gtkrc.vi_VN.viscii111 gtkrc.vi_VN.tcvn5712 gtkrc.vi \
 	     gtkrc.be gtkrc.bg gtkrc.mi ; \
-	ln -s gtkrc.iso-8859-13 gtkrc.mi ; \
-	ln -s gtkrc.iso-8859-13 gtkrc.lt ; \
-	ln -s gtkrc.iso-8859-13 gtkrc.lv ; \
-	ln -s gtkrc.iso-8859-14 gtkrc.cy ; \
-	ln -s gtkrc.iso-8859-14 gtkrc.ga ; \
-	ln -s gtkrc.iso-8859-15 gtkrc.et ; \
+	ln -s gtkrc.iso885913 gtkrc.mi ; \
+	ln -s gtkrc.iso885913 gtkrc.lt ; \
+	ln -s gtkrc.iso885913 gtkrc.lv ; \
+	ln -s gtkrc.iso885914 gtkrc.cy ; \
+	ln -s gtkrc.iso885914 gtkrc.ga ; \
+	ln -s gtkrc.iso885915 gtkrc.et ; \
 	ln -s gtkrc.ka_GE.georgianps gtkrc.ka ; \
 	ln -s gtkrc.vi_VN.viscii gtkrc.vi_VN.viscii111 ; \
 	ln -s gtkrc.vi_VN.tcvn gtkrc.vi ; \
--- config.h.in
+++ config.h.in
@@ -146,12 +146,21 @@
 /* Define if you have the <nl_types.h> header file.  */
 #undef HAVE_NL_TYPES_H
 
+/* Define if you have the <stdlib.h> header file.  */
+#undef HAVE_STDLIB_H
+
 /* Define if you have the <string.h> header file.  */
 #undef HAVE_STRING_H
 
 /* Define if you have the <sys/param.h> header file.  */
 #undef HAVE_SYS_PARAM_H
 
+/* Define if you have the <sys/stat.h> header file.  */
+#undef HAVE_SYS_STAT_H
+
+/* Define if you have the <sys/types.h> header file.  */
+#undef HAVE_SYS_TYPES_H
+
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 
--- configure
+++ configure
@@ -1389,6 +1389,7 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+
 lt_target="$host"
 
 # Check for any special flags to pass to ltconfig.
@@ -1414,8 +1415,8 @@ test x"$silent" = xyes && libtool_flags=
 case "$lt_target" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 1422 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:1423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 1419 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -1436,19 +1437,19 @@ case "$lt_target" in
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:1444: checking whether the C compiler needs -belf" >&5
+echo "configure:1441: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1449 "configure"
+#line 1446 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -1551,7 +1552,7 @@ exec 5>>./config.log
 
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1559: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1556: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1581,7 +1582,7 @@ else { echo "configure: error: can not r
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1589: checking host system type" >&5
+echo "configure:1586: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -1697,7 +1698,7 @@ EOF
 
 # Build time sanity check...
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:1705: checking whether build environment is sane" >&5
+echo "configure:1702: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -1739,7 +1740,7 @@ echo "$ac_t""yes" 1>&6
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1747: checking for $ac_word" >&5
+echo "configure:1744: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1769,7 +1770,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1777: checking for $ac_word" >&5
+echo "configure:1774: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1820,7 +1821,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1828: checking for $ac_word" >&5
+echo "configure:1825: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1852,7 +1853,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1860: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1857: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1863,12 +1864,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1871 "configure"
+#line 1868 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1894,12 +1895,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1902: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1899: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1907: checking whether we are using GNU C" >&5
+echo "configure:1904: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1908,7 +1909,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1927,7 +1928,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1935: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1932: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1959,7 +1960,7 @@ else
 fi
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1967: checking for POSIXized ISC" >&5
+echo "configure:1964: checking for POSIXized ISC" >&5
 if test -d /etc/conf/kconfig.d &&
   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
@@ -1983,7 +1984,7 @@ fi
 
 
 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:1991: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:1988: checking for ${CC-cc} option to accept ANSI C" >&5
 if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1999,7 +2000,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-
 do
   CC="$ac_save_CC $ac_arg"
   cat > conftest.$ac_ext <<EOF
-#line 2007 "configure"
+#line 2004 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2036,7 +2037,7 @@ return f (e, argv, 0) != argv[0]  ||  f
 
 ; return 0; }
 EOF
-if { (eval echo configure:2044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_prog_cc_stdc="$ac_arg"; break
 else
@@ -2071,7 +2072,7 @@ esac
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2079: checking for a BSD compatible install" >&5
+echo "configure:2076: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2124,7 +2125,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:2132: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:2129: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2181,7 +2182,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2189: checking for $ac_word" >&5
+echo "configure:2186: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2215,7 +2216,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2223: checking for $ac_word" >&5
+echo "configure:2220: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2249,7 +2250,7 @@ done
 # Extract the first word of "indent", so it can be a program name with args.
 set dummy indent; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2257: checking for $ac_word" >&5
+echo "configure:2254: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_INDENT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2286,7 +2287,7 @@ fi
 
 
 echo $ac_n "checking whether make is GNU Make""... $ac_c" 1>&6
-echo "configure:2294: checking whether make is GNU Make" >&5
+echo "configure:2291: checking whether make is GNU Make" >&5
 STRIP_BEGIN=
 STRIP_END=
 if $ac_make --version 2>/dev/null | grep '^GNU Make ' >/dev/null ; then
@@ -2304,7 +2305,7 @@ STRIP_DUMMY=
 # i18n stuff
 ALL_LINGUAS="az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl no nn pl pt pt_BR ro ru sk sl sp sr sv tr uk vi wa zh_CN.GB2312 zh_TW.Big5"
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2312: checking how to run the C preprocessor" >&5
+echo "configure:2309: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2319,13 +2320,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2327 "configure"
+#line 2324 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2330: \"$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
   :
@@ -2336,13 +2337,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2344 "configure"
+#line 2341 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2347: \"$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
   :
@@ -2353,13 +2354,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2361 "configure"
+#line 2358 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2364: \"$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
   :
@@ -2384,12 +2385,12 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2392: checking for ANSI C header files" >&5
+echo "configure:2389: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2397 "configure"
+#line 2394 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2397,7 +2398,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2402: \"$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*
@@ -2414,7 +2415,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2422 "configure"
+#line 2419 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2432,7 +2433,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 2440 "configure"
+#line 2437 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2453,7 +2454,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2461 "configure"
+#line 2458 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2464,7 +2465,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
 exit (0); }
 
 EOF
-if { (eval echo configure:2472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2488,12 +2489,12 @@ EOF
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2496: checking for working const" >&5
+echo "configure:2493: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2501 "configure"
+#line 2498 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2542,7 +2543,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:2550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -2563,21 +2564,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2571: checking for inline" >&5
+echo "configure:2568: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2578 "configure"
+#line 2575 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:2585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2603,12 +2604,12 @@ EOF
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2611: checking for off_t" >&5
+echo "configure:2608: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2616 "configure"
+#line 2613 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2636,12 +2637,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2644: checking for size_t" >&5
+echo "configure:2641: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2649 "configure"
+#line 2646 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2671,19 +2672,19 @@ fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2679: checking for working alloca.h" >&5
+echo "configure:2676: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2684 "configure"
+#line 2681 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:2691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -2704,12 +2705,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2712: checking for alloca" >&5
+echo "configure:2709: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2717 "configure"
+#line 2714 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -2737,7 +2738,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:2745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -2769,12 +2770,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2777: checking whether alloca needs Cray hooks" >&5
+echo "configure:2774: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2782 "configure"
+#line 2779 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -2799,12 +2800,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2807: checking for $ac_func" >&5
+echo "configure:2804: 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 2812 "configure"
+#line 2809 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2827,7 +2828,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2832: \"$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
@@ -2854,7 +2855,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2862: checking stack direction for C alloca" >&5
+echo "configure:2859: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2862,7 +2863,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 2870 "configure"
+#line 2867 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -2881,7 +2882,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:2889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -2902,21 +2903,21 @@ EOF
 
 fi
 
-for ac_hdr in unistd.h
+for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2914: checking for $ac_hdr" >&5
+echo "configure:2911: 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 2919 "configure"
+#line 2916 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2921: \"$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*
@@ -2945,12 +2946,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2953: checking for $ac_func" >&5
+echo "configure:2950: 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 2958 "configure"
+#line 2955 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2973,7 +2974,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2978: \"$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
@@ -2998,7 +2999,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:3006: checking for working mmap" >&5
+echo "configure:3003: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3006,7 +3007,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3014 "configure"
+#line 3011 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -3034,11 +3035,24 @@ else
 #include <fcntl.h>
 #include <sys/mman.h>
 
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 /* This mess was copied from the GNU getpagesize.h.  */
 #ifndef HAVE_GETPAGESIZE
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
 
 /* Assume that all systems that can run configure have sys/param.h.  */
 # ifndef HAVE_SYS_PARAM_H
@@ -3146,7 +3160,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:3154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -3174,17 +3188,17 @@ unistd.h sys/param.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3182: checking for $ac_hdr" >&5
+echo "configure:3192: 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 3187 "configure"
+#line 3197 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3202: \"$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*
@@ -3214,12 +3228,12 @@ done
 strdup __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3222: checking for $ac_func" >&5
+echo "configure:3232: 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 3227 "configure"
+#line 3237 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3242,7 +3256,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3260: \"$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
@@ -3271,12 +3285,12 @@ done
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3279: checking for $ac_func" >&5
+echo "configure:3289: 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 3284 "configure"
+#line 3294 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3299,7 +3313,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3317: \"$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
@@ -3333,19 +3347,19 @@ EOF
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3341: checking for LC_MESSAGES" >&5
+echo "configure:3351: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3346 "configure"
+#line 3356 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:3353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -3366,7 +3380,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3374: checking whether NLS is requested" >&5
+echo "configure:3384: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -3398,17 +3412,17 @@ fi
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:3406: checking for libintl.h" >&5
+echo "configure:3416: checking for libintl.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
-#line 3411 "configure"
+#line 3421 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3426: \"$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*
@@ -3425,19 +3439,19 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for dgettext in libc""... $ac_c" 1>&6
-echo "configure:3433: checking for dgettext in libc" >&5
+echo "configure:3443: checking for dgettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_dgettext_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3438 "configure"
+#line 3448 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) dgettext ("","")
 ; return 0; }
 EOF
-if { (eval echo configure:3445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_dgettext_libc=yes
 else
@@ -3453,7 +3467,7 @@ echo "$ac_t""$gt_cv_func_dgettext_libc"
 
 	   if test "$gt_cv_func_dgettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:3461: checking for bindtextdomain in -lintl" >&5
+echo "configure:3471: checking for bindtextdomain in -lintl" >&5
 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3461,7 +3475,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3469 "configure"
+#line 3479 "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
@@ -3472,7 +3486,7 @@ int main() {
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:3480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3490: \"$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
@@ -3488,12 +3502,12 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for dgettext in libintl""... $ac_c" 1>&6
-echo "configure:3496: checking for dgettext in libintl" >&5
+echo "configure:3506: checking for dgettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_dgettext_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   echo $ac_n "checking for dgettext in -lintl""... $ac_c" 1>&6
-echo "configure:3501: checking for dgettext in -lintl" >&5
+echo "configure:3511: checking for dgettext in -lintl" >&5
 ac_lib_var=`echo intl'_'dgettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3501,7 +3515,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3509 "configure"
+#line 3519 "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
@@ -3512,7 +3526,7 @@ int main() {
 dgettext()
 ; return 0; }
 EOF
-if { (eval echo configure:3520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3530: \"$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
@@ -3555,7 +3569,7 @@ EOF
 	      # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3563: checking for $ac_word" >&5
+echo "configure:3573: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3589,12 +3603,12 @@ fi
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3597: checking for $ac_func" >&5
+echo "configure:3607: 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 3602 "configure"
+#line 3612 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3617,7 +3631,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3635: \"$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
@@ -3644,7 +3658,7 @@ done
 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3652: checking for $ac_word" >&5
+echo "configure:3662: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3680,7 +3694,7 @@ fi
 		# Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3688: checking for $ac_word" >&5
+echo "configure:3698: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3712,7 +3726,7 @@ else
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 3720 "configure"
+#line 3730 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3720,7 +3734,7 @@ extern int _nl_msg_cat_cntr;
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:3728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -3750,7 +3764,7 @@ fi
 
         if test "$CATOBJEXT" = "NONE"; then
 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:3758: checking whether catgets can be used" >&5
+echo "configure:3768: checking whether catgets can be used" >&5
 	  # Check whether --with-catgets or --without-catgets was given.
 if test "${with_catgets+set}" = set; then
   withval="$with_catgets"
@@ -3763,7 +3777,7 @@ fi
 
 	  if test "$nls_cv_use_catgets" = "yes"; then
 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:3771: checking for main in -li" >&5
+echo "configure:3781: checking for main in -li" >&5
 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3771,14 +3785,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3779 "configure"
+#line 3789 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:3786: \"$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*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3806,12 +3820,12 @@ else
 fi
 
 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:3814: checking for catgets" >&5
+echo "configure:3824: checking for catgets" >&5
 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3819 "configure"
+#line 3829 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -3834,7 +3848,7 @@ catgets();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_catgets=yes"
 else
@@ -3856,7 +3870,7 @@ EOF
 	       # Extract the first word of "gencat", so it can be a program name with args.
 set dummy gencat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3864: checking for $ac_word" >&5
+echo "configure:3874: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3996,7 +4010,7 @@ EOF
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4004: checking for catalogs to be installed" >&5
+echo "configure:4014: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -4024,17 +4038,17 @@ echo "configure:4004: checking for catal
    if test "$CATOBJEXT" = ".cat"; then
      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:4032: checking for linux/version.h" >&5
+echo "configure:4042: checking for linux/version.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
-#line 4037 "configure"
+#line 4047 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4052: \"$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*
@@ -4106,7 +4120,7 @@ gtklocaledir='${prefix}/${DATADIRNAME}/l
 
 
 echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6
-echo "configure:4114: checking for extra flags to get ANSI library prototypes" >&5
+echo "configure:4124: checking for extra flags to get ANSI library prototypes" >&5
 
 gtk_save_LIBS=$LIBS
 LIBS="$LIBS -lm"
@@ -4115,12 +4129,12 @@ if test "$cross_compiling" = yes; then
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 4123 "configure"
+#line 4133 "configure"
 #include "confdefs.h"
 #include <math.h>
              int main (void) { return (log(1) != log(1.)); }
 EOF
-if { (eval echo configure:4128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4138: \"$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
@@ -4134,12 +4148,12 @@ else
      
 else
   cat > conftest.$ac_ext <<EOF
-#line 4142 "configure"
+#line 4152 "configure"
 #include "confdefs.h"
 #include <math.h>
 	         int main (void) { return (log(1) != log(1.)); }
 EOF
-if { (eval echo configure:4147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4157: \"$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
@@ -4160,16 +4174,16 @@ fi
 LIBS=$gtk_save_LIBS
 
 echo $ac_n "checking for extra flags for POSIX compliance""... $ac_c" 1>&6
-echo "configure:4168: checking for extra flags for POSIX compliance" >&5
+echo "configure:4178: checking for extra flags for POSIX compliance" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4170 "configure"
+#line 4180 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 int main() {
 DIR *dir;
 ; return 0; }
 EOF
-if { (eval echo configure:4177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""none needed" 1>&6
 else
@@ -4179,14 +4193,14 @@ else
   gtk_save_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -posix"
   cat > conftest.$ac_ext <<EOF
-#line 4187 "configure"
+#line 4197 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 int main() {
 DIR *dir;
 ; return 0; }
 EOF
-if { (eval echo configure:4194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""-posix" 1>&6
 else
@@ -4262,7 +4276,7 @@ fi
   # Extract the first word of "glib-config", so it can be a program name with args.
 set dummy glib-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4270: checking for $ac_word" >&5
+echo "configure:4280: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4297,7 +4311,7 @@ fi
 
   min_glib_version=1.2.8
   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
-echo "configure:4305: checking for GLIB - version >= $min_glib_version" >&5
+echo "configure:4315: checking for GLIB - version >= $min_glib_version" >&5
   no_glib=""
   if test "$GLIB_CONFIG" = "no" ; then
     no_glib=yes
@@ -4320,7 +4334,7 @@ echo "configure:4305: checking for GLIB
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 4328 "configure"
+#line 4338 "configure"
 #include "confdefs.h"
 
 #include <glib.h>
@@ -4396,7 +4410,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:4404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -4430,7 +4444,7 @@ fi
           CFLAGS="$CFLAGS $GLIB_CFLAGS"
           LIBS="$LIBS $GLIB_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 4438 "configure"
+#line 4448 "configure"
 #include "confdefs.h"
 
 #include <glib.h>
@@ -4440,7 +4454,7 @@ int main() {
  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:4448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GLIB or finding the wrong"
@@ -4536,7 +4550,7 @@ fi
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:4544: checking for X" >&5
+echo "configure:4554: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -4598,12 +4612,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 4606 "configure"
+#line 4616 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4621: \"$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*
@@ -4672,14 +4686,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4680 "configure"
+#line 4690 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:4687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -4785,17 +4799,17 @@ else
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:4793: checking whether -R must be followed by a space" >&5
+echo "configure:4803: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 4796 "configure"
+#line 4806 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -4811,14 +4825,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 4819 "configure"
+#line 4829 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -4850,7 +4864,7 @@ rm -f conftest*
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:4858: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:4868: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4858,7 +4872,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4866 "configure"
+#line 4876 "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
@@ -4869,7 +4883,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:4877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4887: \"$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
@@ -4891,7 +4905,7 @@ fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:4899: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:4909: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4899,7 +4913,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4907 "configure"
+#line 4917 "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
@@ -4910,7 +4924,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:4918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4928: \"$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
@@ -4939,12 +4953,12 @@ fi
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:4947: checking for gethostbyname" >&5
+echo "configure:4957: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4952 "configure"
+#line 4962 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -4967,7 +4981,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -4988,7 +5002,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4996: checking for gethostbyname in -lnsl" >&5
+echo "configure:5006: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4996,7 +5010,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5004 "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
@@ -5007,7 +5021,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:5015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5025: \"$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
@@ -5037,12 +5051,12 @@ fi
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:5045: checking for connect" >&5
+echo "configure:5055: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5050 "configure"
+#line 5060 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -5065,7 +5079,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -5086,7 +5100,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:5094: checking for connect in -lsocket" >&5
+echo "configure:5104: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5094,7 +5108,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5102 "configure"
+#line 5112 "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
@@ -5105,7 +5119,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:5113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5123: \"$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
@@ -5129,12 +5143,12 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:5137: checking for remove" >&5
+echo "configure:5147: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5142 "configure"
+#line 5152 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -5157,7 +5171,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -5178,7 +5192,7 @@ fi
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:5186: checking for remove in -lposix" >&5
+echo "configure:5196: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5186,7 +5200,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5194 "configure"
+#line 5204 "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
@@ -5197,7 +5211,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:5205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5215: \"$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
@@ -5221,12 +5235,12 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:5229: checking for shmat" >&5
+echo "configure:5239: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5234 "configure"
+#line 5244 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -5249,7 +5263,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -5270,7 +5284,7 @@ fi
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:5278: checking for shmat in -lipc" >&5
+echo "configure:5288: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5278,7 +5292,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5286 "configure"
+#line 5296 "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
@@ -5289,7 +5303,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:5297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5307: \"$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
@@ -5322,7 +5336,7 @@ fi
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:5330: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:5340: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5330,7 +5344,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5338 "configure"
+#line 5348 "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
@@ -5341,7 +5355,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:5349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5359: \"$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
@@ -5385,7 +5399,7 @@ fi
 # Checks for libraries.
 # Check for the X11 library
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:5393: checking for XOpenDisplay in -lX11" >&5
+echo "configure:5403: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5393,7 +5407,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lX11 $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5401 "configure"
+#line 5411 "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
@@ -5404,7 +5418,7 @@ int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:5412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5422: \"$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
@@ -5429,7 +5443,7 @@ fi
 if test "x$enable_shm" = "xyes"; then
   # Check for the Xext library (needed for XShm extention)
   echo $ac_n "checking for XShmAttach in -lXext""... $ac_c" 1>&6
-echo "configure:5437: checking for XShmAttach in -lXext" >&5
+echo "configure:5447: checking for XShmAttach in -lXext" >&5
 ac_lib_var=`echo Xext'_'XShmAttach | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5437,7 +5451,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXext $x_libs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5445 "configure"
+#line 5455 "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
@@ -5448,7 +5462,7 @@ int main() {
 XShmAttach()
 ; return 0; }
 EOF
-if { (eval echo configure:5456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5466: \"$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
@@ -5468,7 +5482,7 @@ else
   echo "$ac_t""no" 1>&6
 # On AIX, it is in XextSam instead, but we still need -lXext
       echo $ac_n "checking for XShmAttach in -lXextSam""... $ac_c" 1>&6
-echo "configure:5476: checking for XShmAttach in -lXextSam" >&5
+echo "configure:5486: checking for XShmAttach in -lXextSam" >&5
 ac_lib_var=`echo XextSam'_'XShmAttach | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5476,7 +5490,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXextSam $x_libs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5484 "configure"
+#line 5494 "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
@@ -5487,7 +5501,7 @@ int main() {
 XShmAttach()
 ; return 0; }
 EOF
-if { (eval echo configure:5495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5505: \"$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
@@ -5515,7 +5529,7 @@ fi
 # Check for shaped window extension
 
 echo $ac_n "checking for XShapeCombineMask in -lXext""... $ac_c" 1>&6
-echo "configure:5523: checking for XShapeCombineMask in -lXext" >&5
+echo "configure:5533: checking for XShapeCombineMask in -lXext" >&5
 ac_lib_var=`echo Xext'_'XShapeCombineMask | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5523,7 +5537,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lXext $x_libs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5531 "configure"
+#line 5541 "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
@@ -5534,7 +5548,7 @@ int main() {
 XShapeCombineMask()
 ; return 0; }
 EOF
-if { (eval echo configure:5542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5552: \"$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
@@ -5564,7 +5578,7 @@ fi
 # Check for XConvertCase (X11R6 specific)
 
 echo $ac_n "checking for XConvertCase in -lX11""... $ac_c" 1>&6
-echo "configure:5572: checking for XConvertCase in -lX11" >&5
+echo "configure:5582: checking for XConvertCase in -lX11" >&5
 ac_lib_var=`echo X11'_'XConvertCase | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5572,7 +5586,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lX11 $x_libs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5580 "configure"
+#line 5590 "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
@@ -5583,7 +5597,7 @@ int main() {
 XConvertCase()
 ; return 0; }
 EOF
-if { (eval echo configure:5591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5601: \"$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
@@ -5610,7 +5624,7 @@ fi
 # Check for XIM support.
 
 echo $ac_n "checking for XUnregisterIMInstantiateCallback in -lX11""... $ac_c" 1>&6
-echo "configure:5618: checking for XUnregisterIMInstantiateCallback in -lX11" >&5
+echo "configure:5628: checking for XUnregisterIMInstantiateCallback in -lX11" >&5
 ac_lib_var=`echo X11'_'XUnregisterIMInstantiateCallback | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5618,7 +5632,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lX11 $x_libs $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5626 "configure"
+#line 5636 "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
@@ -5629,7 +5643,7 @@ int main() {
 XUnregisterIMInstantiateCallback()
 ; return 0; }
 EOF
-if { (eval echo configure:5637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5647: \"$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
@@ -5717,17 +5731,17 @@ if test "x$enable_shm" = "xyes"; then
   # Check for shared memory
   ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
-echo "configure:5725: checking for sys/ipc.h" >&5
+echo "configure:5735: checking for sys/ipc.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
-#line 5730 "configure"
+#line 5740 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5745: \"$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*
@@ -5754,17 +5768,17 @@ fi
 
   ac_safe=`echo "sys/shm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/shm.h""... $ac_c" 1>&6
-echo "configure:5762: checking for sys/shm.h" >&5
+echo "configure:5772: checking for sys/shm.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
-#line 5767 "configure"
+#line 5777 "configure"
 #include "confdefs.h"
 #include <sys/shm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5782: \"$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*
@@ -5792,7 +5806,7 @@ fi
 
   # Check for the X shared memory extension header file
   echo $ac_n "checking X11/extensions/XShm.h""... $ac_c" 1>&6
-echo "configure:5800: checking X11/extensions/XShm.h" >&5
+echo "configure:5810: checking X11/extensions/XShm.h" >&5
   if test "x$no_xext_lib" = "xyes"; then
     echo "$ac_t""no" 1>&6
     no_xshm=yes
@@ -5813,13 +5827,13 @@ fi
 # Check if X_LOCALE definition is necessary
 
 echo $ac_n "checking need -DX_LOCALE""... $ac_c" 1>&6
-echo "configure:5821: checking need -DX_LOCALE" >&5
+echo "configure:5831: checking need -DX_LOCALE" >&5
 
 if test "$cross_compiling" = yes; then
   need_x_locale=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 5827 "configure"
+#line 5837 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -5831,7 +5845,7 @@ main ()
   return setlocale (LC_ALL, "${with_locale}") == NULL;
 }
 EOF
-if { (eval echo configure:5839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   need_x_locale=no
 else
@@ -5851,10 +5865,10 @@ if test $need_x_locale = yes; then
 else
   if test x$with_native_locale = xyes ; then
     echo $ac_n "checking functioning locale support""... $ac_c" 1>&6
-echo "configure:5859: checking functioning locale support" >&5
+echo "configure:5869: checking functioning locale support" >&5
   
     cat > conftest.$ac_ext <<EOF
-#line 5862 "configure"
+#line 5872 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int main() {
@@ -5866,7 +5880,7 @@ int main() {
     
 ; return 0; }
 EOF
-if { (eval echo configure:5874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   use_native_locale=yes
 else
@@ -5881,13 +5895,13 @@ fi
 
 if test x$use_native_locale = xyes ; then
   echo $ac_n "checking if sizeof(wchar_t) == 4""... $ac_c" 1>&6
-echo "configure:5889: checking if sizeof(wchar_t) == 4" >&5
+echo "configure:5899: checking if sizeof(wchar_t) == 4" >&5
 
   if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 5895 "configure"
+#line 5905 "configure"
 #include "confdefs.h"
 
   #include <stdlib.h>
@@ -5898,7 +5912,7 @@ else
     return (sizeof(wchar_t) == 4) ? 0 : 1;
   }
 EOF
-if { (eval echo configure:5906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -5922,12 +5936,12 @@ fi
 
 # Checks for header files.
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:5930: checking for ANSI C header files" >&5
+echo "configure:5940: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5935 "configure"
+#line 5945 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5935,7 +5949,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5953: \"$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*
@@ -5952,7 +5966,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 5960 "configure"
+#line 5970 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -5970,7 +5984,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 5978 "configure"
+#line 5988 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -5991,7 +6005,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 5999 "configure"
+#line 6009 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -6002,7 +6016,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
 exit (0); }
 
 EOF
-if { (eval echo configure:6010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -6028,12 +6042,12 @@ fi
 
 # Checks for typedefs, structures, and compiler characteristics.
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:6036: checking for working const" >&5
+echo "configure:6046: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6041 "configure"
+#line 6051 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -6082,7 +6096,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -6105,12 +6119,12 @@ fi
 
 # Checks for library functions.
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:6113: checking return type of signal handlers" >&5
+echo "configure:6123: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6118 "configure"
+#line 6128 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -6127,7 +6141,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:6135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6145: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -6145,21 +6159,21 @@ cat >> confdefs.h <<EOF
 EOF
 
 
-for ac_hdr in unistd.h
+for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6157: checking for $ac_hdr" >&5
+echo "configure:6167: 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 6162 "configure"
+#line 6172 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6177: \"$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*
@@ -6188,12 +6202,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6196: checking for $ac_func" >&5
+echo "configure:6206: 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 6201 "configure"
+#line 6211 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6216,7 +6230,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6234: \"$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
@@ -6241,7 +6255,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:6249: checking for working mmap" >&5
+echo "configure:6259: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6249,7 +6263,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6257 "configure"
+#line 6267 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -6277,11 +6291,24 @@ else
 #include <fcntl.h>
 #include <sys/mman.h>
 
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
 /* This mess was copied from the GNU getpagesize.h.  */
 #ifndef HAVE_GETPAGESIZE
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
 
 /* Assume that all systems that can run configure have sys/param.h.  */
 # ifndef HAVE_SYS_PARAM_H
@@ -6389,7 +6416,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:6397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -6415,12 +6442,12 @@ fi
 for ac_func in getresuid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6423: checking for $ac_func" >&5
+echo "configure:6446: 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 6428 "configure"
+#line 6451 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6443,7 +6470,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6474: \"$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
@@ -6468,12 +6495,12 @@ fi
 done
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:6476: checking for uid_t in sys/types.h" >&5
+echo "configure:6499: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6481 "configure"
+#line 6504 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -6504,16 +6531,16 @@ fi
 
 # 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:6512: checking for fd_set" >&5
+echo "configure:6535: checking for fd_set" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6514 "configure"
+#line 6537 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
 fd_set readMask, writeMask;
 ; return 0; }
 EOF
-if { (eval echo configure:6521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gtk_ok=yes
 else
@@ -6527,7 +6554,7 @@ if test $gtk_ok = yes; then
     echo "$ac_t""yes, found in sys/types.h" 1>&6
 else
     cat > conftest.$ac_ext <<EOF
-#line 6535 "configure"
+#line 6558 "configure"
 #include "confdefs.h"
 #include <sys/select.h>
 EOF
@@ -6556,14 +6583,14 @@ fi
 # Duplicate `widechar' tests from `glib'.
 # Check for wchar.h
 echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
-echo "configure:6564: checking for wchar.h" >&5
+echo "configure:6587: checking for wchar.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6566 "configure"
+#line 6589 "configure"
 #include "confdefs.h"
 #include <wchar.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6594: \"$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*
@@ -6586,14 +6613,14 @@ echo "$ac_t""$gtk_ok" 1>&6
 
 # Check for wctype.h (for iswalnum)
 echo $ac_n "checking for wctype.h""... $ac_c" 1>&6
-echo "configure:6594: checking for wctype.h" >&5
+echo "configure:6617: checking for wctype.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6596 "configure"
+#line 6619 "configure"
 #include "confdefs.h"
 #include <wctype.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6624: \"$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*
@@ -6617,12 +6644,12 @@ echo "$ac_t""$gtk_ok" 1>&6
 # in Solaris 2.5, `iswalnum' is in -lw
 GDK_WLIBS=
 echo $ac_n "checking for iswalnum""... $ac_c" 1>&6
-echo "configure:6625: checking for iswalnum" >&5
+echo "configure:6648: 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 6630 "configure"
+#line 6653 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char iswalnum(); below.  */
@@ -6645,7 +6672,7 @@ iswalnum();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6676: \"$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
@@ -6663,7 +6690,7 @@ if eval "test \"`echo '$ac_cv_func_'iswa
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for iswalnum in -lw""... $ac_c" 1>&6
-echo "configure:6671: checking for iswalnum in -lw" >&5
+echo "configure:6694: 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
@@ -6671,7 +6698,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lw  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6679 "configure"
+#line 6702 "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
@@ -6682,7 +6709,7 @@ int main() {
 iswalnum()
 ; return 0; }
 EOF
-if { (eval echo configure:6690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6713: \"$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
@@ -6709,9 +6736,9 @@ fi
 oLIBS="$LIBS"
 LIBS="$LIBS $GDK_WLIBS"
 echo $ac_n "checking if iswalnum() and friends are properly defined""... $ac_c" 1>&6
-echo "configure:6717: checking if iswalnum() and friends are properly defined" >&5
+echo "configure:6740: checking if iswalnum() and friends are properly defined" >&5
 cat > conftest.$ac_ext <<EOF
-#line 6719 "configure"
+#line 6742 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int main() {
@@ -6731,7 +6758,7 @@ iswalnum((wchar_t) 0);
 
 ; return 0; }
 EOF
-if { (eval echo configure:6739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gtk_ok=yes
 else