Wed May 9 16:06:29 UTC 2007

Author: dbruce-guest
Date: 2007-05-09 16:06:27 +0000 (Wed, 09 May 2007)
New Revision: 179

Added:
   tuxtype/trunk/configure.ac
Removed:
   tuxtype/trunk/configure.in
Modified:
   tuxtype/trunk/Makefile
   tuxtype/trunk/Makefile.in
   tuxtype/trunk/config.h
   tuxtype/trunk/config.h.in
   tuxtype/trunk/config.log
   tuxtype/trunk/config.status
   tuxtype/trunk/nsis/tuxtype.nsi
   tuxtype/trunk/tuxtype/Makefile.in
   tuxtype/trunk/tuxtype/alphabet.c
   tuxtype/trunk/tuxtype/data/Makefile.in
   tuxtype/trunk/tuxtype/data/fonts/Makefile
   tuxtype/trunk/tuxtype/data/fonts/Makefile.in
   tuxtype/trunk/tuxtype/data/images/Makefile.in
   tuxtype/trunk/tuxtype/data/images/backgrounds/Makefile.in
   tuxtype/trunk/tuxtype/data/images/cities/Makefile.in
   tuxtype/trunk/tuxtype/data/images/comets/Makefile.in
   tuxtype/trunk/tuxtype/data/images/hands/Makefile.in
   tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.in
   tuxtype/trunk/tuxtype/data/images/menu/Makefile.in
   tuxtype/trunk/tuxtype/data/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/images/tux/Makefile.in
   tuxtype/trunk/tuxtype/data/scripts/Makefile.in
   tuxtype/trunk/tuxtype/data/sounds/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile
   tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile
   tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile
   tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile
   tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile
   tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile
   tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/french/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/greek/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/italian/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/lithuanian/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/russian/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.in
   tuxtype/trunk/tuxtype/data/words/Makefile.in
   tuxtype/trunk/tuxtype/docs/Makefile.in
   tuxtype/trunk/tuxtype/docs/en/Makefile.in
   tuxtype/trunk/tuxtype/funcs.h
   tuxtype/trunk/tuxtype/loaders.c
   tuxtype/trunk/tuxtype/main.c
   tuxtype/trunk/tuxtype/theme.c
   tuxtype/trunk/tuxtype/titlescreen.c
Log:
Fixed CheckFile() to use fopen and opendir to check for file/dir existence, rather than stat()


Modified: tuxtype/trunk/Makefile
===================================================================

--- tuxtype/trunk/Makefile	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/Makefile	2007-05-09 16:06:27 UTC (rev 179)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -13,15 +13,11 @@
 # PARTICULAR PURPOSE.
 
 
-srcdir = .
-top_srcdir = .
 
 pkgdatadir = $(datadir)/tuxtype
 pkglibdir = $(libdir)/tuxtype
 pkgincludedir = $(includedir)/tuxtype
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -33,23 +29,23 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-target_triplet = i686-pc-linux-gnu
+build_triplet = i386-pc-linux-gnu
+host_triplet = i586-pc-mingw32msvc
+target_triplet = i586-pc-mingw32msvc
+subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/tuxtype.spec.in $(top_srcdir)/configure \
 	$(top_srcdir)/nsis/tuxtype.nsi.in AUTHORS COPYING ChangeLog \
 	INSTALL TODO config.guess config.sub depcomp install-sh \
 	missing mkinstalldirs
-subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = tuxtype.spec nsis/tuxtype.nsi
@@ -57,10 +53,13 @@
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -75,21 +74,17 @@
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run automake-1.9
-AWK = gawk
-BUILD_MINGW32_FALSE = 
-BUILD_MINGW32_TRUE = #
-CC = gcc
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10
+AWK = mawk
+CC = i586-mingw32msvc-gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-CPP = gcc -E
-CPPFLAGS = -march=athlon-xp -O2 -pipe -fomit-frame-pointer -DDATA_PREFIX=\"$(prefix)\"
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
+CPP = i586-mingw32msvc-gcc -E
+CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -97,89 +92,95 @@
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
-EXEEXT = 
+EXEEXT = .exe
 GREP = /bin/grep
+INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
 LIBOBJS = 
-LIBS = -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image 
+LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  -lgw32c -luuid -lole32 -lwsock32 -mwindows
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run makeinfo
-NSIS = no
-NSI_BUILD_FALSE = #
-NSI_BUILD_TRUE = 
-NSI_DLL_DIR = /home/huftis/tuxtype_dll
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo
+MKDIR_P = /bin/mkdir -p
+NSIS = /usr/bin/makensis
+NSI_DLL_DIR = /home/dbruce/tuxtype_dll
 NSI_INSTALL_DIR = mingw32
 OBJEXT = o
 PACKAGE = tuxtype
-PACKAGE_BUGREPORT = 
+PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
 PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.7
+PACKAGE_STRING = tuxtype 1.5.9
 PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.7
+PACKAGE_VERSION = 1.5.9
 PATH_SEPARATOR = :
 SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 SDL_CONFIG = /usr/bin/sdl-config
 SDL_LIBS = -L/usr/lib -lSDL
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = 
-VERSION = 1.5.7
-WINDRES = 
-ac_ct_CC = gcc
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
+STRIP = i586-mingw32msvc-strip
+VERSION = 1.5.9
+WINDRES = /usr/bin/i586-mingw32msvc-windres
+abs_builddir = /home/dbruce/tux4kids/tuxtype/trunk
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/trunk
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
+ac_ct_CC = 
 am__include = include
 am__leading_dot = .
 am__quote = 
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
+build = i386-pc-linux-gnu
+build_alias = i386-linux
+build_cpu = i386
 build_os = linux-gnu
 build_vendor = pc
+builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
+host = i586-pc-mingw32msvc
+host_alias = i586-mingw32msvc
+host_cpu = i586
+host_os = mingw32msvc
 host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/huftis/utvikling/tux4kids/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
 mandir = ${datarootdir}/man
-mkdir_p = mkdir -p --
+mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr
-program_transform_name = s,x,x,
+prefix = /usr/local/cross-tools/i586-mingw32msvc
+program_transform_name = s&^&i586-mingw32msvc-&
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
+srcdir = .
 sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
-target_alias = 
-target_cpu = i686
-target_os = linux-gnu
+target = i586-pc-mingw32msvc
+target_alias = i586-mingw32msvc
+target_cpu = i586
+target_os = mingw32msvc
 target_vendor = pc
+top_builddir = .
+top_srcdir = .
 
 # Modified to include support for NSIS Windows installer - David Bruce <dbruce at tampabay.rr.com>
-MAKENSIS = no
+MAKENSIS = /usr/bin/makensis
 SUBDIRS = tuxtype
 EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO tuxtype.lsm tuxtype.spec tuxtype.spec.in README.Win32 config.h autorun.inf tuxtype.ico autogen.sh
 
@@ -226,7 +227,7 @@
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -243,7 +244,6 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 nsis/tuxtype.nsi: $(top_builddir)/config.status $(top_srcdir)/nsis/tuxtype.nsi.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -276,8 +276,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -379,24 +378,22 @@
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/nsis
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	test -d $(distdir) || mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -410,7 +407,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -418,6 +415,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -425,7 +424,7 @@
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -500,7 +499,7 @@
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -569,12 +568,20 @@
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -595,24 +602,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-local clean-recursive ctags \
-	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
-	dist-tarZ dist-zip distcheck distclean distclean-generic \
-	distclean-hdr distclean-recursive distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am uninstall-local
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	clean-local ctags ctags-recursive dist dist-all dist-bzip2 \
+	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-local
 
 
 install-data-local:

Modified: tuxtype/trunk/Makefile.in
===================================================================
--- tuxtype/trunk/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -41,7 +41,7 @@
 	missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

Modified: tuxtype/trunk/config.h
===================================================================
--- tuxtype/trunk/config.h	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/config.h	2007-05-09 16:06:27 UTC (rev 179)
@@ -1,8 +1,8 @@
 /* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Native MinGW32 build */
-/* #undef BUILD_MINGW32 */
+#define BUILD_MINGW32 1
 
 /* Define to 1 if you have the `atexit' function. */
 #define HAVE_ATEXIT 1
@@ -59,25 +59,25 @@
 #define PACKAGE "tuxtype"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
+#define PACKAGE_BUGREPORT "tuxmath-devel at lists.sourceforge.net"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "tuxtype"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "tuxtype 1.5.7"
+#define PACKAGE_STRING "tuxtype 1.5.9"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "tuxtype"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.5.7"
+#define PACKAGE_VERSION "1.5.9"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.5.7"
+#define VERSION "1.5.9"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */

Modified: tuxtype/trunk/config.h.in
===================================================================
--- tuxtype/trunk/config.h.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/config.h.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Native MinGW32 build */
 #undef BUILD_MINGW32

Modified: tuxtype/trunk/config.log
===================================================================
--- tuxtype/trunk/config.log	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/config.log	2007-05-09 16:06:27 UTC (rev 179)
@@ -1,25 +1,25 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tuxtype configure 1.5.7, which was
+It was created by tuxtype configure 1.5.9, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
-  $ ./configure --prefix=/usr
+  $ configure --cache-file=cross-config.cache --target=i586-mingw32msvc --host=i586-mingw32msvc --build=i386-linux --prefix=/usr/local/cross-tools/i586-mingw32msvc --with-sdl-prefix
 
 ## --------- ##
 ## Platform. ##
 ## --------- ##
 
-hostname = localhost
-uname -m = i686
-uname -r = 2.6.17.14-mm-desktop-5mdv
+hostname = debian
+uname -m = x86_64
+uname -r = 2.6.20
 uname -s = Linux
-uname -v = #1 PREEMPT Wed Mar 21 14:23:04 EDT 2007
+uname -v = #1 SMP PREEMPT Thu Mar 29 14:40:23 EDT 2007
 
 /usr/bin/uname -p = unknown
 /bin/uname -X     = unknown
 
-/bin/arch              = i686
+/bin/arch              = x86_64
 /usr/bin/arch -k       = unknown
 /usr/convex/getsysinfo = unknown
 /usr/bin/hostinfo      = unknown
@@ -27,253 +27,254 @@
 /usr/bin/oslevel       = unknown
 /bin/universe          = unknown
 
+PATH: /usr/local/cross-tools/bin
+PATH: /usr/local/cross-tools/i586-mingw32msvc/bin
+PATH: /usr/local/bin
 PATH: /usr/bin
 PATH: /bin
-PATH: /usr/local/bin
-PATH: /usr/X11R6/bin/
 PATH: /usr/games
-PATH: /usr/lib/qt3//bin
-PATH: /usr/share/unsermake
-PATH: /usr/lib/qt3//bin
-PATH: /usr/share/unsermake
 
 
 ## ----------- ##
 ## Core tests. ##
 ## ----------- ##
 
-configure:1800: checking build system type
-configure:1818: result: i686-pc-linux-gnu
-configure:1840: checking host system type
-configure:1855: result: i686-pc-linux-gnu
-configure:1877: checking target system type
-configure:1892: result: i686-pc-linux-gnu
-configure:1936: checking for a BSD-compatible install
-configure:1992: result: /usr/bin/install -c
-configure:2003: checking whether build environment is sane
-configure:2046: result: yes
-configure:2111: checking for gawk
-configure:2127: found /usr/bin/gawk
-configure:2138: result: gawk
-configure:2149: checking whether make sets $(MAKE)
-configure:2170: result: yes
-configure:2406: checking for gcc
-configure:2422: found /usr/bin/gcc
-configure:2433: result: gcc
-configure:2671: checking for C compiler version
-configure:2678: gcc --version >&5
-gcc (GCC) 4.1.2 20070302 (prerelease) (4.1.2-1mdv2007.1)
-Copyright (C) 2006 Free Software Foundation, Inc.
+configure:1682: creating cache cross-config.cache
+configure:1804: checking build system type
+configure:1822: result: i386-pc-linux-gnu
+configure:1844: checking host system type
+configure:1859: result: i586-pc-mingw32msvc
+configure:1881: checking target system type
+configure:1896: result: i586-pc-mingw32msvc
+configure:1941: checking for a BSD-compatible install
+configure:1997: result: /usr/bin/install -c
+configure:2008: checking whether build environment is sane
+configure:2051: result: yes
+configure:2079: checking for a thread-safe mkdir -p
+configure:2118: result: /bin/mkdir -p
+configure:2131: checking for gawk
+configure:2161: result: no
+configure:2131: checking for mawk
+configure:2147: found /usr/bin/mawk
+configure:2158: result: mawk
+configure:2169: checking whether make sets $(MAKE)
+configure:2190: result: yes
+configure:2270: checking for i586-mingw32msvc-strip
+configure:2286: found /usr/bin/i586-mingw32msvc-strip
+configure:2297: result: i586-mingw32msvc-strip
+configure:2390: checking for i586-mingw32msvc-gcc
+configure:2406: found /usr/bin/i586-mingw32msvc-gcc
+configure:2417: result: i586-mingw32msvc-gcc
+configure:2695: checking for C compiler version
+configure:2702: i586-mingw32msvc-gcc --version >&5
+i586-mingw32msvc-gcc (GCC) 3.4.5 (mingw special)
+Copyright (C) 2004 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-configure:2681: $? = 0
-configure:2688: gcc -v >&5
-Using built-in specs.
-Target: i586-mandriva-linux-gnu
-Configured with: ../configure --prefix=/usr --libexecdir=/usr/lib --with-slibdir=/lib --mandir=/usr/share/man --infodir=/usr/share/info --enable-checking=release --enable-languages=c,c++,ada,fortran,objc,obj-c++,java --host=i586-mandriva-linux-gnu --with-cpu=generic --with-system-zlib --enable-threads=posix --enable-shared --enable-long-long --enable-__cxa_atexit --disable-libunwind-exceptions --enable-clocale=gnu --enable-java-awt=gtk --with-java-home=/usr/lib/jvm/java-1.4.2-gcj-1.4.2.0/jre --enable-gtk-cairo --disable-libjava-multilib --enable-ssp --disable-libssp
-Thread model: posix
-gcc version 4.1.2 20070302 (prerelease) (4.1.2-1mdv2007.1)
-configure:2691: $? = 0
-configure:2698: gcc -V >&5
-gcc: '-V' option must have argument
-configure:2701: $? = 1
-configure:2724: checking for C compiler default output file name
-configure:2751: gcc -march=athlon-xp -O2 -pipe -fomit-frame-pointer -march=athlon-xp -O2 -pipe -fomit-frame-pointer  conftest.c  >&5
-configure:2754: $? = 0
-configure:2792: result: a.out
-configure:2809: checking whether the C compiler works
-configure:2819: ./a.out
-configure:2822: $? = 0
-configure:2839: result: yes
-configure:2846: checking whether we are cross compiling
-configure:2848: result: no
-configure:2851: checking for suffix of executables
-configure:2858: gcc -o conftest -march=athlon-xp -O2 -pipe -fomit-frame-pointer -march=athlon-xp -O2 -pipe -fomit-frame-pointer  conftest.c  >&5
-configure:2861: $? = 0
-configure:2885: result: 
-configure:2891: checking for suffix of object files
-configure:2917: gcc -c -march=athlon-xp -O2 -pipe -fomit-frame-pointer -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c >&5
-configure:2920: $? = 0
-configure:2943: result: o
-configure:2947: checking whether we are using the GNU C compiler
-configure:2976: gcc -c -march=athlon-xp -O2 -pipe -fomit-frame-pointer -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c >&5
-configure:2982: $? = 0
-configure:2999: result: yes
-configure:3004: checking whether gcc accepts -g
-configure:3034: gcc -c -g -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c >&5
-configure:3040: $? = 0
-configure:3139: result: yes
-configure:3156: checking for gcc option to accept ISO C89
-configure:3230: gcc  -c -march=athlon-xp -O2 -pipe -fomit-frame-pointer -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c >&5
-configure:3236: $? = 0
-configure:3259: result: none needed
-configure:3288: checking for style of include used by make
-configure:3316: result: GNU
-configure:3344: checking dependency style of gcc
-configure:3434: result: gcc3
-configure:3464: checking for a BSD-compatible install
-configure:3520: result: /usr/bin/install -c
-configure:3531: checking whether ln -s works
-configure:3535: result: yes
-configure:3542: checking whether make sets $(MAKE)
-configure:3563: result: yes
-configure:3630: checking for sdl-config
-configure:3648: found /usr/bin/sdl-config
-configure:3661: result: /usr/bin/sdl-config
-configure:3670: checking for SDL - version >= 1.2.5
-configure:3765: gcc -o conftest -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer  conftest.c  -L/usr/lib -lSDL >&5
-configure:3768: $? = 0
-configure:3774: ./conftest
-configure:3777: $? = 0
-configure:3797: result: yes
-configure:3893: checking for IMG_Load in -lSDL_image
-configure:3928: gcc -o conftest -march=athlon-xp -O2 -pipe -fomit-frame-pointer -march=athlon-xp -O2 -pipe -fomit-frame-pointer  conftest.c -lSDL_image   >&5
-configure:3934: $? = 0
-configure:3952: result: yes
-configure:3968: checking for Mix_PlayMusic in -lSDL_mixer
-configure:4003: gcc -o conftest -march=athlon-xp -O2 -pipe -fomit-frame-pointer -march=athlon-xp -O2 -pipe -fomit-frame-pointer  conftest.c -lSDL_mixer  -lSDL_image  >&5
-configure:4009: $? = 0
-configure:4027: result: yes
-configure:4043: checking for TTF_Init in -lSDL_ttf
-configure:4078: gcc -o conftest -march=athlon-xp -O2 -pipe -fomit-frame-pointer -march=athlon-xp -O2 -pipe -fomit-frame-pointer  conftest.c -lSDL_ttf  -lSDL_mixer -lSDL_image  >&5
-configure:4084: $? = 0
-configure:4102: result: yes
-configure:4126: checking for native Win32
-configure:4136: result: no
-configure:4210: checking how to run the C preprocessor
-configure:4250: gcc -E -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c
-configure:4256: $? = 0
-configure:4287: gcc -E -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c
-conftest.c:13:28: error: ac_nonexistent.h: No such file or directory
-configure:4293: $? = 1
+configure:2705: $? = 0
+configure:2712: i586-mingw32msvc-gcc -v >&5
+Reading specs from /usr/lib/gcc/i586-mingw32msvc/3.4.5/specs
+Configured with: /home/ron/devel/debian/mingw32/mingw32-3.4.5.20060117.1.dfsg/build_dir/src/gcc-3.4.5-20060117-1-dfsg/configure -v --prefix=/usr --target=i586-mingw32msvc --enable-languages=c,c++ --enable-threads --enable-sjlj-exceptions --disable-multilib --enable-version-specific-runtime-libs
+Thread model: win32
+gcc version 3.4.5 (mingw special)
+configure:2715: $? = 0
+configure:2722: i586-mingw32msvc-gcc -V >&5
+i586-mingw32msvc-gcc: `-V' option must have argument
+configure:2725: $? = 1
+configure:2748: checking for C compiler default output file name
+configure:2775: i586-mingw32msvc-gcc  -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c  >&5
+configure:2778: $? = 0
+configure:2816: result: a.exe
+configure:2833: checking whether the C compiler works
+configure:2863: result: yes
+configure:2870: checking whether we are cross compiling
+configure:2872: result: yes
+configure:2875: checking for suffix of executables
+configure:2882: i586-mingw32msvc-gcc -o conftest.exe  -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c  >&5
+configure:2885: $? = 0
+configure:2909: result: .exe
+configure:2915: checking for suffix of object files
+configure:2941: i586-mingw32msvc-gcc -c  -I/usr/local/cross-tools/i586-mingw32msvc/include conftest.c >&5
+configure:2944: $? = 0
+configure:2967: result: o
+configure:2971: checking whether we are using the GNU C compiler
+configure:3000: i586-mingw32msvc-gcc -c  -I/usr/local/cross-tools/i586-mingw32msvc/include conftest.c >&5
+configure:3006: $? = 0
+configure:3023: result: yes
+configure:3028: checking whether i586-mingw32msvc-gcc accepts -g
+configure:3058: i586-mingw32msvc-gcc -c -g -I/usr/local/cross-tools/i586-mingw32msvc/include conftest.c >&5
+configure:3064: $? = 0
+configure:3163: result: yes
+configure:3180: checking for i586-mingw32msvc-gcc option to accept ISO C89
+configure:3254: i586-mingw32msvc-gcc  -c -g -O2 -I/usr/local/cross-tools/i586-mingw32msvc/include conftest.c >&5
+configure:3260: $? = 0
+configure:3283: result: none needed
+configure:3312: checking for style of include used by make
+configure:3340: result: GNU
+configure:3365: checking dependency style of i586-mingw32msvc-gcc
+configure:3456: result: gcc3
+configure:3484: checking for a BSD-compatible install
+configure:3540: result: /usr/bin/install -c
+configure:3551: checking whether ln -s works
+configure:3555: result: yes
+configure:3562: checking whether make sets $(MAKE)
+configure:3583: result: yes
+configure:3650: checking for sdl-config
+configure:3668: found /usr/bin/sdl-config
+configure:3681: result: /usr/bin/sdl-config
+configure:3690: checking for SDL - version >= 1.2.5
+configure:3817: result: yes
+configure:3913: checking for IMG_Load in -lSDL_image
+configure:3948: i586-mingw32msvc-gcc -o conftest.exe -g -O2 -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c -lSDL_image   >&5
+configure:3954: $? = 0
+configure:3972: result: yes
+configure:3988: checking for Mix_PlayMusic in -lSDL_mixer
+configure:4023: i586-mingw32msvc-gcc -o conftest.exe -g -O2 -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c -lSDL_mixer  -lSDL_image  >&5
+configure:4029: $? = 0
+configure:4047: result: yes
+configure:4063: checking for TTF_Init in -lSDL_ttf
+configure:4098: i586-mingw32msvc-gcc -o conftest.exe -g -O2 -I/usr/local/cross-tools/i586-mingw32msvc/include -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c -lSDL_ttf  -lSDL_mixer -lSDL_image  >&5
+configure:4104: $? = 0
+configure:4122: result: yes
+configure:4146: checking for native Win32
+configure:4156: result: yes
+configure:4180: checking for i586-mingw32msvc-windres
+configure:4198: found /usr/bin/i586-mingw32msvc-windres
+configure:4211: result: /usr/bin/i586-mingw32msvc-windres
+configure:4228: checking how to run the C preprocessor
+configure:4268: i586-mingw32msvc-gcc -E -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc conftest.c
+configure:4274: $? = 0
+configure:4305: i586-mingw32msvc-gcc -E -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc conftest.c
+conftest.c:14:28: ac_nonexistent.h: No such file or directory
+configure:4311: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "tuxtype"
 | #define PACKAGE_TARNAME "tuxtype"
-| #define PACKAGE_VERSION "1.5.7"
-| #define PACKAGE_STRING "tuxtype 1.5.7"
-| #define PACKAGE_BUGREPORT ""
+| #define PACKAGE_VERSION "1.5.9"
+| #define PACKAGE_STRING "tuxtype 1.5.9"
+| #define PACKAGE_BUGREPORT "tuxmath-devel at lists.sourceforge.net"
 | #define PACKAGE "tuxtype"
-| #define VERSION "1.5.7"
+| #define VERSION "1.5.9"
 | #define HAVE_LIBSDL_IMAGE 1
 | #define HAVE_LIBSDL_MIXER 1
 | #define HAVE_LIBSDL_TTF 1
+| #define BUILD_MINGW32 1
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:4326: result: gcc -E
-configure:4355: gcc -E -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c
-configure:4361: $? = 0
-configure:4392: gcc -E -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c
-conftest.c:13:28: error: ac_nonexistent.h: No such file or directory
-configure:4398: $? = 1
+configure:4344: result: i586-mingw32msvc-gcc -E
+configure:4373: i586-mingw32msvc-gcc -E -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc conftest.c
+configure:4379: $? = 0
+configure:4410: i586-mingw32msvc-gcc -E -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc conftest.c
+conftest.c:14:28: ac_nonexistent.h: No such file or directory
+configure:4416: $? = 1
 configure: failed program was:
 | /* confdefs.h.  */
 | #define PACKAGE_NAME "tuxtype"
 | #define PACKAGE_TARNAME "tuxtype"
-| #define PACKAGE_VERSION "1.5.7"
-| #define PACKAGE_STRING "tuxtype 1.5.7"
-| #define PACKAGE_BUGREPORT ""
+| #define PACKAGE_VERSION "1.5.9"
+| #define PACKAGE_STRING "tuxtype 1.5.9"
+| #define PACKAGE_BUGREPORT "tuxmath-devel at lists.sourceforge.net"
 | #define PACKAGE "tuxtype"
-| #define VERSION "1.5.7"
+| #define VERSION "1.5.9"
 | #define HAVE_LIBSDL_IMAGE 1
 | #define HAVE_LIBSDL_MIXER 1
 | #define HAVE_LIBSDL_TTF 1
+| #define BUILD_MINGW32 1
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:4436: checking for grep that handles long lines and -e
-configure:4510: result: /bin/grep
-configure:4515: checking for egrep
-configure:4593: result: /bin/grep -E
-configure:4598: checking for ANSI C header files
-configure:4628: gcc -c -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c >&5
-configure:4634: $? = 0
-configure:4733: gcc -o conftest -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer  conftest.c -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  >&5
-configure:4736: $? = 0
-configure:4742: ./conftest
-configure:4745: $? = 0
-configure:4762: result: yes
-configure:4786: checking for sys/types.h
-configure:4807: gcc -c -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c >&5
-configure:4813: $? = 0
-configure:4829: result: yes
-configure:4786: checking for sys/stat.h
-configure:4807: gcc -c -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c >&5
-configure:4813: $? = 0
-configure:4829: result: yes
-configure:4786: checking for stdlib.h
-configure:4807: gcc -c -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c >&5
-configure:4813: $? = 0
-configure:4829: result: yes
-configure:4786: checking for string.h
-configure:4807: gcc -c -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c >&5
-configure:4813: $? = 0
-configure:4829: result: yes
-configure:4786: checking for memory.h
-configure:4807: gcc -c -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c >&5
-configure:4813: $? = 0
-configure:4829: result: yes
-configure:4786: checking for strings.h
-configure:4807: gcc -c -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c >&5
-configure:4813: $? = 0
-configure:4829: result: yes
-configure:4786: checking for inttypes.h
-configure:4807: gcc -c -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c >&5
-configure:4813: $? = 0
-configure:4829: result: yes
-configure:4786: checking for stdint.h
-configure:4807: gcc -c -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c >&5
-configure:4813: $? = 0
-configure:4829: result: yes
-configure:4786: checking for unistd.h
-configure:4807: gcc -c -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c >&5
-configure:4813: $? = 0
-configure:4829: result: yes
-configure:4847: checking for stdlib.h
-configure:4853: result: yes
-configure:4847: checking for string.h
-configure:4853: result: yes
-configure:4984: checking for an ANSI C-conforming const
-configure:5059: gcc -c -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c >&5
-configure:5065: $? = 0
-configure:5080: result: yes
-configure:5090: checking for inline
-configure:5116: gcc -c -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer conftest.c >&5
-configure:5122: $? = 0
-configure:5140: result: inline
-configure:5169: checking for atexit
-configure:5225: gcc -o conftest -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer  conftest.c -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  >&5
-configure:5231: $? = 0
-configure:5249: result: yes
-configure:5169: checking for memset
-configure:5225: gcc -o conftest -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer  conftest.c -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  >&5
-conftest.c:49: warning: conflicting types for built-in function 'memset'
-configure:5231: $? = 0
-configure:5249: result: yes
-configure:5169: checking for strchr
-configure:5225: gcc -o conftest -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer  conftest.c -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  >&5
-conftest.c:50: warning: conflicting types for built-in function 'strchr'
-configure:5231: $? = 0
-configure:5249: result: yes
-configure:5169: checking for strstr
-configure:5225: gcc -o conftest -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer  conftest.c -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  >&5
-conftest.c:51: warning: conflicting types for built-in function 'strstr'
-configure:5231: $? = 0
-configure:5249: result: yes
-configure:5169: checking for malloc
-configure:5225: gcc -o conftest -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -march=athlon-xp -O2 -pipe -fomit-frame-pointer  conftest.c -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  >&5
-conftest.c:52: warning: conflicting types for built-in function 'malloc'
-configure:5231: $? = 0
-configure:5249: result: yes
-configure:5303: checking for makensis
-configure:5334: result: no
-configure:5475: creating ./config.status
+configure:4454: checking for grep that handles long lines and -e
+configure:4528: result: /bin/grep
+configure:4533: checking for egrep
+configure:4611: result: /bin/grep -E
+configure:4616: checking for ANSI C header files
+configure:4646: i586-mingw32msvc-gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc conftest.c >&5
+configure:4652: $? = 0
+configure:4780: result: yes
+configure:4804: checking for sys/types.h
+configure:4825: i586-mingw32msvc-gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc conftest.c >&5
+configure:4831: $? = 0
+configure:4847: result: yes
+configure:4804: checking for sys/stat.h
+configure:4825: i586-mingw32msvc-gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc conftest.c >&5
+configure:4831: $? = 0
+configure:4847: result: yes
+configure:4804: checking for stdlib.h
+configure:4825: i586-mingw32msvc-gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc conftest.c >&5
+configure:4831: $? = 0
+configure:4847: result: yes
+configure:4804: checking for string.h
+configure:4825: i586-mingw32msvc-gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc conftest.c >&5
+configure:4831: $? = 0
+configure:4847: result: yes
+configure:4804: checking for memory.h
+configure:4825: i586-mingw32msvc-gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc conftest.c >&5
+configure:4831: $? = 0
+configure:4847: result: yes
+configure:4804: checking for strings.h
+configure:4825: i586-mingw32msvc-gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc conftest.c >&5
+configure:4831: $? = 0
+configure:4847: result: yes
+configure:4804: checking for inttypes.h
+configure:4825: i586-mingw32msvc-gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc conftest.c >&5
+configure:4831: $? = 0
+configure:4847: result: yes
+configure:4804: checking for stdint.h
+configure:4825: i586-mingw32msvc-gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc conftest.c >&5
+configure:4831: $? = 0
+configure:4847: result: yes
+configure:4804: checking for unistd.h
+configure:4825: i586-mingw32msvc-gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc conftest.c >&5
+configure:4831: $? = 0
+configure:4847: result: yes
+configure:4865: checking for stdlib.h
+configure:4871: result: yes
+configure:4865: checking for string.h
+configure:4871: result: yes
+configure:5007: checking for an ANSI C-conforming const
+configure:5082: i586-mingw32msvc-gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc conftest.c >&5
+configure:5088: $? = 0
+configure:5103: result: yes
+configure:5113: checking for inline
+configure:5139: i586-mingw32msvc-gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc conftest.c >&5
+configure:5145: $? = 0
+configure:5163: result: inline
+configure:5192: checking for atexit
+configure:5248: i586-mingw32msvc-gcc -o conftest.exe -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  -lgw32c -luuid -lole32 -lwsock32 -mwindows >&5
+configure:5254: $? = 0
+configure:5272: result: yes
+configure:5192: checking for memset
+configure:5248: i586-mingw32msvc-gcc -o conftest.exe -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  -lgw32c -luuid -lole32 -lwsock32 -mwindows >&5
+conftest.c:50: warning: conflicting types for built-in function 'memset'
+configure:5254: $? = 0
+configure:5272: result: yes
+configure:5192: checking for strchr
+configure:5248: i586-mingw32msvc-gcc -o conftest.exe -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  -lgw32c -luuid -lole32 -lwsock32 -mwindows >&5
+conftest.c:51: warning: conflicting types for built-in function 'strchr'
+configure:5254: $? = 0
+configure:5272: result: yes
+configure:5192: checking for strstr
+configure:5248: i586-mingw32msvc-gcc -o conftest.exe -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  -lgw32c -luuid -lole32 -lwsock32 -mwindows >&5
+conftest.c:52: warning: conflicting types for built-in function 'strstr'
+configure:5254: $? = 0
+configure:5272: result: yes
+configure:5192: checking for malloc
+configure:5248: i586-mingw32msvc-gcc -o conftest.exe -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__ -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -L/usr/local/cross-tools/i586-mingw32msvc/lib conftest.c -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  -lgw32c -luuid -lole32 -lwsock32 -mwindows >&5
+conftest.c:53: warning: conflicting types for built-in function 'malloc'
+configure:5254: $? = 0
+configure:5272: result: yes
+configure:5324: checking for makensis
+configure:5342: found /usr/bin/makensis
+configure:5355: result: /usr/bin/makensis
+configure:5432: updating cache cross-config.cache
+configure:5496: creating ./config.status
 
 ## ---------------------- ##
 ## Running config.status. ##
 ## ---------------------- ##
 
-This file was extended by tuxtype config.status 1.5.7, which was
+This file was extended by tuxtype config.status 1.5.9, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = 
@@ -282,109 +283,109 @@
   CONFIG_COMMANDS = 
   $ ./config.status 
 
-on localhost
+on debian
 
-config.status:730: creating Makefile
-config.status:730: creating tuxtype/Makefile
-config.status:730: creating tuxtype/data/Makefile
-config.status:730: creating tuxtype/data/fonts/Makefile
-config.status:730: creating tuxtype/data/images/Makefile
-config.status:730: creating tuxtype/data/images/backgrounds/Makefile
-config.status:730: creating tuxtype/data/images/cities/Makefile
-config.status:730: creating tuxtype/data/images/comets/Makefile
-config.status:730: creating tuxtype/data/images/hands/Makefile
-config.status:730: creating tuxtype/data/images/keyboard/Makefile
-config.status:730: creating tuxtype/data/images/menu/Makefile
-config.status:730: creating tuxtype/data/images/status/Makefile
-config.status:730: creating tuxtype/data/images/tux/Makefile
-config.status:730: creating tuxtype/data/scripts/Makefile
-config.status:730: creating tuxtype/data/sounds/Makefile
-config.status:730: creating tuxtype/data/themes/Makefile
-config.status:730: creating tuxtype/data/themes/armenian/Makefile
-config.status:730: creating tuxtype/data/themes/armenian/images/Makefile
-config.status:730: creating tuxtype/data/themes/bokmal/Makefile
-config.status:730: creating tuxtype/data/themes/bokmal/words/Makefile
-config.status:730: creating tuxtype/data/themes/bokmal/images/Makefile
-config.status:730: creating tuxtype/data/themes/bokmal/images/status/Makefile
-config.status:730: creating tuxtype/data/themes/brazilian-portuguese/Makefile
-config.status:730: creating tuxtype/data/themes/brazilian-portuguese/images/Makefile
-config.status:730: creating tuxtype/data/themes/brazilian-portuguese/words/Makefile
-config.status:730: creating tuxtype/data/themes/catalan/Makefile
-config.status:730: creating tuxtype/data/themes/catalan/words/Makefile
-config.status:730: creating tuxtype/data/themes/dansk/Makefile
-config.status:730: creating tuxtype/data/themes/dansk/sounds/Makefile
-config.status:730: creating tuxtype/data/themes/dansk/words/Makefile
-config.status:730: creating tuxtype/data/themes/deutsch/Makefile
-config.status:730: creating tuxtype/data/themes/deutsch/words/Makefile
-config.status:730: creating tuxtype/data/themes/espanol/Makefile
-config.status:730: creating tuxtype/data/themes/espanol/images/Makefile
-config.status:730: creating tuxtype/data/themes/espanol/words/Makefile
-config.status:730: creating tuxtype/data/themes/euskara/Makefile
-config.status:730: creating tuxtype/data/themes/euskara/images/Makefile
-config.status:730: creating tuxtype/data/themes/euskara/words/Makefile
-config.status:730: creating tuxtype/data/themes/french/Makefile
-config.status:730: creating tuxtype/data/themes/french/words/Makefile
-config.status:730: creating tuxtype/data/themes/greek/Makefile
-config.status:730: creating tuxtype/data/themes/greek/words/Makefile
-config.status:730: creating tuxtype/data/themes/italian/Makefile
-config.status:730: creating tuxtype/data/themes/italian/words/Makefile
-config.status:730: creating tuxtype/data/themes/jamaican/Makefile
-config.status:730: creating tuxtype/data/themes/jamaican/images/Makefile
-config.status:730: creating tuxtype/data/themes/jamaican/words/Makefile
-config.status:730: creating tuxtype/data/themes/lithuanian/Makefile
-config.status:730: creating tuxtype/data/themes/lithuanian/images/Makefile
-config.status:730: creating tuxtype/data/themes/lithuanian/images/status/Makefile
-config.status:730: creating tuxtype/data/themes/lithuanian/sounds/Makefile
-config.status:730: creating tuxtype/data/themes/lithuanian/words/Makefile
-config.status:730: creating tuxtype/data/themes/nederlands/Makefile
-config.status:730: creating tuxtype/data/themes/nederlands/words/Makefile
-config.status:730: creating tuxtype/data/themes/nynorsk/Makefile
-config.status:730: creating tuxtype/data/themes/nynorsk/images/Makefile
-config.status:730: creating tuxtype/data/themes/nynorsk/images/status/Makefile
-config.status:730: creating tuxtype/data/themes/nynorsk/words/Makefile
-config.status:730: creating tuxtype/data/themes/russian/Makefile
-config.status:730: creating tuxtype/data/themes/russian/images/Makefile
-config.status:730: creating tuxtype/data/themes/russian/images/status/Makefile
-config.status:730: creating tuxtype/data/themes/russian/words/Makefile
-config.status:730: creating tuxtype/data/themes/svenska/Makefile
-config.status:730: creating tuxtype/data/themes/svenska/words/Makefile
-config.status:730: creating tuxtype/data/themes/swahili/Makefile
-config.status:730: creating tuxtype/data/themes/swahili/words/Makefile
-config.status:730: creating tuxtype/data/words/Makefile
-config.status:730: creating tuxtype/docs/Makefile
-config.status:730: creating tuxtype/docs/en/Makefile
-config.status:730: creating tuxtype.spec
-config.status:730: creating nsis/tuxtype.nsi
-config.status:730: creating config.h
-config.status:960: config.h is unchanged
-config.status:1006: executing depfiles commands
+config.status:732: creating Makefile
+config.status:732: creating tuxtype/Makefile
+config.status:732: creating tuxtype/data/Makefile
+config.status:732: creating tuxtype/data/fonts/Makefile
+config.status:732: creating tuxtype/data/images/Makefile
+config.status:732: creating tuxtype/data/images/backgrounds/Makefile
+config.status:732: creating tuxtype/data/images/cities/Makefile
+config.status:732: creating tuxtype/data/images/comets/Makefile
+config.status:732: creating tuxtype/data/images/hands/Makefile
+config.status:732: creating tuxtype/data/images/keyboard/Makefile
+config.status:732: creating tuxtype/data/images/menu/Makefile
+config.status:732: creating tuxtype/data/images/status/Makefile
+config.status:732: creating tuxtype/data/images/tux/Makefile
+config.status:732: creating tuxtype/data/scripts/Makefile
+config.status:732: creating tuxtype/data/sounds/Makefile
+config.status:732: creating tuxtype/data/themes/Makefile
+config.status:732: creating tuxtype/data/themes/armenian/Makefile
+config.status:732: creating tuxtype/data/themes/armenian/images/Makefile
+config.status:732: creating tuxtype/data/themes/bokmal/Makefile
+config.status:732: creating tuxtype/data/themes/bokmal/words/Makefile
+config.status:732: creating tuxtype/data/themes/bokmal/images/Makefile
+config.status:732: creating tuxtype/data/themes/bokmal/images/status/Makefile
+config.status:732: creating tuxtype/data/themes/brazilian-portuguese/Makefile
+config.status:732: creating tuxtype/data/themes/brazilian-portuguese/images/Makefile
+config.status:732: creating tuxtype/data/themes/brazilian-portuguese/words/Makefile
+config.status:732: creating tuxtype/data/themes/catalan/Makefile
+config.status:732: creating tuxtype/data/themes/catalan/words/Makefile
+config.status:732: creating tuxtype/data/themes/dansk/Makefile
+config.status:732: creating tuxtype/data/themes/dansk/sounds/Makefile
+config.status:732: creating tuxtype/data/themes/dansk/words/Makefile
+config.status:732: creating tuxtype/data/themes/deutsch/Makefile
+config.status:732: creating tuxtype/data/themes/deutsch/words/Makefile
+config.status:732: creating tuxtype/data/themes/espanol/Makefile
+config.status:732: creating tuxtype/data/themes/espanol/images/Makefile
+config.status:732: creating tuxtype/data/themes/espanol/words/Makefile
+config.status:732: creating tuxtype/data/themes/euskara/Makefile
+config.status:732: creating tuxtype/data/themes/euskara/images/Makefile
+config.status:732: creating tuxtype/data/themes/euskara/words/Makefile
+config.status:732: creating tuxtype/data/themes/french/Makefile
+config.status:732: creating tuxtype/data/themes/french/words/Makefile
+config.status:732: creating tuxtype/data/themes/greek/Makefile
+config.status:732: creating tuxtype/data/themes/greek/words/Makefile
+config.status:732: creating tuxtype/data/themes/italian/Makefile
+config.status:732: creating tuxtype/data/themes/italian/words/Makefile
+config.status:732: creating tuxtype/data/themes/jamaican/Makefile
+config.status:732: creating tuxtype/data/themes/jamaican/images/Makefile
+config.status:732: creating tuxtype/data/themes/jamaican/words/Makefile
+config.status:732: creating tuxtype/data/themes/lithuanian/Makefile
+config.status:732: creating tuxtype/data/themes/lithuanian/images/Makefile
+config.status:732: creating tuxtype/data/themes/lithuanian/images/status/Makefile
+config.status:732: creating tuxtype/data/themes/lithuanian/sounds/Makefile
+config.status:732: creating tuxtype/data/themes/lithuanian/words/Makefile
+config.status:732: creating tuxtype/data/themes/nederlands/Makefile
+config.status:732: creating tuxtype/data/themes/nederlands/words/Makefile
+config.status:732: creating tuxtype/data/themes/nynorsk/Makefile
+config.status:732: creating tuxtype/data/themes/nynorsk/images/Makefile
+config.status:732: creating tuxtype/data/themes/nynorsk/images/status/Makefile
+config.status:732: creating tuxtype/data/themes/nynorsk/words/Makefile
+config.status:732: creating tuxtype/data/themes/russian/Makefile
+config.status:732: creating tuxtype/data/themes/russian/images/Makefile
+config.status:732: creating tuxtype/data/themes/russian/images/status/Makefile
+config.status:732: creating tuxtype/data/themes/russian/words/Makefile
+config.status:732: creating tuxtype/data/themes/svenska/Makefile
+config.status:732: creating tuxtype/data/themes/svenska/words/Makefile
+config.status:732: creating tuxtype/data/themes/swahili/Makefile
+config.status:732: creating tuxtype/data/themes/swahili/words/Makefile
+config.status:732: creating tuxtype/data/words/Makefile
+config.status:732: creating tuxtype/docs/Makefile
+config.status:732: creating tuxtype/docs/en/Makefile
+config.status:732: creating tuxtype.spec
+config.status:732: creating nsis/tuxtype.nsi
+config.status:732: creating config.h
+config.status:1015: executing depfiles commands
 
 ## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##
 
-ac_cv_build=i686-pc-linux-gnu
+ac_cv_build=i386-pc-linux-gnu
 ac_cv_c_compiler_gnu=yes
 ac_cv_c_const=yes
 ac_cv_c_inline=inline
 ac_cv_env_CC_set=
 ac_cv_env_CC_value=
-ac_cv_env_CFLAGS_set=set
-ac_cv_env_CFLAGS_value='-march=athlon-xp -O2 -pipe -fomit-frame-pointer'
+ac_cv_env_CFLAGS_set=
+ac_cv_env_CFLAGS_value=
 ac_cv_env_CPPFLAGS_set=set
-ac_cv_env_CPPFLAGS_value='-march=athlon-xp -O2 -pipe -fomit-frame-pointer'
+ac_cv_env_CPPFLAGS_value=-I/usr/local/cross-tools/i586-mingw32msvc/include
 ac_cv_env_CPP_set=
 ac_cv_env_CPP_value=
-ac_cv_env_LDFLAGS_set=
-ac_cv_env_LDFLAGS_value=
+ac_cv_env_LDFLAGS_set=set
+ac_cv_env_LDFLAGS_value=-L/usr/local/cross-tools/i586-mingw32msvc/lib
 ac_cv_env_LIBS_set=
 ac_cv_env_LIBS_value=
-ac_cv_env_build_alias_set=
-ac_cv_env_build_alias_value=
-ac_cv_env_host_alias_set=
-ac_cv_env_host_alias_value=
-ac_cv_env_target_alias_set=
-ac_cv_env_target_alias_value=
+ac_cv_env_build_alias_set=set
+ac_cv_env_build_alias_value=i386-linux
+ac_cv_env_host_alias_set=set
+ac_cv_env_host_alias_value=i586-mingw32msvc
+ac_cv_env_target_alias_set=set
+ac_cv_env_target_alias_value=i586-mingw32msvc
+ac_cv_exeext=.exe
 ac_cv_func_atexit=yes
 ac_cv_func_malloc=yes
 ac_cv_func_memset=yes
@@ -400,45 +401,48 @@
 ac_cv_header_sys_stat_h=yes
 ac_cv_header_sys_types_h=yes
 ac_cv_header_unistd_h=yes
-ac_cv_host=i686-pc-linux-gnu
+ac_cv_host=i586-pc-mingw32msvc
 ac_cv_lib_SDL_image_IMG_Load=yes
 ac_cv_lib_SDL_mixer_Mix_PlayMusic=yes
 ac_cv_lib_SDL_ttf_TTF_Init=yes
 ac_cv_objext=o
 ac_cv_path_EGREP='/bin/grep -E'
 ac_cv_path_GREP=/bin/grep
-ac_cv_path_NSIS=no
+ac_cv_path_NSIS=/usr/bin/makensis
 ac_cv_path_SDL_CONFIG=/usr/bin/sdl-config
+ac_cv_path_WINDRES=/usr/bin/i586-mingw32msvc-windres
 ac_cv_path_install='/usr/bin/install -c'
-ac_cv_prog_AWK=gawk
-ac_cv_prog_CPP='gcc -E'
-ac_cv_prog_ac_ct_CC=gcc
+ac_cv_path_mkdir=/bin/mkdir
+ac_cv_prog_AWK=mawk
+ac_cv_prog_CC=i586-mingw32msvc-gcc
+ac_cv_prog_CPP='i586-mingw32msvc-gcc -E'
+ac_cv_prog_STRIP=i586-mingw32msvc-strip
 ac_cv_prog_cc_c89=
 ac_cv_prog_cc_g=yes
 ac_cv_prog_make_make_set=yes
-ac_cv_target=i686-pc-linux-gnu
+ac_cv_target=i586-pc-mingw32msvc
 am_cv_CC_dependencies_compiler_type=gcc3
 
 ## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##
 
-ACLOCAL='${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run aclocal-1.9'
+ACLOCAL='${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10'
 AMDEPBACKSLASH='\'
 AMDEP_FALSE='#'
 AMDEP_TRUE=''
-AMTAR='${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run tar'
-AUTOCONF='${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoconf'
-AUTOHEADER='${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoheader'
-AUTOMAKE='${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run automake-1.9'
-AWK='gawk'
-BUILD_MINGW32_FALSE=''
-BUILD_MINGW32_TRUE='#'
-CC='gcc'
+AMTAR='${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar'
+AUTOCONF='${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf'
+AUTOHEADER='${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader'
+AUTOMAKE='${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10'
+AWK='mawk'
+BUILD_MINGW32_FALSE='#'
+BUILD_MINGW32_TRUE=''
+CC='i586-mingw32msvc-gcc'
 CCDEPMODE='depmode=gcc3'
-CFLAGS='-march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT'
-CPP='gcc -E'
-CPPFLAGS='-march=athlon-xp -O2 -pipe -fomit-frame-pointer -DDATA_PREFIX=\"$(prefix)\"'
+CFLAGS='-g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__'
+CPP='i586-mingw32msvc-gcc -E'
+CPPFLAGS='-I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"'
 CYGPATH_W='echo'
 DEFS='-DHAVE_CONFIG_H'
 DEPDIR='.deps'
@@ -446,51 +450,52 @@
 ECHO_N='-n'
 ECHO_T=''
 EGREP='/bin/grep -E'
-EXEEXT=''
+EXEEXT='.exe'
 GREP='/bin/grep'
 INSTALL_DATA='${INSTALL} -m 644'
 INSTALL_PROGRAM='${INSTALL}'
 INSTALL_SCRIPT='${INSTALL}'
-INSTALL_STRIP_PROGRAM='${SHELL} $(install_sh) -c -s'
-LDFLAGS=''
+INSTALL_STRIP_PROGRAM='$(install_sh) -c -s'
+LDFLAGS='-L/usr/local/cross-tools/i586-mingw32msvc/lib'
 LIBOBJS=''
-LIBS='-L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image '
+LIBS='-lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  -lgw32c -luuid -lole32 -lwsock32 -mwindows'
 LN_S='ln -s'
 LTLIBOBJS=''
-MAKEINFO='${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run makeinfo'
-NSIS='no'
+MAKEINFO='${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo'
+NSIS='/usr/bin/makensis'
 NSI_BUILD_FALSE='#'
 NSI_BUILD_TRUE=''
-NSI_DLL_DIR='/home/huftis/tuxtype_dll'
+NSI_DLL_DIR='/home/dbruce/tuxtype_dll'
 NSI_INSTALL_DIR='mingw32'
 OBJEXT='o'
 PACKAGE='tuxtype'
-PACKAGE_BUGREPORT=''
+PACKAGE_BUGREPORT='tuxmath-devel at lists.sourceforge.net'
 PACKAGE_NAME='tuxtype'
-PACKAGE_STRING='tuxtype 1.5.7'
+PACKAGE_STRING='tuxtype 1.5.9'
 PACKAGE_TARNAME='tuxtype'
-PACKAGE_VERSION='1.5.7'
+PACKAGE_VERSION='1.5.9'
 PATH_SEPARATOR=':'
 SDL_CFLAGS='-I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT'
 SDL_CONFIG='/usr/bin/sdl-config'
 SDL_LIBS='-L/usr/lib -lSDL'
 SET_MAKE=''
 SHELL='/bin/sh'
-STRIP=''
-VERSION='1.5.7'
-WINDRES=''
-ac_ct_CC='gcc'
+STRIP='i586-mingw32msvc-strip'
+VERSION='1.5.9'
+WINDRES='/usr/bin/i586-mingw32msvc-windres'
+ac_ct_CC=''
 am__fastdepCC_FALSE='#'
 am__fastdepCC_TRUE=''
 am__include='include'
+am__isrc=''
 am__leading_dot='.'
 am__quote=''
 am__tar='${AMTAR} chof - "$$tardir"'
 am__untar='${AMTAR} xf -'
 bindir='${exec_prefix}/bin'
-build='i686-pc-linux-gnu'
-build_alias=''
-build_cpu='i686'
+build='i386-pc-linux-gnu'
+build_alias='i386-linux'
+build_cpu='i386'
 build_os='linux-gnu'
 build_vendor='pc'
 datadir='${datarootdir}'
@@ -498,33 +503,33 @@
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 dvidir='${docdir}'
 exec_prefix='${prefix}'
-host='i686-pc-linux-gnu'
-host_alias=''
-host_cpu='i686'
-host_os='linux-gnu'
+host='i586-pc-mingw32msvc'
+host_alias='i586-mingw32msvc'
+host_cpu='i586'
+host_os='mingw32msvc'
 host_vendor='pc'
 htmldir='${docdir}'
 includedir='${prefix}/include'
 infodir='${datarootdir}/info'
-install_sh='/home/huftis/utvikling/tux4kids/tuxtype/trunk/install-sh'
+install_sh='$(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh'
 libdir='${exec_prefix}/lib'
 libexecdir='${exec_prefix}/libexec'
 localedir='${datarootdir}/locale'
 localstatedir='${prefix}/var'
 mandir='${datarootdir}/man'
-mkdir_p='mkdir -p --'
+mkdir_p='/bin/mkdir -p'
 oldincludedir='/usr/include'
 pdfdir='${docdir}'
-prefix='/usr'
-program_transform_name='s,x,x,'
+prefix='/usr/local/cross-tools/i586-mingw32msvc'
+program_transform_name='s&^&i586-mingw32msvc-&'
 psdir='${docdir}'
 sbindir='${exec_prefix}/sbin'
 sharedstatedir='${prefix}/com'
 sysconfdir='${prefix}/etc'
-target='i686-pc-linux-gnu'
-target_alias=''
-target_cpu='i686'
-target_os='linux-gnu'
+target='i586-pc-mingw32msvc'
+target_alias='i586-mingw32msvc'
+target_cpu='i586'
+target_os='mingw32msvc'
 target_vendor='pc'
 
 ## ----------- ##
@@ -533,14 +538,15 @@
 
 #define PACKAGE_NAME "tuxtype"
 #define PACKAGE_TARNAME "tuxtype"
-#define PACKAGE_VERSION "1.5.7"
-#define PACKAGE_STRING "tuxtype 1.5.7"
-#define PACKAGE_BUGREPORT ""
+#define PACKAGE_VERSION "1.5.9"
+#define PACKAGE_STRING "tuxtype 1.5.9"
+#define PACKAGE_BUGREPORT "tuxmath-devel at lists.sourceforge.net"
 #define PACKAGE "tuxtype"
-#define VERSION "1.5.7"
+#define VERSION "1.5.9"
 #define HAVE_LIBSDL_IMAGE 1
 #define HAVE_LIBSDL_MIXER 1
 #define HAVE_LIBSDL_TTF 1
+#define BUILD_MINGW32 1
 #define STDC_HEADERS 1
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_STAT_H 1
@@ -560,21 +566,3 @@
 #define HAVE_MALLOC 1
 
 configure: exit 0
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by tuxtype config.status 1.5.7, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status config.h
-
-on localhost
-
-config.status:730: creating config.h
-config.status:960: config.h is unchanged

Modified: tuxtype/trunk/config.status
===================================================================
--- tuxtype/trunk/config.status	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/config.status	2007-05-09 16:06:27 UTC (rev 179)
@@ -288,7 +288,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by tuxtype $as_me 1.5.7, which was
+This file was extended by tuxtype $as_me 1.5.9, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -333,17 +333,18 @@
 Report bugs to <bug-autoconf at gnu.org>."
 
 ac_cs_version="\
-tuxtype config.status 1.5.7
-configured by ./configure, generated by GNU Autoconf 2.61,
-  with options \"'--prefix=/usr' 'CFLAGS=-march=athlon-xp -O2 -pipe -fomit-frame-pointer' 'CPPFLAGS=-march=athlon-xp -O2 -pipe -fomit-frame-pointer'\"
+tuxtype config.status 1.5.9
+configured by configure, generated by GNU Autoconf 2.61,
+  with options \"'--cache-file=cross-config.cache' '--target=i586-mingw32msvc' '--host=i586-mingw32msvc' '--build=i386-linux' '--prefix=/usr/local/cross-tools/i586-mingw32msvc' '--with-sdl-prefix' 'build_alias=i386-linux' 'host_alias=i586-mingw32msvc' 'target_alias=i586-mingw32msvc' 'LDFLAGS=-L/usr/local/cross-tools/i586-mingw32msvc/lib' 'CPPFLAGS=-I/usr/local/cross-tools/i586-mingw32msvc/include'\"
 
 Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/huftis/utvikling/tux4kids/tuxtype/trunk'
+ac_pwd='/home/dbruce/tux4kids/tuxtype/trunk'
 srcdir='.'
 INSTALL='/usr/bin/install -c'
+MKDIR_P='/bin/mkdir -p'
 # If no file are specified by the user, then we need to provide default
 # value.  By we need to know if files were specified by the user.
 ac_need_defaults=:
@@ -409,10 +410,10 @@
 fi
 
 if $ac_cs_recheck; then
-  echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " '--prefix=/usr' 'CFLAGS=-march=athlon-xp -O2 -pipe -fomit-frame-pointer' 'CPPFLAGS=-march=athlon-xp -O2 -pipe -fomit-frame-pointer' $ac_configure_extra_args " --no-create --no-recursion" >&6
+  echo "running CONFIG_SHELL=/bin/sh /bin/sh configure " '--cache-file=cross-config.cache' '--target=i586-mingw32msvc' '--host=i586-mingw32msvc' '--build=i386-linux' '--prefix=/usr/local/cross-tools/i586-mingw32msvc' '--with-sdl-prefix' 'build_alias=i386-linux' 'host_alias=i586-mingw32msvc' 'target_alias=i586-mingw32msvc' 'LDFLAGS=-L/usr/local/cross-tools/i586-mingw32msvc/lib' 'CPPFLAGS=-I/usr/local/cross-tools/i586-mingw32msvc/include' $ac_configure_extra_args " --no-create --no-recursion" >&6
   CONFIG_SHELL=/bin/sh
   export CONFIG_SHELL
-  exec /bin/sh "./configure" '--prefix=/usr' 'CFLAGS=-march=athlon-xp -O2 -pipe -fomit-frame-pointer' 'CPPFLAGS=-march=athlon-xp -O2 -pipe -fomit-frame-pointer' $ac_configure_extra_args --no-create --no-recursion
+  exec /bin/sh "configure" '--cache-file=cross-config.cache' '--target=i586-mingw32msvc' '--host=i586-mingw32msvc' '--build=i386-linux' '--prefix=/usr/local/cross-tools/i586-mingw32msvc' '--with-sdl-prefix' 'build_alias=i386-linux' 'host_alias=i586-mingw32msvc' 'target_alias=i586-mingw32msvc' 'LDFLAGS=-L/usr/local/cross-tools/i586-mingw32msvc/lib' 'CPPFLAGS=-I/usr/local/cross-tools/i586-mingw32msvc/include' $ac_configure_extra_args --no-create --no-recursion
 fi
 
 exec 5>>config.log
@@ -568,12 +569,12 @@
 s, at PATH_SEPARATOR@,|#_!!_#|:,g
 s, at PACKAGE_NAME@,|#_!!_#|tuxtype,g
 s, at PACKAGE_TARNAME@,|#_!!_#|tuxtype,g
-s, at PACKAGE_VERSION@,|#_!!_#|1.5.7,g
-s, at PACKAGE_STRING@,|#_!!_#|tuxtype 1.5.7,g
-s, at PACKAGE_BUGREPORT@,|#_!!_#|,g
+s, at PACKAGE_VERSION@,|#_!!_#|1.5.9,g
+s, at PACKAGE_STRING@,|#_!!_#|tuxtype 1.5.9,g
+s, at PACKAGE_BUGREPORT@,|#_!!_#|tuxmath-devel@|#_!!_#|lists.sourceforge.net,g
 s, at exec_prefix@,|#_!!_#|${prefix},g
-s, at prefix@,|#_!!_#|/usr,g
-s, at program_transform_name@,|#_!!_#|s\,x\,x\,,g
+s, at prefix@,|#_!!_#|/usr/local/cross-tools/i586-mingw32msvc,g
+s, at program_transform_name@,|#_!!_#|s\&^\&i586-mingw32msvc-\&,g
 s, at bindir@,|#_!!_#|${exec_prefix}/bin,g
 s, at sbindir@,|#_!!_#|${exec_prefix}/sbin,g
 s, at libexecdir@,|#_!!_#|${exec_prefix}/libexec,g
@@ -597,49 +598,50 @@
 s, at ECHO_C@,|#_!!_#|,g
 s, at ECHO_N@,|#_!!_#|-n,g
 s, at ECHO_T@,|#_!!_#|,g
-s, at LIBS@,|#_!!_#|-L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image ,g
-s, at build_alias@,|#_!!_#|,g
-s, at host_alias@,|#_!!_#|,g
-s, at target_alias@,|#_!!_#|,g
-s, at build@,|#_!!_#|i686-pc-linux-gnu,g
-s, at build_cpu@,|#_!!_#|i686,g
+s, at LIBS@,|#_!!_#|-lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  -lgw32c -luuid -lole32 -lwsock32 -mwindows,g
+s, at build_alias@,|#_!!_#|i386-linux,g
+s, at host_alias@,|#_!!_#|i586-mingw32msvc,g
+s, at target_alias@,|#_!!_#|i586-mingw32msvc,g
+s, at build@,|#_!!_#|i386-pc-linux-gnu,g
+s, at build_cpu@,|#_!!_#|i386,g
 s, at build_vendor@,|#_!!_#|pc,g
 s, at build_os@,|#_!!_#|linux-gnu,g
-s, at host@,|#_!!_#|i686-pc-linux-gnu,g
-s, at host_cpu@,|#_!!_#|i686,g
+s, at host@,|#_!!_#|i586-pc-mingw32msvc,g
+s, at host_cpu@,|#_!!_#|i586,g
 s, at host_vendor@,|#_!!_#|pc,g
-s, at host_os@,|#_!!_#|linux-gnu,g
-s, at target@,|#_!!_#|i686-pc-linux-gnu,g
-s, at target_cpu@,|#_!!_#|i686,g
+s, at host_os@,|#_!!_#|mingw32msvc,g
+s, at target@,|#_!!_#|i586-pc-mingw32msvc,g
+s, at target_cpu@,|#_!!_#|i586,g
 s, at target_vendor@,|#_!!_#|pc,g
-s, at target_os@,|#_!!_#|linux-gnu,g
+s, at target_os@,|#_!!_#|mingw32msvc,g
 s, at INSTALL_PROGRAM@,|#_!!_#|${INSTALL},g
 s, at INSTALL_SCRIPT@,|#_!!_#|${INSTALL},g
 s, at INSTALL_DATA@,|#_!!_#|${INSTALL} -m 644,g
+s, at am__isrc@,|#_!!_#|,g
 s, at CYGPATH_W@,|#_!!_#|echo,g
 s, at PACKAGE@,|#_!!_#|tuxtype,g
-s, at VERSION@,|#_!!_#|1.5.7,g
-s, at ACLOCAL@,|#_!!_#|${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run aclocal-1.9,g
-s, at AUTOCONF@,|#_!!_#|${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoconf,g
-s, at AUTOMAKE@,|#_!!_#|${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run automake-1.9,g
-s, at AUTOHEADER@,|#_!!_#|${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoheader,g
-s, at MAKEINFO@,|#_!!_#|${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run makeinfo,g
-s, at install_sh@,|#_!!_#|/home/huftis/utvikling/tux4kids/tuxtype/trunk/install-sh,g
-s, at STRIP@,|#_!!_#|,g
-s, at INSTALL_STRIP_PROGRAM@,|#_!!_#|${SHELL} $(install_sh) -c -s,g
-s, at mkdir_p@,|#_!!_#|mkdir -p --,g
-s, at AWK@,|#_!!_#|gawk,g
+s, at VERSION@,|#_!!_#|1.5.9,g
+s, at ACLOCAL@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10,g
+s, at AUTOCONF@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf,g
+s, at AUTOMAKE@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10,g
+s, at AUTOHEADER@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader,g
+s, at MAKEINFO@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo,g
+s, at install_sh@,|#_!!_#|$(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh,g
+s, at STRIP@,|#_!!_#|i586-mingw32msvc-strip,g
+s, at INSTALL_STRIP_PROGRAM@,|#_!!_#|$(install_sh) -c -s,g
+s, at mkdir_p@,|#_!!_#|/bin/mkdir -p,g
+s, at AWK@,|#_!!_#|mawk,g
 s, at SET_MAKE@,|#_!!_#|,g
 s, at am__leading_dot@,|#_!!_#|.,g
-s, at AMTAR@,|#_!!_#|${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run tar,g
+s, at AMTAR@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar,g
 s, at am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g
 s, at am__untar@,|#_!!_#|${AMTAR} xf -,g
-s, at CC@,|#_!!_#|gcc,g
-s, at CFLAGS@,|#_!!_#|-march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT,g
-s, at LDFLAGS@,|#_!!_#|,g
-s, at CPPFLAGS@,|#_!!_#|-march=athlon-xp -O2 -pipe -fomit-frame-pointer -DDATA_PREFIX=\\"$(prefix)\\",g
-s, at ac_ct_CC@,|#_!!_#|gcc,g
-s, at EXEEXT@,|#_!!_#|,g
+s, at CC@,|#_!!_#|i586-mingw32msvc-gcc,g
+s, at CFLAGS@,|#_!!_#|-g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__,g
+s, at LDFLAGS@,|#_!!_#|-L/usr/local/cross-tools/i586-mingw32msvc/lib,g
+s, at CPPFLAGS@,|#_!!_#|-I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\\"$(prefix)\\",g
+s, at ac_ct_CC@,|#_!!_#|,g
+s, at EXEEXT@,|#_!!_#|.exe,g
 s, at OBJEXT@,|#_!!_#|o,g
 s, at DEPDIR@,|#_!!_#|.deps,g
 s, at am__include@,|#_!!_#|include,g
@@ -654,20 +656,20 @@
 s, at SDL_CONFIG@,|#_!!_#|/usr/bin/sdl-config,g
 s, at SDL_CFLAGS@,|#_!!_#|-I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT,g
 s, at SDL_LIBS@,|#_!!_#|-L/usr/lib -lSDL,g
-s, at BUILD_MINGW32_TRUE@,|#_!!_#|#,g
-s, at BUILD_MINGW32_FALSE@,|#_!!_#|,g
-s, at WINDRES@,|#_!!_#|,g
-s, at CPP@,|#_!!_#|gcc -E,g
+s, at BUILD_MINGW32_TRUE@,|#_!!_#|,g
+s, at BUILD_MINGW32_FALSE@,|#_!!_#|#,g
+s, at WINDRES@,|#_!!_#|/usr/bin/i586-mingw32msvc-windres,g
+s, at CPP@,|#_!!_#|i586-mingw32msvc-gcc -E,g
 s, at GREP@,|#_!!_#|/bin/grep,g
 s, at EGREP@,|#_!!_#|/bin/grep -E,g
-s, at NSI_INSTALL_DIR@,|#_!!_#|mingw32,g
 CEOF
 cat >"$tmp/subs-2.sed" <<\CEOF
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+s, at NSI_INSTALL_DIR@,|#_!!_#|mingw32,g
 s, at NSI_BUILD_TRUE@,|#_!!_#|,g
 s, at NSI_BUILD_FALSE@,|#_!!_#|#,g
-s, at NSI_DLL_DIR@,|#_!!_#|/home/huftis/tuxtype_dll,g
-s, at NSIS@,|#_!!_#|no,g
+s, at NSI_DLL_DIR@,|#_!!_#|/home/dbruce/tuxtype_dll,g
+s, at NSIS@,|#_!!_#|/usr/bin/makensis,g
 s, at LIBOBJS@,|#_!!_#|,g
 s, at LTLIBOBJS@,|#_!!_#|,g
 :end
@@ -846,6 +848,11 @@
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -893,6 +900,7 @@
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
 
@@ -923,14 +931,15 @@
 s/$/ /
 s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_NAME\)[	 (].*,\1define\2 "tuxtype" ,
 s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_TARNAME\)[	 (].*,\1define\2 "tuxtype" ,
-s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_VERSION\)[	 (].*,\1define\2 "1.5.7" ,
-s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_STRING\)[	 (].*,\1define\2 "tuxtype 1.5.7" ,
-s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_BUGREPORT\)[	 (].*,\1define\2 "" ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_VERSION\)[	 (].*,\1define\2 "1.5.9" ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_STRING\)[	 (].*,\1define\2 "tuxtype 1.5.9" ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE_BUGREPORT\)[	 (].*,\1define\2 "tuxmath-devel at lists.sourceforge.net" ,
 s,^\([	 #]*\)[^	 ]*\([	 ]*PACKAGE\)[	 (].*,\1define\2 "tuxtype" ,
-s,^\([	 #]*\)[^	 ]*\([	 ]*VERSION\)[	 (].*,\1define\2 "1.5.7" ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*VERSION\)[	 (].*,\1define\2 "1.5.9" ,
 s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_LIBSDL_IMAGE\)[	 (].*,\1define\2 1 ,
 s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_LIBSDL_MIXER\)[	 (].*,\1define\2 1 ,
 s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_LIBSDL_TTF\)[	 (].*,\1define\2 1 ,
+s,^\([	 #]*\)[^	 ]*\([	 ]*BUILD_MINGW32\)[	 (].*,\1define\2 1 ,
 s,^\([	 #]*\)[^	 ]*\([	 ]*STDC_HEADERS\)[	 (].*,\1define\2 1 ,
 s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_SYS_TYPES_H\)[	 (].*,\1define\2 1 ,
 s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_SYS_STAT_H\)[	 (].*,\1define\2 1 ,
@@ -1018,8 +1027,9 @@
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \

Copied: tuxtype/trunk/configure.ac (from rev 178, tuxtype/trunk/configure.in)

Deleted: tuxtype/trunk/configure.in
===================================================================
--- tuxtype/trunk/configure.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/configure.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -1,185 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-AC_INIT(tuxtype, 1.5.9, tuxmath-devel at lists.sourceforge.net)
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(tuxtype, 1.5.9)
-
-AC_CONFIG_SRCDIR([tuxtype/funcs.h])
-
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-
-dnl Don't think we need C++:
-# AC_PROG_CPP
-# AC_PROG_CXX
-
-AC_PREFIX_DEFAULT(/usr/local)
-if test "x$prefix" = "xNONE"; then
-  prefix=$ac_default_prefix
-  ac_configure_args="$ac_configure_args --prefix $prefix"
-fi
-
-# Checks for libraries.
-# Check for SDL
-SDL_VERSION=1.2.5
-
-
-
-AM_PATH_SDL($SDL_VERSION,
-            :,
-            AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
-
-AC_CHECK_LIB([SDL_image], [IMG_Load], ,[AC_MSG_ERROR(SDL_image not found http://www.libsdl.org/projects/SDL_image, )])
-AC_CHECK_LIB([SDL_mixer], [Mix_PlayMusic], ,[AC_MSG_ERROR(SDL_mixer not found http://www.libsdl.org/projects/SDL_mixer, )])
-AC_CHECK_LIB([SDL_ttf], [TTF_Init], ,[AC_MSG_ERROR(SDL_ttf not found http://www.libsdl.org/projects/SDL_ttf, )])
-
-#
-SDL_CFLAGS=`sdl-config --cflags`
-CFLAGS="$CFLAGS $SDL_CFLAGS"
-
-SDL_LIBS=`sdl-config --libs`
-LIBS="$SDL_LIBS $LIBS"
-
-# Check platform - see if see if building for Windows:
-AC_MSG_CHECKING([for native Win32])
-case "$host" in
-  *-*-mingw*)
-    native_win32=yes
-    ;;
-  *)
-    native_win32=no
-    ;;
-esac
-AC_MSG_RESULT([$native_win32])
-
-AM_CONDITIONAL(BUILD_MINGW32, test "$native_win32" = yes)
-
-if test "$native_win32" = yes; then
-   AC_DEFINE([BUILD_MINGW32], 1,[Native MinGW32 build])
-   CFLAGS="$CFLAGS -D__GW32__"
-   LIBS="-lmingw32 -lSDLmain $LIBS -lgw32c -luuid -lole32 -lwsock32 -mwindows"
-   CPPFLAGS="$CPPFLAGS -idirafter $prefix/include/glibc"
-   #CPPFLAGS="$CPPFLAGS -I$prefix/include/glibc"
-   AC_PATH_PROG(WINDRES, "$target_alias-windres", no, [$PATH])
-fi
-
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS([stdlib.h string.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_C_INLINE
-
-# Checks for library functions.
-AC_CHECK_FUNCS([atexit memset strchr strstr malloc])
-
-
-
-
-
-# Sam's Install Kludge-work
-CPPFLAGS="$CPPFLAGS -DDATA_PREFIX=\\\"\$(prefix)\\\""
-
-AC_CONFIG_FILES([Makefile
-tuxtype/Makefile
-tuxtype/data/Makefile
-tuxtype/data/fonts/Makefile
-tuxtype/data/images/Makefile
-tuxtype/data/images/backgrounds/Makefile
-tuxtype/data/images/cities/Makefile
-tuxtype/data/images/comets/Makefile
-tuxtype/data/images/hands/Makefile
-tuxtype/data/images/keyboard/Makefile
-tuxtype/data/images/menu/Makefile
-tuxtype/data/images/status/Makefile
-tuxtype/data/images/tux/Makefile
-tuxtype/data/scripts/Makefile
-tuxtype/data/sounds/Makefile
-tuxtype/data/themes/Makefile
-tuxtype/data/themes/armenian/Makefile
-tuxtype/data/themes/armenian/images/Makefile
-tuxtype/data/themes/bokmal/Makefile
-tuxtype/data/themes/bokmal/words/Makefile
-tuxtype/data/themes/bokmal/images/Makefile
-tuxtype/data/themes/bokmal/images/status/Makefile
-tuxtype/data/themes/brazilian-portuguese/Makefile
-tuxtype/data/themes/brazilian-portuguese/images/Makefile
-tuxtype/data/themes/brazilian-portuguese/words/Makefile
-tuxtype/data/themes/catalan/Makefile
-tuxtype/data/themes/catalan/words/Makefile
-tuxtype/data/themes/dansk/Makefile
-tuxtype/data/themes/dansk/sounds/Makefile
-tuxtype/data/themes/dansk/words/Makefile
-tuxtype/data/themes/deutsch/Makefile
-tuxtype/data/themes/deutsch/words/Makefile
-tuxtype/data/themes/espanol/Makefile
-tuxtype/data/themes/espanol/images/Makefile
-tuxtype/data/themes/espanol/words/Makefile
-tuxtype/data/themes/euskara/Makefile
-tuxtype/data/themes/euskara/images/Makefile
-tuxtype/data/themes/euskara/words/Makefile
-tuxtype/data/themes/french/Makefile
-tuxtype/data/themes/french/words/Makefile
-tuxtype/data/themes/greek/Makefile
-tuxtype/data/themes/greek/words/Makefile
-tuxtype/data/themes/italian/Makefile
-tuxtype/data/themes/italian/words/Makefile
-tuxtype/data/themes/jamaican/Makefile
-tuxtype/data/themes/jamaican/images/Makefile
-tuxtype/data/themes/jamaican/words/Makefile
-tuxtype/data/themes/lithuanian/Makefile
-tuxtype/data/themes/lithuanian/images/Makefile
-tuxtype/data/themes/lithuanian/images/status/Makefile
-tuxtype/data/themes/lithuanian/sounds/Makefile
-tuxtype/data/themes/lithuanian/words/Makefile
-tuxtype/data/themes/nederlands/Makefile
-tuxtype/data/themes/nederlands/words/Makefile
-tuxtype/data/themes/nynorsk/Makefile
-tuxtype/data/themes/nynorsk/images/Makefile
-tuxtype/data/themes/nynorsk/images/status/Makefile
-tuxtype/data/themes/nynorsk/words/Makefile
-tuxtype/data/themes/russian/Makefile
-tuxtype/data/themes/russian/images/Makefile
-tuxtype/data/themes/russian/images/status/Makefile
-tuxtype/data/themes/russian/words/Makefile
-tuxtype/data/themes/svenska/Makefile
-tuxtype/data/themes/svenska/words/Makefile
-tuxtype/data/themes/swahili/Makefile
-tuxtype/data/themes/swahili/words/Makefile
-tuxtype/data/words/Makefile
-tuxtype/docs/Makefile
-tuxtype/docs/en/Makefile
-tuxtype.spec])
-
-# Support for building NSIS Win32 installer (adapted from TuxMath NSIS):
-NSI_INSTALL_DIR=mingw32
-AC_SUBST(NSI_INSTALL_DIR)
-
-NSI_DLL_DIR=~/tuxtype_dll
-AC_ARG_WITH(dll-directory,AC_HELP_STRING(
-    [--with-dll-directory=path],
-    [set the path where dll for TuxType are [$(NSI_DLL_DIR)]]), dll_path=$withval, dll_path=no)
-
-AM_CONDITIONAL(NSI_BUILD, test "$dll_path" = no)
-
-if test $dll_path != no; then
-NSI_DLL_DIR=$dll_path
-fi
-AC_SUBST(NSI_DLL_DIR)
-
-
-AC_PATH_PROG(NSIS, makensis, no, [$PATH])
-
-# FIXME should this go into earlier AC_CONFIG_FILES ?
-AC_CONFIG_FILES([
-nsis/tuxtype.nsi
-])
-
-AC_OUTPUT
-

Modified: tuxtype/trunk/nsis/tuxtype.nsi
===================================================================
--- tuxtype/trunk/nsis/tuxtype.nsi	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/nsis/tuxtype.nsi	2007-05-09 16:06:27 UTC (rev 179)
@@ -3,7 +3,7 @@
 # modified for tuxmath by Yves Combe (yves at ycombe.net)
 # modified for tuxtype by David Bruce (dbruce at tampabay.rr.com)
 
-!define PKG_VERSION "1.5.7"
+!define PKG_VERSION "1.5.9"
 !define PKG_PREFIX  "tuxtype"
 
 !define APP_PREFIX  "TuxType2"

Modified: tuxtype/trunk/tuxtype/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -38,7 +38,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/alphabet.c
===================================================================
--- tuxtype/trunk/tuxtype/alphabet.c	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/alphabet.c	2007-05-09 16:06:27 UTC (rev 179)
@@ -71,13 +71,14 @@
 
 	for (l=useEnglish; l<2; l++) {
 		sprintf( fn , "%s/keyboard.lst", realPath[l]);
-		if ( checkFile(fn) ) {
+		if (CheckFile(fn)) {
 			unsigned char str[255];
 			FILE *f;
 			int i,j;
 
 			f = fopen( fn, "r" );
 
+			/* Should never fail as we just did the same thing in CheckFile(): */
 			if (f == NULL)
 				continue;
 

Modified: tuxtype/trunk/tuxtype/data/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/fonts/Makefile
===================================================================
--- tuxtype/trunk/tuxtype/data/fonts/Makefile	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/fonts/Makefile	2007-05-09 16:06:27 UTC (rev 179)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # tuxtype/data/fonts/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -13,15 +13,11 @@
 # PARTICULAR PURPOSE.
 
 
-srcdir = .
-top_srcdir = ../../..
 
 pkgdatadir = $(datadir)/tuxtype
 pkglibdir = $(libdir)/tuxtype
 pkgincludedir = $(includedir)/tuxtype
-top_builddir = ../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -33,14 +29,14 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-target_triplet = i686-pc-linux-gnu
+build_triplet = i386-pc-linux-gnu
+host_triplet = i586-pc-mingw32msvc
+target_triplet = i586-pc-mingw32msvc
 subdir = tuxtype/data/fonts
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -49,21 +45,17 @@
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run automake-1.9
-AWK = gawk
-BUILD_MINGW32_FALSE = 
-BUILD_MINGW32_TRUE = #
-CC = gcc
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10
+AWK = mawk
+CC = i586-mingw32msvc-gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-CPP = gcc -E
-CPPFLAGS = -march=athlon-xp -O2 -pipe -fomit-frame-pointer -DDATA_PREFIX=\"$(prefix)\"
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
+CPP = i586-mingw32msvc-gcc -E
+CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -71,86 +63,92 @@
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
-EXEEXT = 
+EXEEXT = .exe
 GREP = /bin/grep
+INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
 LIBOBJS = 
-LIBS = -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image 
+LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  -lgw32c -luuid -lole32 -lwsock32 -mwindows
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run makeinfo
-NSIS = no
-NSI_BUILD_FALSE = #
-NSI_BUILD_TRUE = 
-NSI_DLL_DIR = /home/huftis/tuxtype_dll
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo
+MKDIR_P = /bin/mkdir -p
+NSIS = /usr/bin/makensis
+NSI_DLL_DIR = /home/dbruce/tuxtype_dll
 NSI_INSTALL_DIR = mingw32
 OBJEXT = o
 PACKAGE = tuxtype
-PACKAGE_BUGREPORT = 
+PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
 PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.7
+PACKAGE_STRING = tuxtype 1.5.9
 PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.7
+PACKAGE_VERSION = 1.5.9
 PATH_SEPARATOR = :
 SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 SDL_CONFIG = /usr/bin/sdl-config
 SDL_LIBS = -L/usr/lib -lSDL
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = 
-VERSION = 1.5.7
-WINDRES = 
-ac_ct_CC = gcc
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
+STRIP = i586-mingw32msvc-strip
+VERSION = 1.5.9
+WINDRES = /usr/bin/i586-mingw32msvc-windres
+abs_builddir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/fonts
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/fonts
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/trunk
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
+ac_ct_CC = 
 am__include = include
 am__leading_dot = .
 am__quote = 
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
+build = i386-pc-linux-gnu
+build_alias = i386-linux
+build_cpu = i386
 build_os = linux-gnu
 build_vendor = pc
+builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
+host = i586-pc-mingw32msvc
+host_alias = i586-mingw32msvc
+host_cpu = i586
+host_os = mingw32msvc
 host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/huftis/utvikling/tux4kids/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
 mandir = ${datarootdir}/man
-mkdir_p = mkdir -p --
+mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr
-program_transform_name = s,x,x,
+prefix = /usr/local/cross-tools/i586-mingw32msvc
+program_transform_name = s&^&i586-mingw32msvc-&
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
+srcdir = .
 sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
-target_alias = 
-target_cpu = i686
-target_os = linux-gnu
+target = i586-pc-mingw32msvc
+target_alias = i586-mingw32msvc
+target_cpu = i586
+target_os = mingw32msvc
 target_vendor = pc
+top_builddir = ../../..
+top_srcdir = ../../..
 EXTRA_DIST = AndikaDesRevA.ttf
 all: all-am
 
@@ -184,7 +182,6 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -193,22 +190,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -267,12 +263,20 @@
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -291,17 +295,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
 
+.MAKE: install-am install-strip
+
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-	uninstall-local
+	pdf-am ps ps-am uninstall uninstall-am uninstall-local
 
 
 install-data-local:

Modified: tuxtype/trunk/tuxtype/data/fonts/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/fonts/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/fonts/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/images/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/images/backgrounds/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/backgrounds/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/images/backgrounds/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/images/cities/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/cities/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/images/cities/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/images/comets/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/comets/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/images/comets/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/images/hands/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/hands/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/images/hands/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/images/menu/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/menu/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/images/menu/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/status/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/images/status/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/images/tux/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/tux/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/images/tux/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/scripts/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/scripts/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/scripts/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/sounds/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/sounds/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/sounds/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile	2007-05-09 16:06:27 UTC (rev 179)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # tuxtype/data/themes/bokmal/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -13,15 +13,11 @@
 # PARTICULAR PURPOSE.
 
 
-srcdir = .
-top_srcdir = ../../../..
 
 pkgdatadir = $(datadir)/tuxtype
 pkglibdir = $(libdir)/tuxtype
 pkgincludedir = $(includedir)/tuxtype
-top_builddir = ../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -33,14 +29,14 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-target_triplet = i686-pc-linux-gnu
+build_triplet = i386-pc-linux-gnu
+host_triplet = i586-pc-mingw32msvc
+target_triplet = i586-pc-mingw32msvc
 subdir = tuxtype/data/themes/bokmal
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -50,29 +46,28 @@
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run automake-1.9
-AWK = gawk
-BUILD_MINGW32_FALSE = 
-BUILD_MINGW32_TRUE = #
-CC = gcc
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10
+AWK = mawk
+CC = i586-mingw32msvc-gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-CPP = gcc -E
-CPPFLAGS = -march=athlon-xp -O2 -pipe -fomit-frame-pointer -DDATA_PREFIX=\"$(prefix)\"
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
+CPP = i586-mingw32msvc-gcc -E
+CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -80,86 +75,92 @@
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
-EXEEXT = 
+EXEEXT = .exe
 GREP = /bin/grep
+INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
 LIBOBJS = 
-LIBS = -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image 
+LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  -lgw32c -luuid -lole32 -lwsock32 -mwindows
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run makeinfo
-NSIS = no
-NSI_BUILD_FALSE = #
-NSI_BUILD_TRUE = 
-NSI_DLL_DIR = /home/huftis/tuxtype_dll
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo
+MKDIR_P = /bin/mkdir -p
+NSIS = /usr/bin/makensis
+NSI_DLL_DIR = /home/dbruce/tuxtype_dll
 NSI_INSTALL_DIR = mingw32
 OBJEXT = o
 PACKAGE = tuxtype
-PACKAGE_BUGREPORT = 
+PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
 PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.7
+PACKAGE_STRING = tuxtype 1.5.9
 PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.7
+PACKAGE_VERSION = 1.5.9
 PATH_SEPARATOR = :
 SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 SDL_CONFIG = /usr/bin/sdl-config
 SDL_LIBS = -L/usr/lib -lSDL
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = 
-VERSION = 1.5.7
-WINDRES = 
-ac_ct_CC = gcc
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
+STRIP = i586-mingw32msvc-strip
+VERSION = 1.5.9
+WINDRES = /usr/bin/i586-mingw32msvc-windres
+abs_builddir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/bokmal
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/bokmal
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/trunk
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
+ac_ct_CC = 
 am__include = include
 am__leading_dot = .
 am__quote = 
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
+build = i386-pc-linux-gnu
+build_alias = i386-linux
+build_cpu = i386
 build_os = linux-gnu
 build_vendor = pc
+builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
+host = i586-pc-mingw32msvc
+host_alias = i586-mingw32msvc
+host_cpu = i586
+host_os = mingw32msvc
 host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/huftis/utvikling/tux4kids/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
 mandir = ${datarootdir}/man
-mkdir_p = mkdir -p --
+mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr
-program_transform_name = s,x,x,
+prefix = /usr/local/cross-tools/i586-mingw32msvc
+program_transform_name = s&^&i586-mingw32msvc-&
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
+srcdir = .
 sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
-target_alias = 
-target_cpu = i686
-target_os = linux-gnu
+target = i586-pc-mingw32msvc
+target_alias = i586-mingw32msvc
+target_cpu = i586
+target_os = mingw32msvc
 target_vendor = pc
+top_builddir = ../../../..
+top_srcdir = ../../../..
 SUBDIRS = images words
 EXTRA_DIST = lang.po keyboard.lst
 all: all-recursive
@@ -194,7 +195,6 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -227,8 +227,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -329,22 +328,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -358,7 +356,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -366,6 +364,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -419,12 +419,20 @@
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -443,22 +451,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
 	install-am install-data install-data-am install-data-local \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-local
+	uninstall-local
 
 
 install-data-local:

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile	2007-05-09 16:06:27 UTC (rev 179)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # tuxtype/data/themes/bokmal/images/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -13,15 +13,11 @@
 # PARTICULAR PURPOSE.
 
 
-srcdir = .
-top_srcdir = ../../../../..
 
 pkgdatadir = $(datadir)/tuxtype
 pkglibdir = $(libdir)/tuxtype
 pkgincludedir = $(includedir)/tuxtype
-top_builddir = ../../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -33,14 +29,14 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-target_triplet = i686-pc-linux-gnu
+build_triplet = i386-pc-linux-gnu
+host_triplet = i586-pc-mingw32msvc
+target_triplet = i586-pc-mingw32msvc
 subdir = tuxtype/data/themes/bokmal/images
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -50,29 +46,28 @@
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run automake-1.9
-AWK = gawk
-BUILD_MINGW32_FALSE = 
-BUILD_MINGW32_TRUE = #
-CC = gcc
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10
+AWK = mawk
+CC = i586-mingw32msvc-gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-CPP = gcc -E
-CPPFLAGS = -march=athlon-xp -O2 -pipe -fomit-frame-pointer -DDATA_PREFIX=\"$(prefix)\"
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
+CPP = i586-mingw32msvc-gcc -E
+CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -80,86 +75,92 @@
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
-EXEEXT = 
+EXEEXT = .exe
 GREP = /bin/grep
+INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
 LIBOBJS = 
-LIBS = -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image 
+LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  -lgw32c -luuid -lole32 -lwsock32 -mwindows
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run makeinfo
-NSIS = no
-NSI_BUILD_FALSE = #
-NSI_BUILD_TRUE = 
-NSI_DLL_DIR = /home/huftis/tuxtype_dll
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo
+MKDIR_P = /bin/mkdir -p
+NSIS = /usr/bin/makensis
+NSI_DLL_DIR = /home/dbruce/tuxtype_dll
 NSI_INSTALL_DIR = mingw32
 OBJEXT = o
 PACKAGE = tuxtype
-PACKAGE_BUGREPORT = 
+PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
 PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.7
+PACKAGE_STRING = tuxtype 1.5.9
 PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.7
+PACKAGE_VERSION = 1.5.9
 PATH_SEPARATOR = :
 SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 SDL_CONFIG = /usr/bin/sdl-config
 SDL_LIBS = -L/usr/lib -lSDL
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = 
-VERSION = 1.5.7
-WINDRES = 
-ac_ct_CC = gcc
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
+STRIP = i586-mingw32msvc-strip
+VERSION = 1.5.9
+WINDRES = /usr/bin/i586-mingw32msvc-windres
+abs_builddir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/bokmal/images
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/bokmal/images
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/trunk
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
+ac_ct_CC = 
 am__include = include
 am__leading_dot = .
 am__quote = 
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
+build = i386-pc-linux-gnu
+build_alias = i386-linux
+build_cpu = i386
 build_os = linux-gnu
 build_vendor = pc
+builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
+host = i586-pc-mingw32msvc
+host_alias = i586-mingw32msvc
+host_cpu = i586
+host_os = mingw32msvc
 host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/huftis/utvikling/tux4kids/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
 mandir = ${datarootdir}/man
-mkdir_p = mkdir -p --
+mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr
-program_transform_name = s,x,x,
+prefix = /usr/local/cross-tools/i586-mingw32msvc
+program_transform_name = s&^&i586-mingw32msvc-&
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
+srcdir = .
 sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
-target_alias = 
-target_cpu = i686
-target_os = linux-gnu
+target = i586-pc-mingw32msvc
+target_alias = i586-mingw32msvc
+target_cpu = i586
+target_os = mingw32msvc
 target_vendor = pc
+top_builddir = ../../../../..
+top_srcdir = ../../../../..
 SUBDIRS = status
 EXTRA_DIST = splat0.png map.png
 all: all-recursive
@@ -194,7 +195,6 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -227,8 +227,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -329,22 +328,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -358,7 +356,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -366,6 +364,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -419,12 +419,20 @@
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -443,22 +451,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
 	install-am install-data install-data-am install-data-local \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-local
+	uninstall-local
 
 
 install-data-local:

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile	2007-05-09 16:06:27 UTC (rev 179)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # tuxtype/data/themes/bokmal/words/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -13,15 +13,11 @@
 # PARTICULAR PURPOSE.
 
 
-srcdir = .
-top_srcdir = ../../../../..
 
 pkgdatadir = $(datadir)/tuxtype
 pkglibdir = $(libdir)/tuxtype
 pkgincludedir = $(includedir)/tuxtype
-top_builddir = ../../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -33,14 +29,14 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-target_triplet = i686-pc-linux-gnu
+build_triplet = i386-pc-linux-gnu
+host_triplet = i586-pc-mingw32msvc
+target_triplet = i586-pc-mingw32msvc
 subdir = tuxtype/data/themes/bokmal/words
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -49,21 +45,17 @@
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run automake-1.9
-AWK = gawk
-BUILD_MINGW32_FALSE = 
-BUILD_MINGW32_TRUE = #
-CC = gcc
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10
+AWK = mawk
+CC = i586-mingw32msvc-gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-CPP = gcc -E
-CPPFLAGS = -march=athlon-xp -O2 -pipe -fomit-frame-pointer -DDATA_PREFIX=\"$(prefix)\"
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
+CPP = i586-mingw32msvc-gcc -E
+CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -71,86 +63,92 @@
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
-EXEEXT = 
+EXEEXT = .exe
 GREP = /bin/grep
+INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
 LIBOBJS = 
-LIBS = -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image 
+LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  -lgw32c -luuid -lole32 -lwsock32 -mwindows
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run makeinfo
-NSIS = no
-NSI_BUILD_FALSE = #
-NSI_BUILD_TRUE = 
-NSI_DLL_DIR = /home/huftis/tuxtype_dll
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo
+MKDIR_P = /bin/mkdir -p
+NSIS = /usr/bin/makensis
+NSI_DLL_DIR = /home/dbruce/tuxtype_dll
 NSI_INSTALL_DIR = mingw32
 OBJEXT = o
 PACKAGE = tuxtype
-PACKAGE_BUGREPORT = 
+PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
 PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.7
+PACKAGE_STRING = tuxtype 1.5.9
 PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.7
+PACKAGE_VERSION = 1.5.9
 PATH_SEPARATOR = :
 SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 SDL_CONFIG = /usr/bin/sdl-config
 SDL_LIBS = -L/usr/lib -lSDL
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = 
-VERSION = 1.5.7
-WINDRES = 
-ac_ct_CC = gcc
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
+STRIP = i586-mingw32msvc-strip
+VERSION = 1.5.9
+WINDRES = /usr/bin/i586-mingw32msvc-windres
+abs_builddir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/bokmal/words
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/bokmal/words
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/trunk
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
+ac_ct_CC = 
 am__include = include
 am__leading_dot = .
 am__quote = 
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
+build = i386-pc-linux-gnu
+build_alias = i386-linux
+build_cpu = i386
 build_os = linux-gnu
 build_vendor = pc
+builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
+host = i586-pc-mingw32msvc
+host_alias = i586-mingw32msvc
+host_cpu = i586
+host_os = mingw32msvc
 host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/huftis/utvikling/tux4kids/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
 mandir = ${datarootdir}/man
-mkdir_p = mkdir -p --
+mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr
-program_transform_name = s,x,x,
+prefix = /usr/local/cross-tools/i586-mingw32msvc
+program_transform_name = s&^&i586-mingw32msvc-&
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
+srcdir = .
 sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
-target_alias = 
-target_cpu = i686
-target_os = linux-gnu
+target = i586-pc-mingw32msvc
+target_alias = i586-mingw32msvc
+target_cpu = i586
+target_os = mingw32msvc
 target_vendor = pc
+top_builddir = ../../../../..
+top_srcdir = ../../../../..
 EXTRA_DIST = 3boks.txt\
 4boks.txt\
 5boks.txt\
@@ -193,7 +191,6 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -202,22 +199,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -276,12 +272,20 @@
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -300,17 +304,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
 
+.MAKE: install-am install-strip
+
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-	uninstall-local
+	pdf-am ps ps-am uninstall uninstall-am uninstall-local
 
 
 install-data-local:

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile	2007-05-09 16:06:27 UTC (rev 179)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # tuxtype/data/themes/brazilian-portuguese/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -13,15 +13,11 @@
 # PARTICULAR PURPOSE.
 
 
-srcdir = .
-top_srcdir = ../../../..
 
 pkgdatadir = $(datadir)/tuxtype
 pkglibdir = $(libdir)/tuxtype
 pkgincludedir = $(includedir)/tuxtype
-top_builddir = ../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -33,14 +29,14 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-target_triplet = i686-pc-linux-gnu
+build_triplet = i386-pc-linux-gnu
+host_triplet = i586-pc-mingw32msvc
+target_triplet = i586-pc-mingw32msvc
 subdir = tuxtype/data/themes/brazilian-portuguese
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -50,29 +46,28 @@
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run automake-1.9
-AWK = gawk
-BUILD_MINGW32_FALSE = 
-BUILD_MINGW32_TRUE = #
-CC = gcc
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10
+AWK = mawk
+CC = i586-mingw32msvc-gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-CPP = gcc -E
-CPPFLAGS = -march=athlon-xp -O2 -pipe -fomit-frame-pointer -DDATA_PREFIX=\"$(prefix)\"
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
+CPP = i586-mingw32msvc-gcc -E
+CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -80,86 +75,92 @@
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
-EXEEXT = 
+EXEEXT = .exe
 GREP = /bin/grep
+INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
 LIBOBJS = 
-LIBS = -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image 
+LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  -lgw32c -luuid -lole32 -lwsock32 -mwindows
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run makeinfo
-NSIS = no
-NSI_BUILD_FALSE = #
-NSI_BUILD_TRUE = 
-NSI_DLL_DIR = /home/huftis/tuxtype_dll
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo
+MKDIR_P = /bin/mkdir -p
+NSIS = /usr/bin/makensis
+NSI_DLL_DIR = /home/dbruce/tuxtype_dll
 NSI_INSTALL_DIR = mingw32
 OBJEXT = o
 PACKAGE = tuxtype
-PACKAGE_BUGREPORT = 
+PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
 PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.7
+PACKAGE_STRING = tuxtype 1.5.9
 PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.7
+PACKAGE_VERSION = 1.5.9
 PATH_SEPARATOR = :
 SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 SDL_CONFIG = /usr/bin/sdl-config
 SDL_LIBS = -L/usr/lib -lSDL
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = 
-VERSION = 1.5.7
-WINDRES = 
-ac_ct_CC = gcc
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
+STRIP = i586-mingw32msvc-strip
+VERSION = 1.5.9
+WINDRES = /usr/bin/i586-mingw32msvc-windres
+abs_builddir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/trunk
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
+ac_ct_CC = 
 am__include = include
 am__leading_dot = .
 am__quote = 
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
+build = i386-pc-linux-gnu
+build_alias = i386-linux
+build_cpu = i386
 build_os = linux-gnu
 build_vendor = pc
+builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
+host = i586-pc-mingw32msvc
+host_alias = i586-mingw32msvc
+host_cpu = i586
+host_os = mingw32msvc
 host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/huftis/utvikling/tux4kids/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
 mandir = ${datarootdir}/man
-mkdir_p = mkdir -p --
+mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr
-program_transform_name = s,x,x,
+prefix = /usr/local/cross-tools/i586-mingw32msvc
+program_transform_name = s&^&i586-mingw32msvc-&
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
+srcdir = .
 sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
-target_alias = 
-target_cpu = i686
-target_os = linux-gnu
+target = i586-pc-mingw32msvc
+target_alias = i586-mingw32msvc
+target_cpu = i586
+target_os = mingw32msvc
 target_vendor = pc
+top_builddir = ../../../..
+top_srcdir = ../../../..
 SUBDIRS = images words
 EXTRA_DIST = lang.po
 all: all-recursive
@@ -194,7 +195,6 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -227,8 +227,7 @@
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -329,22 +328,21 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -358,7 +356,7 @@
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -366,6 +364,8 @@
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -419,12 +419,20 @@
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-recursive
+
 install-exec-am:
 
+install-html: install-html-recursive
+
 install-info: install-info-recursive
 
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -443,22 +451,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
 	install-am install-data install-data-am install-data-local \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-local
+	uninstall-local
 
 
 install-data-local:

Modified: tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile	2007-05-09 16:06:27 UTC (rev 179)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # tuxtype/data/themes/brazilian-portuguese/images/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -13,15 +13,11 @@
 # PARTICULAR PURPOSE.
 
 
-srcdir = .
-top_srcdir = ../../../../..
 
 pkgdatadir = $(datadir)/tuxtype
 pkglibdir = $(libdir)/tuxtype
 pkgincludedir = $(includedir)/tuxtype
-top_builddir = ../../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -33,14 +29,14 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-target_triplet = i686-pc-linux-gnu
+build_triplet = i386-pc-linux-gnu
+host_triplet = i586-pc-mingw32msvc
+target_triplet = i586-pc-mingw32msvc
 subdir = tuxtype/data/themes/brazilian-portuguese/images
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -49,21 +45,17 @@
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run automake-1.9
-AWK = gawk
-BUILD_MINGW32_FALSE = 
-BUILD_MINGW32_TRUE = #
-CC = gcc
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10
+AWK = mawk
+CC = i586-mingw32msvc-gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-CPP = gcc -E
-CPPFLAGS = -march=athlon-xp -O2 -pipe -fomit-frame-pointer -DDATA_PREFIX=\"$(prefix)\"
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
+CPP = i586-mingw32msvc-gcc -E
+CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -71,86 +63,92 @@
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
-EXEEXT = 
+EXEEXT = .exe
 GREP = /bin/grep
+INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
 LIBOBJS = 
-LIBS = -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image 
+LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  -lgw32c -luuid -lole32 -lwsock32 -mwindows
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run makeinfo
-NSIS = no
-NSI_BUILD_FALSE = #
-NSI_BUILD_TRUE = 
-NSI_DLL_DIR = /home/huftis/tuxtype_dll
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo
+MKDIR_P = /bin/mkdir -p
+NSIS = /usr/bin/makensis
+NSI_DLL_DIR = /home/dbruce/tuxtype_dll
 NSI_INSTALL_DIR = mingw32
 OBJEXT = o
 PACKAGE = tuxtype
-PACKAGE_BUGREPORT = 
+PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
 PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.7
+PACKAGE_STRING = tuxtype 1.5.9
 PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.7
+PACKAGE_VERSION = 1.5.9
 PATH_SEPARATOR = :
 SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 SDL_CONFIG = /usr/bin/sdl-config
 SDL_LIBS = -L/usr/lib -lSDL
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = 
-VERSION = 1.5.7
-WINDRES = 
-ac_ct_CC = gcc
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
+STRIP = i586-mingw32msvc-strip
+VERSION = 1.5.9
+WINDRES = /usr/bin/i586-mingw32msvc-windres
+abs_builddir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/trunk
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
+ac_ct_CC = 
 am__include = include
 am__leading_dot = .
 am__quote = 
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
+build = i386-pc-linux-gnu
+build_alias = i386-linux
+build_cpu = i386
 build_os = linux-gnu
 build_vendor = pc
+builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
+host = i586-pc-mingw32msvc
+host_alias = i586-mingw32msvc
+host_cpu = i586
+host_os = mingw32msvc
 host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/huftis/utvikling/tux4kids/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
 mandir = ${datarootdir}/man
-mkdir_p = mkdir -p --
+mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr
-program_transform_name = s,x,x,
+prefix = /usr/local/cross-tools/i586-mingw32msvc
+program_transform_name = s&^&i586-mingw32msvc-&
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
+srcdir = .
 sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
-target_alias = 
-target_cpu = i686
-target_os = linux-gnu
+target = i586-pc-mingw32msvc
+target_alias = i586-mingw32msvc
+target_cpu = i586
+target_os = mingw32msvc
 target_vendor = pc
+top_builddir = ../../../../..
+top_srcdir = ../../../../..
 EXTRA_DIST = map.png
 all: all-am
 
@@ -184,7 +182,6 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -193,22 +190,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -267,12 +263,20 @@
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -291,17 +295,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
 
+.MAKE: install-am install-strip
+
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-	uninstall-local
+	pdf-am ps ps-am uninstall uninstall-am uninstall-local
 
 
 install-data-local:

Modified: tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile	2007-05-09 16:06:27 UTC (rev 179)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # tuxtype/data/themes/brazilian-portuguese/words/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  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.
@@ -13,15 +13,11 @@
 # PARTICULAR PURPOSE.
 
 
-srcdir = .
-top_srcdir = ../../../../..
 
 pkgdatadir = $(datadir)/tuxtype
 pkglibdir = $(libdir)/tuxtype
 pkgincludedir = $(includedir)/tuxtype
-top_builddir = ../../../../..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -33,14 +29,14 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-target_triplet = i686-pc-linux-gnu
+build_triplet = i386-pc-linux-gnu
+host_triplet = i586-pc-mingw32msvc
+target_triplet = i586-pc-mingw32msvc
 subdir = tuxtype/data/themes/brazilian-portuguese/words
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -49,21 +45,17 @@
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run automake-1.9
-AWK = gawk
-BUILD_MINGW32_FALSE = 
-BUILD_MINGW32_TRUE = #
-CC = gcc
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10
+AWK = mawk
+CC = i586-mingw32msvc-gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -march=athlon-xp -O2 -pipe -fomit-frame-pointer -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-CPP = gcc -E
-CPPFLAGS = -march=athlon-xp -O2 -pipe -fomit-frame-pointer -DDATA_PREFIX=\"$(prefix)\"
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
+CPP = i586-mingw32msvc-gcc -E
+CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -71,86 +63,92 @@
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
-EXEEXT = 
+EXEEXT = .exe
 GREP = /bin/grep
+INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
 LIBOBJS = 
-LIBS = -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image 
+LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_ttf -lSDL_mixer -lSDL_image  -lgw32c -luuid -lole32 -lwsock32 -mwindows
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/huftis/utvikling/tux4kids/tuxtype/trunk/missing --run makeinfo
-NSIS = no
-NSI_BUILD_FALSE = #
-NSI_BUILD_TRUE = 
-NSI_DLL_DIR = /home/huftis/tuxtype_dll
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo
+MKDIR_P = /bin/mkdir -p
+NSIS = /usr/bin/makensis
+NSI_DLL_DIR = /home/dbruce/tuxtype_dll
 NSI_INSTALL_DIR = mingw32
 OBJEXT = o
 PACKAGE = tuxtype
-PACKAGE_BUGREPORT = 
+PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
 PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.7
+PACKAGE_STRING = tuxtype 1.5.9
 PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.7
+PACKAGE_VERSION = 1.5.9
 PATH_SEPARATOR = :
 SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 SDL_CONFIG = /usr/bin/sdl-config
 SDL_LIBS = -L/usr/lib -lSDL
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = 
-VERSION = 1.5.7
-WINDRES = 
-ac_ct_CC = gcc
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
+STRIP = i586-mingw32msvc-strip
+VERSION = 1.5.9
+WINDRES = /usr/bin/i586-mingw32msvc-windres
+abs_builddir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/trunk
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
+ac_ct_CC = 
 am__include = include
 am__leading_dot = .
 am__quote = 
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
+build = i386-pc-linux-gnu
+build_alias = i386-linux
+build_cpu = i386
 build_os = linux-gnu
 build_vendor = pc
+builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
+host = i586-pc-mingw32msvc
+host_alias = i586-mingw32msvc
+host_cpu = i586
+host_os = mingw32msvc
 host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /home/huftis/utvikling/tux4kids/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
 localstatedir = ${prefix}/var
 mandir = ${datarootdir}/man
-mkdir_p = mkdir -p --
+mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr
-program_transform_name = s,x,x,
+prefix = /usr/local/cross-tools/i586-mingw32msvc
+program_transform_name = s&^&i586-mingw32msvc-&
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
+srcdir = .
 sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
-target_alias = 
-target_cpu = i686
-target_os = linux-gnu
+target = i586-pc-mingw32msvc
+target_alias = i586-mingw32msvc
+target_cpu = i586
+target_os = mingw32msvc
 target_vendor = pc
+top_builddir = ../../../../..
+top_srcdir = ../../../../..
 EXTRA_DIST = fingers.txt\
 plants.txt\
 words1.txt\
@@ -189,7 +187,6 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
 tags: TAGS
 TAGS:
 
@@ -198,22 +195,21 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -272,12 +268,20 @@
 
 install-data-am: install-data-local
 
+install-dvi: install-dvi-am
+
 install-exec-am:
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -296,17 +300,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-local
 
+.MAKE: install-am install-strip
+
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-	uninstall-local
+	pdf-am ps ps-am uninstall uninstall-am uninstall-local
 
 
 install-data-local:

Modified: tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/french/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/french/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/french/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/greek/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/greek/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/greek/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/italian/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/italian/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/italian/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/images/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/images/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/russian/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/russian/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/data/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/words/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/data/words/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/docs/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/docs/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/docs/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/docs/en/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/docs/en/Makefile.in	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/docs/en/Makefile.in	2007-05-09 16:06:27 UTC (rev 179)
@@ -36,7 +36,7 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Modified: tuxtype/trunk/tuxtype/funcs.h
===================================================================
--- tuxtype/trunk/tuxtype/funcs.h	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/funcs.h	2007-05-09 16:06:27 UTC (rev 179)
@@ -56,7 +56,7 @@
 extern int  inRect( SDL_Rect r, int x, int y);
 
 /* in loaders.c */
-extern int         checkFile( const char *file );
+extern int         CheckFile(const char *file);
 extern TTF_Font    *LoadFont( char *fontfile, int fontsize );
 extern void         LoadLang( void );
 extern Mix_Chunk   *LoadSound( char *datafile );

Modified: tuxtype/trunk/tuxtype/loaders.c
===================================================================
--- tuxtype/trunk/tuxtype/loaders.c	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/loaders.c	2007-05-09 16:06:27 UTC (rev 179)
@@ -21,21 +21,39 @@
 #include "funcs.h"
 
 /* check to see if file exists, if so return true            */
-/* FIXME this sometimes erroneously returns false on some    */
-/* Windows versions - hence below hackware. We don't really  */
-/* need this function anyway - it is only an optimization to */
-/* keep from wasting time preparing to do things with files  */
-/* that don't exist.                                         */
-int checkFile( const char *file ) {
-	static struct stat fileStats;
+/* Will work if "file" is a dir, also */
+int CheckFile(const char* file)
+{
+  FILE* fp = NULL;
+  DIR* dp = NULL;
 
-#ifdef WIN32
-        return 1; 
-#endif
+  if (!file)
+  {
+    fprintf(stderr, "CheckFile(): invalid char* argument!");
+    return;
+  }
 
-	fileStats.st_mode = 0;
-	stat( file, &fileStats );
-	return (S_IFREG & fileStats.st_mode);
+  DEBUGCODE {fprintf(stderr, "CheckFile() - checking: %s\n", file);} 
+
+  dp = opendir(file);
+  if (dp)
+  {
+    LOG("Opened successfully as DIR\n");
+
+    closedir(dp);
+    return 1;
+  }
+
+  fp = fopen(file, "r");
+  if (fp)
+  {
+    LOG("Opened successfully as FILE\n");
+    fclose(fp);
+    return 1;
+  }
+
+  LOG("Unable to open as either FILE or DIR\n");
+  return 0;
 }
 
 void LoadLang( void ) {

Modified: tuxtype/trunk/tuxtype/main.c
===================================================================
--- tuxtype/trunk/tuxtype/main.c	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/main.c	2007-05-09 16:06:27 UTC (rev 179)
@@ -148,7 +148,6 @@
 
 	LoadLang();
 	LoadKeyboard();
-
 	TitleScreen();
 
 	SaveSettings();

Modified: tuxtype/trunk/tuxtype/theme.c
===================================================================
--- tuxtype/trunk/tuxtype/theme.c	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/theme.c	2007-05-09 16:06:27 UTC (rev 179)
@@ -48,7 +48,6 @@
  * the default path
  */
 void setupTheme( char *dirName ) {
-	static struct stat dirStats;
 	int i;
 	int found = 0;
 	useEnglish=1; // default is to use English if we cannot find theme
@@ -59,9 +58,8 @@
 		fprintf(stderr, "setupTheme(): checking for: %s\n", PATHS[i]);
 		}
 
-		dirStats.st_mode = 0;
-		stat( PATHS[i], &dirStats );
-		if (S_IFDIR & dirStats.st_mode) {
+		if (CheckFile(PATHS[i]))
+                {
 			strncpy( realPath[1], PATHS[i], FNLEN-1);
 			strncpy( themeName, "", FNLEN-1 );
 			found = 1; /* so quit looking */
@@ -83,9 +81,9 @@
 
 		/* find the path to the theme */
 		sprintf( fullDir, "%s/themes/%s", realPath[1], dirName );
-		dirStats.st_mode = 0;
-		stat( fullDir, &dirStats );
-		if (S_IFDIR & dirStats.st_mode) {
+
+		if (CheckFile(fullDir))
+                {
 			useEnglish=0;
 			strncpy( realPath[0], fullDir, FNLEN-1 );
 			strncpy( themeName, dirName, FNLEN-1 );

Modified: tuxtype/trunk/tuxtype/titlescreen.c
===================================================================
--- tuxtype/trunk/tuxtype/titlescreen.c	2007-05-07 15:31:34 UTC (rev 178)
+++ tuxtype/trunk/tuxtype/titlescreen.c	2007-05-09 16:06:27 UTC (rev 179)
@@ -1028,7 +1028,6 @@
 
 	DIR *wordsDir;
 	struct dirent *wordsFile;
-	struct stat fileStats;
 	FILE *tempFile;
 
 	LOG("Entering chooseWordlist():\n");
@@ -1036,10 +1035,8 @@
 	/* find the directory to load wordlists from */
 
 	for (i=useEnglish; i<2; i++) {
-		fileStats.st_mode = 0; // clear last use!
 		sprintf( wordPath, "%s/words", realPath[i] );
-		stat( wordPath, &fileStats );
-		if ( fileStats.st_mode & S_IFDIR )
+		if (CheckFile(wordPath))
 			break;
 	}
 


