[Tux4kids-commits] r658 - in tuxtype/trunk: . data data/fonts data/images data/images/backgrounds data/images/cities data/images/comets data/images/icons data/images/keyboard data/images/menu data/images/status data/images/tux data/scripts data/sounds data/themes data/themes/armenian data/themes/armenian/images data/themes/bokmal/images/status data/themes/brazilian-portuguese data/themes/brazilian-portuguese/images data/themes/brazilian-portuguese/words data/themes/catalan data/themes/catalan/words data/themes/czech data/themes/czech/words data/themes/dansk data/themes/dansk/sounds data/themes/dansk/words data/themes/deutsch data/themes/deutsch/words data/themes/espanol data/themes/espanol/images data/themes/espanol/words data/themes/euskara data/themes/euskara/images data/themes/euskara/words data/themes/french data/themes/french/words data/themes/greek data/themes/greek/words data/themes/italian data/themes/italian/images data/themes/italian/words data/themes/jamaican data/themes/jamaican/images data/themes/jamaican/words data/themes/lithuanian data/themes/lithuanian/images data/themes/lithuanian/images/status data/themes/lithuanian/sounds data/themes/lithuanian/words data/themes/malayalam data/themes/malayalam/images data/themes/malayalam/images/keyboard data/themes/malayalam/images/status data/themes/nederlands data/themes/nederlands/words data/themes/nynorsk data/themes/nynorsk/images data/themes/nynorsk/images/status data/themes/nynorsk/words data/themes/russian data/themes/russian/images data/themes/russian/images/status data/themes/russian/words data/themes/svenska data/themes/svenska/words data/themes/swahili data/themes/swahili/words data/themes/wolof data/themes/wolof/images data/themes/wolof/words data/words doc doc/en po src

sreerenj-guest at alioth.debian.org sreerenj-guest at alioth.debian.org
Tue Aug 19 19:40:43 UTC 2008


Author: sreerenj-guest
Date: 2008-08-19 19:40:41 +0000 (Tue, 19 Aug 2008)
New Revision: 658

Modified:
   tuxtype/trunk/Makefile.in
   tuxtype/trunk/aclocal.m4
   tuxtype/trunk/config.h.in
   tuxtype/trunk/config.log
   tuxtype/trunk/config.status
   tuxtype/trunk/configure
   tuxtype/trunk/data/Makefile.in
   tuxtype/trunk/data/fonts/Makefile.in
   tuxtype/trunk/data/images/Makefile
   tuxtype/trunk/data/images/Makefile.in
   tuxtype/trunk/data/images/backgrounds/Makefile.in
   tuxtype/trunk/data/images/cities/Makefile.in
   tuxtype/trunk/data/images/comets/Makefile.in
   tuxtype/trunk/data/images/icons/Makefile.in
   tuxtype/trunk/data/images/keyboard/Makefile.am
   tuxtype/trunk/data/images/keyboard/Makefile.am~
   tuxtype/trunk/data/images/menu/Makefile.in
   tuxtype/trunk/data/images/status/Makefile.in
   tuxtype/trunk/data/images/tux/Makefile.in
   tuxtype/trunk/data/scripts/Makefile.in
   tuxtype/trunk/data/sounds/Makefile.in
   tuxtype/trunk/data/themes/Makefile.in
   tuxtype/trunk/data/themes/armenian/Makefile.in
   tuxtype/trunk/data/themes/armenian/images/Makefile.in
   tuxtype/trunk/data/themes/bokmal/images/status/Makefile.in
   tuxtype/trunk/data/themes/brazilian-portuguese/Makefile.in
   tuxtype/trunk/data/themes/brazilian-portuguese/images/Makefile.in
   tuxtype/trunk/data/themes/brazilian-portuguese/words/Makefile.in
   tuxtype/trunk/data/themes/catalan/Makefile.in
   tuxtype/trunk/data/themes/catalan/words/Makefile.in
   tuxtype/trunk/data/themes/czech/Makefile.in
   tuxtype/trunk/data/themes/czech/words/Makefile.in
   tuxtype/trunk/data/themes/dansk/Makefile.in
   tuxtype/trunk/data/themes/dansk/sounds/Makefile.in
   tuxtype/trunk/data/themes/dansk/words/Makefile.in
   tuxtype/trunk/data/themes/deutsch/Makefile.in
   tuxtype/trunk/data/themes/deutsch/words/Makefile.in
   tuxtype/trunk/data/themes/espanol/Makefile.in
   tuxtype/trunk/data/themes/espanol/images/Makefile.in
   tuxtype/trunk/data/themes/espanol/words/Makefile.in
   tuxtype/trunk/data/themes/euskara/Makefile.in
   tuxtype/trunk/data/themes/euskara/images/Makefile.in
   tuxtype/trunk/data/themes/euskara/words/Makefile.in
   tuxtype/trunk/data/themes/french/Makefile.in
   tuxtype/trunk/data/themes/french/words/Makefile.in
   tuxtype/trunk/data/themes/greek/Makefile.in
   tuxtype/trunk/data/themes/greek/words/Makefile.in
   tuxtype/trunk/data/themes/italian/Makefile.in
   tuxtype/trunk/data/themes/italian/images/Makefile.in
   tuxtype/trunk/data/themes/italian/words/Makefile.in
   tuxtype/trunk/data/themes/jamaican/Makefile.in
   tuxtype/trunk/data/themes/jamaican/images/Makefile.in
   tuxtype/trunk/data/themes/jamaican/words/Makefile.in
   tuxtype/trunk/data/themes/lithuanian/Makefile.in
   tuxtype/trunk/data/themes/lithuanian/images/Makefile.in
   tuxtype/trunk/data/themes/lithuanian/images/status/Makefile.in
   tuxtype/trunk/data/themes/lithuanian/sounds/Makefile.in
   tuxtype/trunk/data/themes/lithuanian/words/Makefile.in
   tuxtype/trunk/data/themes/malayalam/Makefile.in
   tuxtype/trunk/data/themes/malayalam/images/Makefile.in
   tuxtype/trunk/data/themes/malayalam/images/keyboard/Makefile.in
   tuxtype/trunk/data/themes/malayalam/images/status/Makefile
   tuxtype/trunk/data/themes/malayalam/images/status/Makefile.in
   tuxtype/trunk/data/themes/nederlands/Makefile.in
   tuxtype/trunk/data/themes/nederlands/words/Makefile.in
   tuxtype/trunk/data/themes/nynorsk/Makefile.in
   tuxtype/trunk/data/themes/nynorsk/images/Makefile.in
   tuxtype/trunk/data/themes/nynorsk/images/status/Makefile.in
   tuxtype/trunk/data/themes/nynorsk/words/Makefile.in
   tuxtype/trunk/data/themes/russian/Makefile.in
   tuxtype/trunk/data/themes/russian/images/Makefile.in
   tuxtype/trunk/data/themes/russian/images/status/Makefile.in
   tuxtype/trunk/data/themes/russian/words/Makefile.in
   tuxtype/trunk/data/themes/svenska/Makefile.in
   tuxtype/trunk/data/themes/svenska/words/Makefile.in
   tuxtype/trunk/data/themes/swahili/Makefile.in
   tuxtype/trunk/data/themes/swahili/words/Makefile.in
   tuxtype/trunk/data/themes/wolof/Makefile.in
   tuxtype/trunk/data/themes/wolof/images/Makefile.in
   tuxtype/trunk/data/themes/wolof/words/Makefile.in
   tuxtype/trunk/data/words/Makefile.in
   tuxtype/trunk/doc/Makefile.in
   tuxtype/trunk/doc/en/Makefile
   tuxtype/trunk/doc/en/Makefile.in
   tuxtype/trunk/po/Makefile
   tuxtype/trunk/po/Makefile.in
   tuxtype/trunk/po/ar.po
   tuxtype/trunk/po/ca.po
   tuxtype/trunk/po/cs.po
   tuxtype/trunk/po/da.po
   tuxtype/trunk/po/de.po
   tuxtype/trunk/po/el.po
   tuxtype/trunk/po/en at boldquot.po
   tuxtype/trunk/po/en at quot.po
   tuxtype/trunk/po/en_GB.po
   tuxtype/trunk/po/es.po
   tuxtype/trunk/po/eu.po
   tuxtype/trunk/po/fr.po
   tuxtype/trunk/po/it.po
   tuxtype/trunk/po/ja.po
   tuxtype/trunk/po/lt.po
   tuxtype/trunk/po/ml.gmo
   tuxtype/trunk/po/ml.po
   tuxtype/trunk/po/nb.po
   tuxtype/trunk/po/ne.po
   tuxtype/trunk/po/nl.po
   tuxtype/trunk/po/nn.po
   tuxtype/trunk/po/pt.po
   tuxtype/trunk/po/ru.po
   tuxtype/trunk/po/sv.po
   tuxtype/trunk/po/sw.po
   tuxtype/trunk/po/tuxtype.pot
   tuxtype/trunk/po/wo.po
   tuxtype/trunk/src/Makefile.in
Log:


Modified: tuxtype/trunk/Makefile.in
===================================================================
--- tuxtype/trunk/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -93,7 +93,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -141,7 +140,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -335,8 +333,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -361,8 +359,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -372,12 +370,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -448,10 +447,6 @@
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -478,8 +473,6 @@
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -630,18 +623,18 @@
 .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-lzma 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
+	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/aclocal.m4
===================================================================
--- tuxtype/trunk/aclocal.m4	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/aclocal.m4	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2005, 2006  Free Software Foundation, Inc.
 # This file 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.
@@ -11,16 +11,13 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
 
-# gettext.m4 serial 60 (gettext-0.17)
-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
+# gettext.m4 serial 59 (gettext-0.16.1)
+dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -383,6 +380,44 @@
 ])
 
 
+dnl Checks for special options needed on MacOS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in MacOS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    gt_cv_func_CFPreferencesCopyAppValue,
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
+       [CFPreferencesCopyAppValue(NULL, NULL)],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
+      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in MacOS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
+    [gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
+      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])
+
+
 dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
 m4_define([gt_NEEDS_INIT],
 [
@@ -401,8 +436,8 @@
 dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
 AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
 
-# iconv.m4 serial AM6 (gettext-0.17)
-dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
+# iconv.m4 serial AM4 (gettext-0.11.3)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -424,7 +459,6 @@
 [
   dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
   dnl those with the standalone portable GNU libiconv installed).
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
 
   dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
   dnl accordingly.
@@ -437,7 +471,7 @@
   am_save_CPPFLAGS="$CPPFLAGS"
   AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
 
-  AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
+  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     AC_TRY_LINK([#include <stdlib.h>
@@ -460,86 +494,8 @@
     fi
   ])
   if test "$am_cv_func_iconv" = yes; then
-    AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
-      dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
-      am_save_LIBS="$LIBS"
-      if test $am_cv_lib_iconv = yes; then
-        LIBS="$LIBS $LIBICONV"
-      fi
-      AC_TRY_RUN([
-#include <iconv.h>
-#include <string.h>
-int main ()
-{
-  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
-     returns.  */
-  {
-    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
-    if (cd_utf8_to_88591 != (iconv_t)(-1))
-      {
-        static const char input[] = "\342\202\254"; /* EURO SIGN */
-        char buf[10];
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_utf8_to_88591,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          return 1;
-      }
-  }
-#if 0 /* This bug could be worked around by the caller.  */
-  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
-        char buf[50];
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_88591_to_utf8,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if ((int)res > 0)
-          return 1;
-      }
-  }
-#endif
-  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-     provided.  */
-  if (/* Try standardized names.  */
-      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
-      /* Try IRIX, OSF/1 names.  */
-      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
-      /* Try AIX names.  */
-      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
-      /* Try HP-UX names.  */
-      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
-  return 0;
-}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
-        [case "$host_os" in
-           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-           *)            am_cv_func_iconv_works="guessing yes" ;;
-         esac])
-      LIBS="$am_save_LIBS"
-    ])
-    case "$am_cv_func_iconv_works" in
-      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
-      *)   am_func_iconv=yes ;;
-    esac
-  else
-    am_func_iconv=no am_cv_lib_iconv=no
+    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
   fi
-  if test "$am_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1,
-      [Define if you have the iconv() function and it works.])
-  fi
   if test "$am_cv_lib_iconv" = yes; then
     AC_MSG_CHECKING([how to link with libiconv])
     AC_MSG_RESULT([$LIBICONV])
@@ -582,58 +538,6 @@
   fi
 ])
 
-# intlmacosx.m4 serial 1 (gettext-0.17)
-dnl Copyright (C) 2004-2007 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Checks for special options needed on MacOS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
-[
-  dnl Check for API introduced in MacOS X 10.2.
-  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
-    gt_cv_func_CFPreferencesCopyAppValue,
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
-       [CFPreferencesCopyAppValue(NULL, NULL)],
-       [gt_cv_func_CFPreferencesCopyAppValue=yes],
-       [gt_cv_func_CFPreferencesCopyAppValue=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
-      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
-  fi
-  dnl Check for API introduced in MacOS X 10.3.
-  AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
-       [gt_cv_func_CFLocaleCopyCurrent=yes],
-       [gt_cv_func_CFLocaleCopyCurrent=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
-      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-  AC_SUBST([INTL_MACOSX_LIBS])
-])
-
 # lib-ld.m4 serial 3 (gettext-0.13)
 dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -745,22 +649,20 @@
 AC_LIB_PROG_LD_GNU
 ])
 
-# lib-link.m4 serial 13 (gettext-0.17)
-dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
+# lib-link.m4 serial 9 (gettext-0.16)
+dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
-AC_PREREQ(2.54)
+AC_PREREQ(2.50)
 
 dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
 dnl the libraries corresponding to explicit and implicit dependencies.
 dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
 dnl augments the CPPFLAGS variable.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN([AC_LIB_LINKFLAGS],
 [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
@@ -773,16 +675,13 @@
     ac_cv_lib[]Name[]_libs="$LIB[]NAME"
     ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
     ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
   ])
   LIB[]NAME="$ac_cv_lib[]Name[]_libs"
   LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
   INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
   AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
   AC_SUBST([LIB]NAME)
   AC_SUBST([LTLIB]NAME)
-  AC_SUBST([LIB]NAME[_PREFIX])
   dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
   dnl results of this search when this library appears as a dependency.
   HAVE_LIB[]NAME=yes
@@ -798,8 +697,6 @@
 dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
 dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
 dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
 [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
@@ -836,23 +733,17 @@
     CPPFLAGS="$ac_save_CPPFLAGS"
     LIB[]NAME=
     LTLIB[]NAME=
-    LIB[]NAME[]_PREFIX=
   fi
   AC_SUBST([HAVE_LIB]NAME)
   AC_SUBST([LIB]NAME)
   AC_SUBST([LTLIB]NAME)
-  AC_SUBST([LIB]NAME[_PREFIX])
   undefine([Name])
   undefine([NAME])
 ])
 
 dnl Determine the platform dependent parameters needed to use rpath:
-dnl   acl_libext,
-dnl   acl_shlibext,
-dnl   acl_hardcode_libdir_flag_spec,
-dnl   acl_hardcode_libdir_separator,
-dnl   acl_hardcode_direct,
-dnl   acl_hardcode_minus_L.
+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
+dnl hardcode_direct, hardcode_minus_L.
 AC_DEFUN([AC_LIB_RPATH],
 [
   dnl Tell automake >= 1.10 to complain if config.rpath is missing.
@@ -869,14 +760,12 @@
     acl_cv_rpath=done
   ])
   wl="$acl_cv_wl"
-  acl_libext="$acl_cv_libext"
-  acl_shlibext="$acl_cv_shlibext"
-  acl_libname_spec="$acl_cv_libname_spec"
-  acl_library_names_spec="$acl_cv_library_names_spec"
-  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  acl_hardcode_direct="$acl_cv_hardcode_direct"
-  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  libext="$acl_cv_libext"
+  shlibext="$acl_cv_shlibext"
+  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  hardcode_direct="$acl_cv_hardcode_direct"
+  hardcode_minus_L="$acl_cv_hardcode_minus_L"
   dnl Determine whether the user wants rpath handling at all.
   AC_ARG_ENABLE(rpath,
     [  --disable-rpath         do not hardcode runtime library paths],
@@ -886,24 +775,20 @@
 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
 dnl the libraries corresponding to explicit and implicit dependencies.
 dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
-dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
 [
   AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  dnl Autoconf >= 2.61 supports dots in --with options.
-  define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
   dnl By default, look in $includedir and $libdir.
   use_additional=yes
   AC_LIB_WITH_FINAL_PREFIX([
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
   ])
-  AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
-[  --with-lib]N_A_M_E[-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
-  --without-lib]N_A_M_E[-prefix     don't search for lib$1 in includedir and libdir],
+  AC_LIB_ARG_WITH([lib$1-prefix],
+[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
+  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
 [
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -924,7 +809,6 @@
   LIB[]NAME=
   LTLIB[]NAME=
   INC[]NAME=
-  LIB[]NAME[]_PREFIX=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -964,53 +848,27 @@
           found_la=
           found_so=
           found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
           if test $use_additional = yes; then
-            dir="$additional_libdir"
-            dnl The same code as in the loop below:
-            dnl First look for a shared library.
-            if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
+              found_dir="$additional_libdir"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
               else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
+                found_so="$additional_libdir/lib$name.dll.a"
               fi
-            fi
-            dnl Then look for a static library.
-            if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
               fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
               fi
             fi
           fi
@@ -1020,46 +878,28 @@
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  dnl First look for a shared library.
-                  if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
+                    found_dir="$dir"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
                     else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
+                      found_so="$dir/lib$name.dll.a"
                     fi
-                  fi
-                  dnl Then look for a static library.
-                  if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
+                    fi
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
                       found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
                     fi
                   fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
                   ;;
               esac
               if test "X$found_dir" != "X"; then
@@ -1093,12 +933,12 @@
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
                 dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$acl_hardcode_direct" = yes; then
+                if test "$hardcode_direct" = yes; then
                   dnl Using DIR/libNAME.so during linking hardcodes DIR into the
                   dnl resulting binary.
                   LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
                 else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
                     dnl Use an explicit option to hardcode DIR into the resulting
                     dnl binary.
                     LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
@@ -1129,13 +969,13 @@
                     if test -z "$haveit"; then
                       LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
                     fi
-                    if test "$acl_hardcode_minus_L" != no; then
+                    if test "$hardcode_minus_L" != no; then
                       dnl FIXME: Not sure whether we should use
                       dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
                       dnl here.
                       LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
                     else
-                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
+                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
                       dnl here, because this doesn't fit in flags passed to the
                       dnl compiler. So give up. No hardcoding. This affects only
                       dnl very old systems.
@@ -1162,7 +1002,6 @@
             case "$found_dir" in
               */$acl_libdirstem | */$acl_libdirstem/)
                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                LIB[]NAME[]_PREFIX="$basedir"
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -1324,18 +1163,18 @@
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
+    if test -n "$hardcode_libdir_separator"; then
       dnl Weird platform: only the last -rpath option counts, the user must
       dnl pass all path elements in one option. We can arrange that for a
       dnl single library, but not when more than one $LIBNAMEs are used.
       alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
       done
-      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
+      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
       acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      eval flag=\"$hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
     else
@@ -1343,7 +1182,7 @@
       for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        eval flag=\"$hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
       done
@@ -1392,7 +1231,7 @@
   AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   $1=
   if test "$enable_rpath" != no; then
-    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+    if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
       dnl Use an explicit option to hardcode directories into the resulting
       dnl binary.
       rpathdirs=
@@ -1426,16 +1265,16 @@
           done
         else
           dnl The linker is used for linking directly.
-          if test -n "$acl_hardcode_libdir_separator"; then
+          if test -n "$hardcode_libdir_separator"; then
             dnl Weird platform: only the last -rpath option counts, the user
             dnl must pass all path elements in one option.
             alldirs=
             for dir in $rpathdirs; do
-              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
+              alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir"
             done
             acl_save_libdir="$libdir"
             libdir="$alldirs"
-            eval flag=\"$acl_hardcode_libdir_flag_spec\"
+            eval flag=\"$hardcode_libdir_flag_spec\"
             libdir="$acl_save_libdir"
             $1="$flag"
           else
@@ -1443,7 +1282,7 @@
             for dir in $rpathdirs; do
               acl_save_libdir="$libdir"
               libdir="$dir"
-              eval flag=\"$acl_hardcode_libdir_flag_spec\"
+              eval flag=\"$hardcode_libdir_flag_spec\"
               libdir="$acl_save_libdir"
               $1="${$1}${$1:+ }$flag"
             done
@@ -1673,8 +1512,8 @@
   AC_SUBST(USE_NLS)
 ])
 
-# po.m4 serial 15 (gettext-0.17)
-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
+# po.m4 serial 13 (gettext-0.15)
+dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -1702,10 +1541,6 @@
   AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
   AC_REQUIRE([AM_NLS])dnl
 
-  dnl Release version of the gettext macros. This is used to ensure that
-  dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
-
   dnl Perform the following tests also if --disable-nls has been given,
   dnl because they are needed for "make dist" to work.
 
@@ -1763,10 +1598,6 @@
   test -n "$localedir" || localedir='${datadir}/locale'
   AC_SUBST([localedir])
 
-  dnl Support for AM_XGETTEXT_OPTION.
-  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
-
   AC_CONFIG_COMMANDS([po-directories], [[
     for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"
@@ -2110,19 +1941,6 @@
   mv "$ac_file.tmp" "$ac_file"
 ])
 
-dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
-AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
-[
-  XGETTEXT_EXTRA_OPTIONS=
-])
-
-dnl Registers an option to be passed to xgettext in the po subdirectory.
-AC_DEFUN([AM_XGETTEXT_OPTION],
-[
-  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
-])
-
 # progtest.m4 serial 4 (gettext-0.14.2)
 dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -2216,7 +2034,7 @@
 AC_SUBST($1)dnl
 ])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2231,7 +2049,7 @@
 [am__api_version='1.10'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10.1], [],
+m4_if([$1], [1.10], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -2247,10 +2065,8 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -2522,7 +2338,7 @@
   # each Makefile.in and add a new line on top of each file to say so.
   # 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 -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -2570,13 +2386,13 @@
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
 #
 # This file 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.
 
-# serial 13
+# serial 12
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -2681,17 +2497,16 @@
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
-_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $_am_arg | $_am_arg:* )
+    $1 | $1:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -2963,7 +2778,7 @@
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 

Modified: tuxtype/trunk/config.h.in
===================================================================
--- tuxtype/trunk/config.h.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/config.h.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -25,7 +25,7 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
-/* Define if you have the iconv() function and it works. */
+/* Define if you have the iconv() function. */
 #undef HAVE_ICONV
 
 /* Define to 1 if you have the <inttypes.h> header file. */

Modified: tuxtype/trunk/config.log
===================================================================
--- tuxtype/trunk/config.log	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/config.log	2008-08-19 19:40:41 UTC (rev 658)
@@ -12,9 +12,9 @@
 
 hostname = debian
 uname -m = i686
-uname -r = 2.6.18-4-k7
+uname -r = 2.6.18-4-686
 uname -s = Linux
-uname -v = #1 SMP Mon Mar 26 17:57:15 UTC 2007
+uname -v = #1 SMP Mon Mar 26 17:17:36 UTC 2007
 
 /usr/bin/uname -p = unknown
 /bin/uname -X     = unknown
@@ -33,7 +33,6 @@
 PATH: /usr/bin
 PATH: /sbin
 PATH: /bin
-PATH: /usr/bin/X11
 
 
 ## ----------- ##
@@ -53,10 +52,8 @@
 configure:2107: checking for a thread-safe mkdir -p
 configure:2146: result: /bin/mkdir -p
 configure:2159: checking for gawk
-configure:2189: result: no
-configure:2159: checking for mawk
-configure:2175: found /usr/bin/mawk
-configure:2186: result: mawk
+configure:2175: found /usr/bin/gawk
+configure:2186: result: gawk
 configure:2197: checking whether make sets $(MAKE)
 configure:2218: result: yes
 configure:2411: checking whether NLS is requested
@@ -228,10 +225,10 @@
 configure:6286: checking whether make sets $(MAKE)
 configure:6307: result: yes
 configure:6373: checking for sdl-config
-configure:6391: found /usr/bin/sdl-config
-configure:6404: result: /usr/bin/sdl-config
+configure:6391: found /usr/local/bin/sdl-config
+configure:6404: result: /usr/local/bin/sdl-config
 configure:6413: checking for SDL - version >= 1.2.5
-configure:6510: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT   conftest.c  -L/usr/lib -lSDL >&5
+configure:6510: gcc -o conftest -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT   conftest.c  -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread >&5
 configure:6513: $? = 0
 configure:6519: ./conftest
 configure:6522: $? = 0
@@ -307,47 +304,47 @@
 configure:7339: checking for egrep
 configure:7417: result: /bin/grep -E
 configure:7422: checking for ANSI C header files
-configure:7452: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
+configure:7452: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
 configure:7458: $? = 0
-configure:7557: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT   conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer  >&5
+configure:7557: gcc -o conftest -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT   conftest.c -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer  >&5
 configure:7560: $? = 0
 configure:7566: ./conftest
 configure:7569: $? = 0
 configure:7586: result: yes
 configure:7610: checking for sys/types.h
-configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
 configure:7637: $? = 0
 configure:7653: result: yes
 configure:7610: checking for sys/stat.h
-configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
 configure:7637: $? = 0
 configure:7653: result: yes
 configure:7610: checking for stdlib.h
-configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
 configure:7637: $? = 0
 configure:7653: result: yes
 configure:7610: checking for string.h
-configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
 configure:7637: $? = 0
 configure:7653: result: yes
 configure:7610: checking for memory.h
-configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
 configure:7637: $? = 0
 configure:7653: result: yes
 configure:7610: checking for strings.h
-configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
 configure:7637: $? = 0
 configure:7653: result: yes
 configure:7610: checking for inttypes.h
-configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
 configure:7637: $? = 0
 configure:7653: result: yes
 configure:7610: checking for stdint.h
-configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
 configure:7637: $? = 0
 configure:7653: result: yes
 configure:7610: checking for unistd.h
-configure:7631: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
+configure:7631: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
 configure:7637: $? = 0
 configure:7653: result: yes
 configure:7671: checking for stdlib.h
@@ -355,34 +352,34 @@
 configure:7671: checking for string.h
 configure:7677: result: yes
 configure:7813: checking for an ANSI C-conforming const
-configure:7888: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
+configure:7888: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
 configure:7894: $? = 0
 configure:7909: result: yes
 configure:7919: checking for inline
-configure:7945: gcc -c -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
+configure:7945: gcc -c -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT  conftest.c >&5
 configure:7951: $? = 0
 configure:7969: result: inline
 configure:7998: checking for atexit
-configure:8054: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT   conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer  >&5
+configure:8054: gcc -o conftest -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT   conftest.c -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer  >&5
 configure:8060: $? = 0
 configure:8078: result: yes
 configure:7998: checking for memset
-configure:8054: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT   conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer  >&5
+configure:8054: gcc -o conftest -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT   conftest.c -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer  >&5
 conftest.c:53: warning: conflicting types for built-in function 'memset'
 configure:8060: $? = 0
 configure:8078: result: yes
 configure:7998: checking for strchr
-configure:8054: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT   conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer  >&5
+configure:8054: gcc -o conftest -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT   conftest.c -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer  >&5
 conftest.c:54: warning: conflicting types for built-in function 'strchr'
 configure:8060: $? = 0
 configure:8078: result: yes
 configure:7998: checking for strstr
-configure:8054: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT   conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer  >&5
+configure:8054: gcc -o conftest -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT   conftest.c -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer  >&5
 conftest.c:55: warning: conflicting types for built-in function 'strstr'
 configure:8060: $? = 0
 configure:8078: result: yes
 configure:7998: checking for malloc
-configure:8054: gcc -o conftest -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT   conftest.c -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer  >&5
+configure:8054: gcc -o conftest -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT   conftest.c -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer  >&5
 conftest.c:56: warning: conflicting types for built-in function 'malloc'
 configure:8060: $? = 0
 configure:8078: result: yes
@@ -550,11 +547,11 @@
 ac_cv_path_MSGFMT=/usr/bin/msgfmt
 ac_cv_path_MSGMERGE=/usr/bin/msgmerge
 ac_cv_path_NSIS=no
-ac_cv_path_SDL_CONFIG=/usr/bin/sdl-config
+ac_cv_path_SDL_CONFIG=/usr/local/bin/sdl-config
 ac_cv_path_XGETTEXT=/usr/bin/xgettext
 ac_cv_path_install='/usr/bin/install -c'
 ac_cv_path_mkdir=/bin/mkdir
-ac_cv_prog_AWK=mawk
+ac_cv_prog_AWK=gawk
 ac_cv_prog_CPP='gcc -E'
 ac_cv_prog_ac_ct_CC=gcc
 ac_cv_prog_cc_c89=
@@ -580,20 +577,20 @@
 ## Output variables. ##
 ## ----------------- ##
 
-ACLOCAL='${SHELL} /usr/local/src/soc-mobin-up/missing --run aclocal-1.10'
+ACLOCAL='${SHELL} /root/tuxtype/trunk/missing --run aclocal-1.10'
 AMDEPBACKSLASH='\'
 AMDEP_FALSE='#'
 AMDEP_TRUE=''
-AMTAR='${SHELL} /usr/local/src/soc-mobin-up/missing --run tar'
-AUTOCONF='${SHELL} /usr/local/src/soc-mobin-up/missing --run autoconf'
-AUTOHEADER='${SHELL} /usr/local/src/soc-mobin-up/missing --run autoheader'
-AUTOMAKE='${SHELL} /usr/local/src/soc-mobin-up/missing --run automake-1.10'
-AWK='mawk'
+AMTAR='${SHELL} /root/tuxtype/trunk/missing --run tar'
+AUTOCONF='${SHELL} /root/tuxtype/trunk/missing --run autoconf'
+AUTOHEADER='${SHELL} /root/tuxtype/trunk/missing --run autoheader'
+AUTOMAKE='${SHELL} /root/tuxtype/trunk/missing --run automake-1.10'
+AWK='gawk'
 BUILD_MINGW32_FALSE=''
 BUILD_MINGW32_TRUE='#'
 CC='gcc'
 CCDEPMODE='depmode=gcc3'
-CFLAGS='-g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT'
+CFLAGS='-g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT'
 CPP='gcc -E'
 CPPFLAGS=' -DDATA_PREFIX=\"$(prefix)\"'
 CYGPATH_W='echo'
@@ -617,12 +614,12 @@
 LIBICONV='-liconv'
 LIBINTL=''
 LIBOBJS=''
-LIBS='-L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer '
+LIBS='-L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer '
 LN_S='ln -s'
 LTLIBICONV='-liconv'
 LTLIBINTL=''
 LTLIBOBJS=''
-MAKEINFO='${SHELL} /usr/local/src/soc-mobin-up/missing --run makeinfo'
+MAKEINFO='${SHELL} /root/tuxtype/trunk/missing --run makeinfo'
 MSGFMT='/usr/bin/msgfmt'
 MSGFMT_015='/usr/bin/msgfmt'
 MSGMERGE='/usr/bin/msgmerge'
@@ -640,9 +637,9 @@
 PACKAGE_VERSION='1.5.16'
 PATH_SEPARATOR=':'
 POSUB='po'
-SDL_CFLAGS='-I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT'
-SDL_CONFIG='/usr/bin/sdl-config'
-SDL_LIBS='-L/usr/lib -lSDL'
+SDL_CFLAGS='-I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT'
+SDL_CONFIG='/usr/local/bin/sdl-config'
+SDL_LIBS='-L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread'
 SET_MAKE=''
 SHELL='/bin/sh'
 STRIP=''
@@ -679,7 +676,7 @@
 htmldir='${docdir}'
 includedir='${prefix}/include'
 infodir='${datarootdir}/info'
-install_sh='$(SHELL) /usr/local/src/soc-mobin-up/install-sh'
+install_sh='$(SHELL) /root/tuxtype/trunk/install-sh'
 libdir='${exec_prefix}/lib'
 libexecdir='${exec_prefix}/libexec'
 localedir='${datarootdir}/locale'
@@ -737,2367 +734,3 @@
 #define HAVE_MALLOC 1
 
 configure: exit 0
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/armenian/Makefile
-
-on debian
-
-config.status:771: creating data/themes/armenian/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/armenian/Makefile
-
-on debian
-
-config.status:771: creating data/themes/armenian/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/armenian/Makefile
-
-on debian
-
-config.status:771: creating data/themes/armenian/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status Makefile
-
-on debian
-
-config.status:771: creating Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/Makefile
-
-on debian
-
-config.status:771: creating data/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/images/Makefile
-
-on debian
-
-config.status:771: creating data/images/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/images/backgrounds/Makefile
-
-on debian
-
-config.status:771: creating data/images/backgrounds/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/images/cities/Makefile
-
-on debian
-
-config.status:771: creating data/images/cities/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/images/comets/Makefile
-
-on debian
-
-config.status:771: creating data/images/comets/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/images/hands/Makefile
-
-on debian
-
-config.status:771: creating data/images/hands/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/images/icons/Makefile
-
-on debian
-
-config.status:771: creating data/images/icons/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/images/keyboard/Makefile
-
-on debian
-
-config.status:771: creating data/images/keyboard/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/images/menu/Makefile
-
-on debian
-
-config.status:771: creating data/images/menu/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/images/status/Makefile
-
-on debian
-
-config.status:771: creating data/images/status/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/images/tux/Makefile
-
-on debian
-
-config.status:771: creating data/images/tux/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/scripts/Makefile
-
-on debian
-
-config.status:771: creating data/scripts/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/sounds/Makefile
-
-on debian
-
-config.status:771: creating data/sounds/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/Makefile
-
-on debian
-
-config.status:771: creating data/themes/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/armenian/Makefile
-
-on debian
-
-config.status:771: creating data/themes/armenian/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/armenian/images/Makefile
-
-on debian
-
-config.status:771: creating data/themes/armenian/images/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/bokmal/Makefile
-
-on debian
-
-config.status:771: creating data/themes/bokmal/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/bokmal/images/Makefile
-
-on debian
-
-config.status:771: creating data/themes/bokmal/images/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/bokmal/images/status/Makefile
-
-on debian
-
-config.status:771: creating data/themes/bokmal/images/status/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/bokmal/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/bokmal/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/brazilian-portuguese/Makefile
-
-on debian
-
-config.status:771: creating data/themes/brazilian-portuguese/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/brazilian-portuguese/images/Makefile
-
-on debian
-
-config.status:771: creating data/themes/brazilian-portuguese/images/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/brazilian-portuguese/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/brazilian-portuguese/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/catalan/Makefile
-
-on debian
-
-config.status:771: creating data/themes/catalan/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/catalan/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/catalan/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/czech/Makefile
-
-on debian
-
-config.status:771: creating data/themes/czech/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/czech/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/czech/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/dansk/Makefile
-
-on debian
-
-config.status:771: creating data/themes/dansk/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/dansk/sounds/Makefile
-
-on debian
-
-config.status:771: creating data/themes/dansk/sounds/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/dansk/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/dansk/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/deutsch/Makefile
-
-on debian
-
-config.status:771: creating data/themes/deutsch/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/deutsch/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/deutsch/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/espanol/Makefile
-
-on debian
-
-config.status:771: creating data/themes/espanol/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/espanol/images/Makefile
-
-on debian
-
-config.status:771: creating data/themes/espanol/images/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/espanol/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/espanol/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/euskara/Makefile
-
-on debian
-
-config.status:771: creating data/themes/euskara/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/euskara/images/Makefile
-
-on debian
-
-config.status:771: creating data/themes/euskara/images/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/euskara/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/euskara/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/french/Makefile
-
-on debian
-
-config.status:771: creating data/themes/french/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/french/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/french/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/greek/Makefile
-
-on debian
-
-config.status:771: creating data/themes/greek/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/greek/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/greek/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/italian/Makefile
-
-on debian
-
-config.status:771: creating data/themes/italian/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/italian/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/italian/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/italian/images/Makefile
-
-on debian
-
-config.status:771: creating data/themes/italian/images/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/jamaican/Makefile
-
-on debian
-
-config.status:771: creating data/themes/jamaican/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/jamaican/images/Makefile
-
-on debian
-
-config.status:771: creating data/themes/jamaican/images/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/jamaican/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/jamaican/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/lithuanian/Makefile
-
-on debian
-
-config.status:771: creating data/themes/lithuanian/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/lithuanian/images/Makefile
-
-on debian
-
-config.status:771: creating data/themes/lithuanian/images/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/lithuanian/images/status/Makefile
-
-on debian
-
-config.status:771: creating data/themes/lithuanian/images/status/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/lithuanian/sounds/Makefile
-
-on debian
-
-config.status:771: creating data/themes/lithuanian/sounds/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/lithuanian/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/lithuanian/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/malayalam/Makefile
-
-on debian
-
-config.status:771: creating data/themes/malayalam/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/malayalam/images/Makefile
-
-on debian
-
-config.status:771: creating data/themes/malayalam/images/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/malayalam/images/keyboard/Makefile
-
-on debian
-
-config.status:771: creating data/themes/malayalam/images/keyboard/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/malayalam/images/status/Makefile
-
-on debian
-
-config.status:771: creating data/themes/malayalam/images/status/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/malayalam/scripts/Makefile
-
-on debian
-
-config.status:771: creating data/themes/malayalam/scripts/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/malayalam/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/malayalam/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/nepali/Makefile
-
-on debian
-
-config.status:771: creating data/themes/nepali/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/nepali/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/nepali/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/nederlands/Makefile
-
-on debian
-
-config.status:771: creating data/themes/nederlands/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/nederlands/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/nederlands/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/nynorsk/Makefile
-
-on debian
-
-config.status:771: creating data/themes/nynorsk/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/nynorsk/images/Makefile
-
-on debian
-
-config.status:771: creating data/themes/nynorsk/images/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/nynorsk/images/status/Makefile
-
-on debian
-
-config.status:771: creating data/themes/nynorsk/images/status/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/nynorsk/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/nynorsk/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/russian/Makefile
-
-on debian
-
-config.status:771: creating data/themes/russian/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/russian/images/Makefile
-
-on debian
-
-config.status:771: creating data/themes/russian/images/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/russian/images/status/Makefile
-
-on debian
-
-config.status:771: creating data/themes/russian/images/status/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/russian/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/russian/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/svenska/Makefile
-
-on debian
-
-config.status:771: creating data/themes/svenska/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/svenska/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/svenska/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/swahili/Makefile
-
-on debian
-
-config.status:771: creating data/themes/swahili/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/swahili/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/swahili/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/wolof/Makefile
-
-on debian
-
-config.status:771: creating data/themes/wolof/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/wolof/images/Makefile
-
-on debian
-
-config.status:771: creating data/themes/wolof/images/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/wolof/words/Makefile
-
-on debian
-
-config.status:771: creating data/themes/wolof/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/words/Makefile
-
-on debian
-
-config.status:771: creating data/words/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/fonts/Makefile
-
-on debian
-
-config.status:771: creating data/fonts/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status doc/Makefile
-
-on debian
-
-config.status:771: creating doc/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status doc/en/Makefile
-
-on debian
-
-config.status:771: creating doc/en/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status src/Makefile depfiles
-
-on debian
-
-config.status:771: creating src/Makefile
-config.status:1057: executing depfiles commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/brazilian-portuguese/Makefile
-
-on debian
-
-config.status:771: creating data/themes/brazilian-portuguese/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/catalan/Makefile
-
-on debian
-
-config.status:771: creating data/themes/catalan/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/catalan/Makefile
-
-on debian
-
-config.status:771: creating data/themes/catalan/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/dansk/Makefile
-
-on debian
-
-config.status:771: creating data/themes/dansk/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/deutsch/Makefile
-
-on debian
-
-config.status:771: creating data/themes/deutsch/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/espanol/Makefile
-
-on debian
-
-config.status:771: creating data/themes/espanol/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/euskara/Makefile
-
-on debian
-
-config.status:771: creating data/themes/euskara/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/french/Makefile
-
-on debian
-
-config.status:771: creating data/themes/french/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/italian/Makefile
-
-on debian
-
-config.status:771: creating data/themes/italian/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/jamaican/Makefile
-
-on debian
-
-config.status:771: creating data/themes/jamaican/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/lithuanian/Makefile
-
-on debian
-
-config.status:771: creating data/themes/lithuanian/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/nederlands/Makefile
-
-on debian
-
-config.status:771: creating data/themes/nederlands/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/nynorsk/Makefile
-
-on debian
-
-config.status:771: creating data/themes/nynorsk/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/svenska/Makefile
-
-on debian
-
-config.status:771: creating data/themes/svenska/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/swahili/Makefile
-
-on debian
-
-config.status:771: creating data/themes/swahili/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status data/themes/wolof/Makefile
-
-on debian
-
-config.status:771: creating data/themes/wolof/Makefile
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by Tux Typing config.status 1.5.16, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status po/Makefile.in po-directories
-
-on debian
-
-config.status:771: creating po/Makefile.in
-config.status:1057: executing po-directories commands

Modified: tuxtype/trunk/config.status
===================================================================
--- tuxtype/trunk/config.status	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/config.status	2008-08-19 19:40:41 UTC (rev 658)
@@ -341,7 +341,7 @@
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/usr/local/src/soc-mobin-up'
+ac_pwd='/root/tuxtype/trunk'
 srcdir='.'
 INSTALL='/usr/bin/install -c'
 MKDIR_P='/bin/mkdir -p'
@@ -622,7 +622,7 @@
 s, at ECHO_C@,|#_!!_#|,g
 s, at ECHO_N@,|#_!!_#|-n,g
 s, at ECHO_T@,|#_!!_#|,g
-s, at LIBS@,|#_!!_#|-L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer ,g
+s, at LIBS@,|#_!!_#|-L/usr/local/lib -Wl\,-rpath\,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer ,g
 s, at build_alias@,|#_!!_#|,g
 s, at host_alias@,|#_!!_#|,g
 s, at target_alias@,|#_!!_#|,g
@@ -645,19 +645,19 @@
 s, at CYGPATH_W@,|#_!!_#|echo,g
 s, at PACKAGE@,|#_!!_#|tuxtype,g
 s, at VERSION@,|#_!!_#|1.5.16,g
-s, at ACLOCAL@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run aclocal-1.10,g
-s, at AUTOCONF@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run autoconf,g
-s, at AUTOMAKE@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run automake-1.10,g
-s, at AUTOHEADER@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run autoheader,g
-s, at MAKEINFO@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run makeinfo,g
-s, at install_sh@,|#_!!_#|$(SHELL) /usr/local/src/soc-mobin-up/install-sh,g
+s, at ACLOCAL@,|#_!!_#|${SHELL} /root/tuxtype/trunk/missing --run aclocal-1.10,g
+s, at AUTOCONF@,|#_!!_#|${SHELL} /root/tuxtype/trunk/missing --run autoconf,g
+s, at AUTOMAKE@,|#_!!_#|${SHELL} /root/tuxtype/trunk/missing --run automake-1.10,g
+s, at AUTOHEADER@,|#_!!_#|${SHELL} /root/tuxtype/trunk/missing --run autoheader,g
+s, at MAKEINFO@,|#_!!_#|${SHELL} /root/tuxtype/trunk/missing --run makeinfo,g
+s, at install_sh@,|#_!!_#|$(SHELL) /root/tuxtype/trunk/install-sh,g
 s, at 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 AWK@,|#_!!_#|gawk,g
 s, at SET_MAKE@,|#_!!_#|,g
 s, at am__leading_dot@,|#_!!_#|.,g
-s, at AMTAR@,|#_!!_#|${SHELL} /usr/local/src/soc-mobin-up/missing --run tar,g
+s, at AMTAR@,|#_!!_#|${SHELL} /root/tuxtype/trunk/missing --run tar,g
 s, at am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g
 s, at am__untar@,|#_!!_#|${AMTAR} xf -,g
 s, at USE_NLS@,|#_!!_#|yes,g
@@ -669,7 +669,7 @@
 s, at XGETTEXT_015@,|#_!!_#|/usr/bin/xgettext,g
 s, at MSGMERGE@,|#_!!_#|/usr/bin/msgmerge,g
 s, at CC@,|#_!!_#|gcc,g
-s, at CFLAGS@,|#_!!_#|-g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT,g
+s, at CFLAGS@,|#_!!_#|-g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT,g
 s, at LDFLAGS@,|#_!!_#|,g
 s, at CPPFLAGS@,|#_!!_#| -DDATA_PREFIX=\\"$(prefix)\\",g
 s, at ac_ct_CC@,|#_!!_#|gcc,g
@@ -695,9 +695,9 @@
 s, at LTLIBINTL@,|#_!!_#|,g
 s, at POSUB@,|#_!!_#|po,g
 s, at LN_S@,|#_!!_#|ln -s,g
-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 SDL_CONFIG@,|#_!!_#|/usr/local/bin/sdl-config,g
+s, at SDL_CFLAGS@,|#_!!_#|-I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT,g
+s, at SDL_LIBS@,|#_!!_#|-L/usr/local/lib -Wl\,-rpath\,/usr/local/lib -lSDL -lpthread,g
 s, at BUILD_MINGW32_TRUE@,|#_!!_#|#,g
 s, at BUILD_MINGW32_FALSE@,|#_!!_#|,g
 s, at WINDRES@,|#_!!_#|,g

Modified: tuxtype/trunk/configure
===================================================================
--- tuxtype/trunk/configure	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/configure	2008-08-19 19:40:41 UTC (rev 658)
@@ -689,7 +689,6 @@
 am__tar
 am__untar
 USE_NLS
-GETTEXT_MACRO_VERSION
 MSGFMT
 GMSGFMT
 MSGFMT_015
@@ -697,7 +696,6 @@
 XGETTEXT
 XGETTEXT_015
 MSGMERGE
-XGETTEXT_EXTRA_OPTIONS
 CC
 CFLAGS
 LDFLAGS
@@ -2425,11 +2423,8 @@
 
 
 
-      GETTEXT_MACRO_VERSION=0.17
 
 
-
-
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
@@ -2703,9 +2698,6 @@
         test -n "$localedir" || localedir='${datadir}/locale'
 
 
-    test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-
-
   ac_config_commands="$ac_config_commands po-directories"
 
 
@@ -3947,14 +3939,12 @@
 { echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
 echo "${ECHO_T}$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
-  acl_libext="$acl_cv_libext"
-  acl_shlibext="$acl_cv_shlibext"
-  acl_libname_spec="$acl_cv_libname_spec"
-  acl_library_names_spec="$acl_cv_library_names_spec"
-  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  acl_hardcode_direct="$acl_cv_hardcode_direct"
-  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  libext="$acl_cv_libext"
+  shlibext="$acl_cv_shlibext"
+  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  hardcode_direct="$acl_cv_hardcode_direct"
+  hardcode_minus_L="$acl_cv_hardcode_minus_L"
     # Check whether --enable-rpath was given.
 if test "${enable_rpath+set}" = set; then
   enableval=$enable_rpath; :
@@ -3989,7 +3979,6 @@
 
 
 
-
     use_additional=yes
 
   acl_save_prefix="$prefix"
@@ -4034,7 +4023,6 @@
       LIBICONV=
   LTLIBICONV=
   INCICONV=
-  LIBICONV_PREFIX=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -4068,50 +4056,27 @@
           found_la=
           found_so=
           found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
           if test $use_additional = yes; then
-            dir="$additional_libdir"
-                                    if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
+              found_dir="$additional_libdir"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
               else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
+                found_so="$additional_libdir/lib$name.dll.a"
               fi
-            fi
-                        if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
               fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
               fi
             fi
           fi
@@ -4129,44 +4094,28 @@
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                                    if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
+                    found_dir="$dir"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
                     else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
+                      found_so="$dir/lib$name.dll.a"
                     fi
-                  fi
-                                    if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
+                    fi
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
                       found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
                     fi
                   fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
                   ;;
               esac
               if test "X$found_dir" != "X"; then
@@ -4190,10 +4139,10 @@
                 if test -z "$haveit"; then
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
-                                if test "$acl_hardcode_direct" = yes; then
+                                if test "$hardcode_direct" = yes; then
                                                       LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                 else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
                                                             LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                                                             haveit=
                     for x in $rpathdirs; do
@@ -4225,7 +4174,7 @@
                     if test -z "$haveit"; then
                       LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
                     fi
-                    if test "$acl_hardcode_minus_L" != no; then
+                    if test "$hardcode_minus_L" != no; then
                                                                                         LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                     else
                                                                                                                                                                                 LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
@@ -4244,7 +4193,6 @@
             case "$found_dir" in
               */$acl_libdirstem | */$acl_libdirstem/)
                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                LIBICONV_PREFIX="$basedir"
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -4395,21 +4343,21 @@
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
+    if test -n "$hardcode_libdir_separator"; then
                         alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
       done
             acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      eval flag=\"$hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
     else
             for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        eval flag=\"$hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
       done
@@ -4809,133 +4757,7 @@
 { echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-    { echo "$as_me:$LINENO: checking for working iconv" >&5
-echo $ECHO_N "checking for working iconv... $ECHO_C" >&6; }
-if test "${am_cv_func_iconv_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
 
-            am_save_LIBS="$LIBS"
-      if test $am_cv_lib_iconv = yes; then
-        LIBS="$LIBS $LIBICONV"
-      fi
-      if test "$cross_compiling" = yes; then
-  case "$host_os" in
-           aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-           *)            am_cv_func_iconv_works="guessing yes" ;;
-         esac
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <iconv.h>
-#include <string.h>
-int main ()
-{
-  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
-     returns.  */
-  {
-    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
-    if (cd_utf8_to_88591 != (iconv_t)(-1))
-      {
-        static const char input[] = "\342\202\254"; /* EURO SIGN */
-        char buf[10];
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_utf8_to_88591,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          return 1;
-      }
-  }
-#if 0 /* This bug could be worked around by the caller.  */
-  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
-        char buf[50];
-        const char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_88591_to_utf8,
-                            (char **) &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if ((int)res > 0)
-          return 1;
-      }
-  }
-#endif
-  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-     provided.  */
-  if (/* Try standardized names.  */
-      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
-      /* Try IRIX, OSF/1 names.  */
-      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
-      /* Try AIX names.  */
-      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
-      /* Try HP-UX names.  */
-      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  am_cv_func_iconv_works=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-am_cv_func_iconv_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-      LIBS="$am_save_LIBS"
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_func_iconv_works" >&5
-echo "${ECHO_T}$am_cv_func_iconv_works" >&6; }
-    case "$am_cv_func_iconv_works" in
-      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
-      *)   am_func_iconv=yes ;;
-    esac
-  else
-    am_func_iconv=no am_cv_lib_iconv=no
-  fi
-  if test "$am_func_iconv" = yes; then
-
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ICONV 1
 _ACEOF
@@ -4958,7 +4780,6 @@
 
 
 
-
     use_additional=yes
 
   acl_save_prefix="$prefix"
@@ -5003,7 +4824,6 @@
       LIBINTL=
   LTLIBINTL=
   INCINTL=
-  LIBINTL_PREFIX=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -5037,50 +4857,27 @@
           found_la=
           found_so=
           found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
           if test $use_additional = yes; then
-            dir="$additional_libdir"
-                                    if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
+              found_dir="$additional_libdir"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
               else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
+                found_so="$additional_libdir/lib$name.dll.a"
               fi
-            fi
-                        if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
               fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
               fi
             fi
           fi
@@ -5098,44 +4895,28 @@
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                                    if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
+                    found_dir="$dir"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
                     else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
+                      found_so="$dir/lib$name.dll.a"
                     fi
-                  fi
-                                    if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
+                    fi
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
                       found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
                     fi
                   fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
                   ;;
               esac
               if test "X$found_dir" != "X"; then
@@ -5159,10 +4940,10 @@
                 if test -z "$haveit"; then
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
-                                if test "$acl_hardcode_direct" = yes; then
+                                if test "$hardcode_direct" = yes; then
                                                       LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                 else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
                                                             LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                                                             haveit=
                     for x in $rpathdirs; do
@@ -5194,7 +4975,7 @@
                     if test -z "$haveit"; then
                       LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
                     fi
-                    if test "$acl_hardcode_minus_L" != no; then
+                    if test "$hardcode_minus_L" != no; then
                                                                                         LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                     else
                                                                                                                                                                                 LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
@@ -5213,7 +4994,6 @@
             case "$found_dir" in
               */$acl_libdirstem | */$acl_libdirstem/)
                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                LIBINTL_PREFIX="$basedir"
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -5364,21 +5144,21 @@
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
+    if test -n "$hardcode_libdir_separator"; then
                         alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
       done
             acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      eval flag=\"$hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
     else
             for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        eval flag=\"$hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
       done
@@ -9217,7 +8997,6 @@
 am__tar!$am__tar$ac_delim
 am__untar!$am__untar$ac_delim
 USE_NLS!$USE_NLS$ac_delim
-GETTEXT_MACRO_VERSION!$GETTEXT_MACRO_VERSION$ac_delim
 MSGFMT!$MSGFMT$ac_delim
 GMSGFMT!$GMSGFMT$ac_delim
 MSGFMT_015!$MSGFMT_015$ac_delim
@@ -9225,7 +9004,6 @@
 XGETTEXT!$XGETTEXT$ac_delim
 XGETTEXT_015!$XGETTEXT_015$ac_delim
 MSGMERGE!$MSGMERGE$ac_delim
-XGETTEXT_EXTRA_OPTIONS!$XGETTEXT_EXTRA_OPTIONS$ac_delim
 CC!$CC$ac_delim
 CFLAGS!$CFLAGS$ac_delim
 LDFLAGS!$LDFLAGS$ac_delim
@@ -9242,6 +9020,8 @@
 CCDEPMODE!$CCDEPMODE$ac_delim
 am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
 am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
+LIBICONV!$LIBICONV$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -9283,8 +9063,6 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
-LIBICONV!$LIBICONV$ac_delim
 LTLIBICONV!$LTLIBICONV$ac_delim
 INTLLIBS!$INTLLIBS$ac_delim
 LIBINTL!$LIBINTL$ac_delim
@@ -9309,7 +9087,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 22; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -9710,22 +9488,21 @@
   fi
   rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
-_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $_am_arg | $_am_arg:* )
+    $ac_file | $ac_file:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$_am_arg" |
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X$ac_file : 'X\(//\)[^/]' \| \
+	 X$ac_file : 'X\(//\)$' \| \
+	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+echo X$ac_file |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -9875,7 +9652,7 @@
   # each Makefile.in and add a new line on top of each file to say so.
   # 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 -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+  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\(//\)[^/]' \| \

Modified: tuxtype/trunk/data/Makefile.in
===================================================================
--- tuxtype/trunk/data/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -319,8 +317,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -345,8 +343,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -356,12 +354,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/fonts/Makefile.in
===================================================================
--- tuxtype/trunk/data/fonts/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/fonts/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -64,7 +64,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -112,7 +111,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/images/Makefile
===================================================================
--- tuxtype/trunk/data/images/Makefile	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/images/Makefile	2008-08-19 19:40:41 UTC (rev 658)
@@ -68,15 +68,15 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/local/src/soc-mobin-up/missing --run aclocal-1.10
-AMTAR = ${SHELL} /usr/local/src/soc-mobin-up/missing --run tar
-AUTOCONF = ${SHELL} /usr/local/src/soc-mobin-up/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/local/src/soc-mobin-up/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/local/src/soc-mobin-up/missing --run automake-1.10
-AWK = mawk
+ACLOCAL = ${SHELL} /root/tuxtype/trunk/missing --run aclocal-1.10
+AMTAR = ${SHELL} /root/tuxtype/trunk/missing --run tar
+AUTOCONF = ${SHELL} /root/tuxtype/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /root/tuxtype/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /root/tuxtype/trunk/missing --run automake-1.10
+AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CFLAGS = -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 CPP = gcc -E
 CPPFLAGS =  -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
@@ -101,12 +101,12 @@
 LIBICONV = -liconv
 LIBINTL = 
 LIBOBJS = 
-LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
+LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
 LN_S = ln -s
 LTLIBICONV = -liconv
 LTLIBINTL = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/local/src/soc-mobin-up/missing --run makeinfo
+MAKEINFO = ${SHELL} /root/tuxtype/trunk/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 MSGFMT = /usr/bin/msgfmt
 MSGFMT_015 = /usr/bin/msgfmt
@@ -123,9 +123,9 @@
 PACKAGE_VERSION = 1.5.16
 PATH_SEPARATOR = :
 POSUB = po
-SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-SDL_CONFIG = /usr/bin/sdl-config
-SDL_LIBS = -L/usr/lib -lSDL
+SDL_CFLAGS = -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+SDL_CONFIG = /usr/local/bin/sdl-config
+SDL_LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = 
@@ -134,10 +134,10 @@
 WINDRES = 
 XGETTEXT = /usr/bin/xgettext
 XGETTEXT_015 = /usr/bin/xgettext
-abs_builddir = /usr/local/src/soc-mobin-up/data/images
-abs_srcdir = /usr/local/src/soc-mobin-up/data/images
-abs_top_builddir = /usr/local/src/soc-mobin-up
-abs_top_srcdir = /usr/local/src/soc-mobin-up
+abs_builddir = /root/tuxtype/trunk/data/images
+abs_srcdir = /root/tuxtype/trunk/data/images
+abs_top_builddir = /root/tuxtype/trunk
+abs_top_srcdir = /root/tuxtype/trunk
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -164,7 +164,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /usr/local/src/soc-mobin-up/install-sh
+install_sh = $(SHELL) /root/tuxtype/trunk/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale

Modified: tuxtype/trunk/data/images/Makefile.in
===================================================================
--- tuxtype/trunk/data/images/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/images/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -378,8 +376,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -404,8 +402,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -415,12 +413,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/images/backgrounds/Makefile.in
===================================================================
--- tuxtype/trunk/data/images/backgrounds/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/images/backgrounds/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/images/cities/Makefile.in
===================================================================
--- tuxtype/trunk/data/images/cities/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/images/cities/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/images/comets/Makefile.in
===================================================================
--- tuxtype/trunk/data/images/comets/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/images/comets/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/images/icons/Makefile.in
===================================================================
--- tuxtype/trunk/data/images/icons/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/images/icons/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/images/keyboard/Makefile.am
===================================================================
--- tuxtype/trunk/data/images/keyboard/Makefile.am	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/images/keyboard/Makefile.am	2008-08-19 19:40:41 UTC (rev 658)
@@ -135,7 +135,6 @@
   keyboard-us.eps \
   keyboard-us.png \
   larrow.png \
-<<<<<<< .mine
   space.png \
   rarrow.png\
 	keyboard_B05.png \
@@ -263,8 +262,6 @@
 	keyboardN_E02.png \
 	keyboardN_B04.png \
 	keyboardN_C10.png \
-	keyboardN_E03.png
-=======
+	keyboardN_E03.png \
   rarrow.png \
-  space.png
->>>>>>> .r654
+  space.png 

Modified: tuxtype/trunk/data/images/keyboard/Makefile.am~
===================================================================
--- tuxtype/trunk/data/images/keyboard/Makefile.am~	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/images/keyboard/Makefile.am~	2008-08-19 19:40:41 UTC (rev 658)
@@ -3,11 +3,137 @@
 
 images_keyboarddir = $(pkgdatadir)/data/images/keyboard
 
-dist_images_keyboard_DATA = keyboard.png \
-  keyboard-us.png \
+dist_images_keyboard_DATA = esc.png \
+  keyboard_A00.png \
+  keyboard_A01.png \
+  keyboard_A02.png \
+  keyboard_A03.png \
+  keyboard_A04.png \
+  keyboard_A05.png \
+  keyboard_A06.png \
+  keyboard_A07.png \
+  keyboard_A08.png \
+  keyboard_A09.png \
+  keyboard_A10.png \
+  keyboard_A11.png \
+  keyboard_A12.png \
+  keyboard_A13.png \
+  keyboard_B00.png \
+  keyboard_B01.png \
+  keyboard_B02.png \
+  keyboard_B03.png \
+  keyboard_B04.png \
+  keyboard_B05.png \
+  keyboard_B06.png \
+  keyboard_B07.png \
+  keyboard_B08.png \
+  keyboard_B09.png \
+  keyboard_B10.png \
+  keyboard_B11.png \
+  keyboard_B12.png \
+  keyboard_B13.png \
+  keyboard_C00.png \
+  keyboard_C01.png \
+  keyboard_C02.png \
+  keyboard_C03.png \
+  keyboard_C04.png \
+  keyboard_C05.png \
+  keyboard_C06.png \
+  keyboard_C07.png \
+  keyboard_C08.png \
+  keyboard_C09.png \
+  keyboard_C10.png \
+  keyboard_C11.png \
+  keyboard_C12.png \
+  keyboard_D00.png \
+  keyboard_D01.png \
+  keyboard_D02.png \
+  keyboard_D03.png \
+  keyboard_D04.png \
+  keyboard_D05.png \
+  keyboard_D06.png \
+  keyboard_D07.png \
+  keyboard_D08.png \
+  keyboard_D09.png \
+  keyboard_D10.png \
+  keyboard_D11.png \
+  keyboard_D12.png \
+  keyboard_E00.png \
+  keyboard_E01.png \
+  keyboard_E02.png \
+  keyboard_E03.png \
+  keyboard_E04.png \
+  keyboard_E05.png \
+  keyboard_E06.png \
+  keyboard_E07.png \
   keyboard.eps \
+  keyboardN_A00.png \
+  keyboardN_A01.png \
+  keyboardN_A02.png \
+  keyboardN_A03.png \
+  keyboardN_A04.png \
+  keyboardN_A05.png \
+  keyboardN_A06.png \
+  keyboardN_A07.png \
+  keyboardN_A08.png \
+  keyboardN_A09.png \
+  keyboardN_A10.png \
+  keyboardN_A11.png \
+  keyboardN_A12.png \
+  keyboardN_A13.png \
+  keyboardN_B00.png \
+  keyboardN_B01.png \
+  keyboardN_B02.png \
+  keyboardN_B03.png \
+  keyboardN_B04.png \
+  keyboardN_B05.png \
+  keyboardN_B06.png \
+  keyboardN_B07.png \
+  keyboardN_B08.png \
+  keyboardN_B09.png \
+  keyboardN_B10.png \
+  keyboardN_B11.png \
+  keyboardN_B12.png \
+  keyboardN_B13.png \
+  keyboardN_C00.png \
+  keyboardN_C01.png \
+  keyboardN_C02.png \
+  keyboardN_C03.png \
+  keyboardN_C04.png \
+  keyboardN_C05.png \
+  keyboardN_C06.png \
+  keyboardN_C07.png \
+  keyboardN_C08.png \
+  keyboardN_C09.png \
+  keyboardN_C10.png \
+  keyboardN_C11.png \
+  keyboardN_C12.png \
+  keyboardN_D00.png \
+  keyboardN_D01.png \
+  keyboardN_D02.png \
+  keyboardN_D03.png \
+  keyboardN_D04.png \
+  keyboardN_D05.png \
+  keyboardN_D06.png \
+  keyboardN_D07.png \
+  keyboardN_D08.png \
+  keyboardN_D09.png \
+  keyboardN_D10.png \
+  keyboardN_D11.png \
+  keyboardN_D12.png \
+  keyboardN_E00.png \
+  keyboardN_E01.png \
+  keyboardN_E02.png \
+  keyboardN_E03.png \
+  keyboardN_E04.png \
+  keyboardN_E05.png \
+  keyboardN_E06.png \
+  keyboardN_E07.png \
+  keyboardN_None.png \
+  keyboard_None.png \
+  keyboard.png \
   keyboard-us.eps \
-  esc.png \
+  keyboard-us.png \
   larrow.png \
   space.png \
   rarrow.png\
@@ -73,4 +199,69 @@
 	keyboard_E02.png \
 	keyboard_B04.png \
 	keyboard_C10.png \
-	keyboard_E03.png
+	keyboard_E03.png \
+	keyboardN_B05.png \
+	keyboardN_C11.png \
+	keyboardN_E04.png \
+	keyboardN_A00.png \
+	keyboardN_B06.png \
+	keyboardN_C12.png \
+	keyboardN_E05.png \
+	keyboardN_A01.png \
+	keyboardN_B07.png \
+	keyboardN_E06.png \
+	keyboardN_A02.png \
+	keyboardN_B08.png \
+	keyboardN_D00.png \
+	keyboardN_E07.png \
+	keyboardN_A03.png \
+	keyboardN_B09.png \
+	keyboardN_D01.png \
+	keyboardN_A04.png \
+	keyboardN_B10.png \
+	keyboardN_D02.png \
+	keyboardN_None.png \
+	keyboardN_A05.png \
+	keyboardN_B11.png \
+	keyboardN_D03.png \
+	keyboardN_A06.png \
+	keyboardN_B12.png \
+	keyboardN_D04.png \
+	keyboardN_A07.png \
+	keyboardN_B13.png \
+	keyboardN_D05.png \
+	keyboardN_A08.png \
+	keyboardN_C00.png \
+	keyboardN_D06.png \
+	keyboardN_A09.png \
+	keyboardN_C01.png \
+	keyboardN_D07.png \
+	keyboardN_A10.png \
+	keyboardN_C02.png \
+	keyboardN_D08.png \
+	keyboardN_A11.png \
+	keyboardN_C03.png \
+	keyboardN_D09.png \
+	keyboardN_A12.png \
+	keyboardN_C04.png \
+	keyboardN_D10.png \
+	keyboardN_A13.png \
+	keyboardN_C05.png \
+	keyboardN_D11.png \
+	keyboardN_B00.png \
+	keyboardN_C06.png \
+	keyboardN_D12.png \
+	keyboardN_B01.png \
+	keyboardN_C07.png \
+	keyboardN_E00.png \
+	keyboardN_B02.png \
+	keyboardN_C08.png \
+	keyboardN_E01.png \
+	keyboardN_B03.png \
+	keyboardN_C09.png \
+	keyboardN_E02.png \
+	keyboardN_B04.png \
+	keyboardN_C10.png \
+	keyboardN_E03.png \
+  rarrow.png \
+  space.png \

Modified: tuxtype/trunk/data/images/menu/Makefile.in
===================================================================
--- tuxtype/trunk/data/images/menu/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/images/menu/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/data/images/status/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/images/status/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/images/tux/Makefile.in
===================================================================
--- tuxtype/trunk/data/images/tux/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/images/tux/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/scripts/Makefile.in
===================================================================
--- tuxtype/trunk/data/scripts/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/scripts/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/sounds/Makefile.in
===================================================================
--- tuxtype/trunk/data/sounds/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/sounds/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -339,8 +337,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -365,8 +363,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -376,12 +374,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/armenian/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/armenian/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/armenian/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -319,8 +317,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -345,8 +343,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -356,12 +354,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/armenian/images/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/armenian/images/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/armenian/images/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/bokmal/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/bokmal/images/status/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/bokmal/images/status/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/brazilian-portuguese/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/brazilian-portuguese/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/brazilian-portuguese/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -317,8 +315,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -343,8 +341,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -354,12 +352,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/brazilian-portuguese/images/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/brazilian-portuguese/images/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/brazilian-portuguese/images/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/brazilian-portuguese/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/brazilian-portuguese/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/brazilian-portuguese/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/catalan/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/catalan/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/catalan/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -317,8 +315,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -343,8 +341,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -354,12 +352,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/catalan/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/catalan/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/catalan/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/czech/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/czech/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/czech/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -319,8 +317,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -345,8 +343,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -356,12 +354,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/czech/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/czech/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/czech/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/dansk/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/dansk/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/dansk/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -319,8 +317,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -345,8 +343,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -356,12 +354,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/dansk/sounds/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/dansk/sounds/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/dansk/sounds/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/dansk/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/dansk/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/dansk/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/deutsch/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/deutsch/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/deutsch/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -319,8 +317,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -345,8 +343,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -356,12 +354,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/deutsch/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/deutsch/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/deutsch/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/espanol/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/espanol/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/espanol/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -319,8 +317,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -345,8 +343,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -356,12 +354,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/espanol/images/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/espanol/images/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/espanol/images/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/espanol/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/espanol/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/espanol/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/euskara/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/euskara/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/euskara/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -320,8 +318,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -346,8 +344,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -357,12 +355,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/euskara/images/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/euskara/images/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/euskara/images/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/euskara/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/euskara/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/euskara/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/french/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/french/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/french/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -319,8 +317,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -345,8 +343,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -356,12 +354,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/french/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/french/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/french/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/greek/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/greek/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/greek/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -319,8 +317,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -345,8 +343,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -356,12 +354,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/greek/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/greek/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/greek/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/italian/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/italian/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/italian/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -319,8 +317,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -345,8 +343,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -356,12 +354,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/italian/images/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/italian/images/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/italian/images/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/italian/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/italian/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/italian/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/jamaican/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/jamaican/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/jamaican/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -317,8 +315,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -343,8 +341,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -354,12 +352,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/jamaican/images/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/jamaican/images/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/jamaican/images/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/jamaican/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/jamaican/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/jamaican/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/lithuanian/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/lithuanian/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/lithuanian/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -319,8 +317,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -345,8 +343,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -356,12 +354,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/lithuanian/images/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/lithuanian/images/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/lithuanian/images/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -76,7 +76,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -124,7 +123,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -287,8 +285,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -313,8 +311,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -324,12 +322,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/lithuanian/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/lithuanian/images/status/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/lithuanian/images/status/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/lithuanian/sounds/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/lithuanian/sounds/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/lithuanian/sounds/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/lithuanian/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/lithuanian/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/lithuanian/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/malayalam/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/malayalam/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/malayalam/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -320,8 +318,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -346,8 +344,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -357,12 +355,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/malayalam/images/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/malayalam/images/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/malayalam/images/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -317,8 +315,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -343,8 +341,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -354,12 +352,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/malayalam/images/keyboard/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/malayalam/images/keyboard/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/malayalam/images/keyboard/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/malayalam/images/status/Makefile
===================================================================
--- tuxtype/trunk/data/themes/malayalam/images/status/Makefile	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/malayalam/images/status/Makefile	2008-08-19 19:40:41 UTC (rev 658)
@@ -56,15 +56,15 @@
 dist_themes_malayalam_images_statusDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_themes_malayalam_images_status_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/local/src/soc-mobin-up/missing --run aclocal-1.10
-AMTAR = ${SHELL} /usr/local/src/soc-mobin-up/missing --run tar
-AUTOCONF = ${SHELL} /usr/local/src/soc-mobin-up/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/local/src/soc-mobin-up/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/local/src/soc-mobin-up/missing --run automake-1.10
-AWK = mawk
+ACLOCAL = ${SHELL} /root/tuxtype/trunk/missing --run aclocal-1.10
+AMTAR = ${SHELL} /root/tuxtype/trunk/missing --run tar
+AUTOCONF = ${SHELL} /root/tuxtype/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /root/tuxtype/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /root/tuxtype/trunk/missing --run automake-1.10
+AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CFLAGS = -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 CPP = gcc -E
 CPPFLAGS =  -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
@@ -89,12 +89,12 @@
 LIBICONV = -liconv
 LIBINTL = 
 LIBOBJS = 
-LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
+LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
 LN_S = ln -s
 LTLIBICONV = -liconv
 LTLIBINTL = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/local/src/soc-mobin-up/missing --run makeinfo
+MAKEINFO = ${SHELL} /root/tuxtype/trunk/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 MSGFMT = /usr/bin/msgfmt
 MSGFMT_015 = /usr/bin/msgfmt
@@ -111,9 +111,9 @@
 PACKAGE_VERSION = 1.5.16
 PATH_SEPARATOR = :
 POSUB = po
-SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-SDL_CONFIG = /usr/bin/sdl-config
-SDL_LIBS = -L/usr/lib -lSDL
+SDL_CFLAGS = -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+SDL_CONFIG = /usr/local/bin/sdl-config
+SDL_LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = 
@@ -122,10 +122,10 @@
 WINDRES = 
 XGETTEXT = /usr/bin/xgettext
 XGETTEXT_015 = /usr/bin/xgettext
-abs_builddir = /usr/local/src/soc-mobin-up/data/themes/malayalam/images/status
-abs_srcdir = /usr/local/src/soc-mobin-up/data/themes/malayalam/images/status
-abs_top_builddir = /usr/local/src/soc-mobin-up
-abs_top_srcdir = /usr/local/src/soc-mobin-up
+abs_builddir = /root/tuxtype/trunk/data/themes/malayalam/images/status
+abs_srcdir = /root/tuxtype/trunk/data/themes/malayalam/images/status
+abs_top_builddir = /root/tuxtype/trunk
+abs_top_srcdir = /root/tuxtype/trunk
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -152,7 +152,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /usr/local/src/soc-mobin-up/install-sh
+install_sh = $(SHELL) /root/tuxtype/trunk/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale

Modified: tuxtype/trunk/data/themes/malayalam/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/malayalam/images/status/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/malayalam/images/status/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/nederlands/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/nederlands/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/nederlands/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -320,8 +318,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -346,8 +344,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -357,12 +355,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/nederlands/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/nederlands/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/nederlands/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/nynorsk/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/nynorsk/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/nynorsk/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -319,8 +317,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -345,8 +343,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -356,12 +354,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/nynorsk/images/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/nynorsk/images/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/nynorsk/images/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -319,8 +317,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -345,8 +343,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -356,12 +354,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/nynorsk/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/nynorsk/images/status/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/nynorsk/images/status/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/nynorsk/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/nynorsk/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/nynorsk/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/russian/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/russian/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/russian/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -319,8 +317,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -345,8 +343,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -356,12 +354,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/russian/images/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/russian/images/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/russian/images/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -317,8 +315,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -343,8 +341,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -354,12 +352,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/russian/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/russian/images/status/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/russian/images/status/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/russian/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/russian/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/russian/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/svenska/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/svenska/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/svenska/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -319,8 +317,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -345,8 +343,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -356,12 +354,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/svenska/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/svenska/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/svenska/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/swahili/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/swahili/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/swahili/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -320,8 +318,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -346,8 +344,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -357,12 +355,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/swahili/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/swahili/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/swahili/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/wolof/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/wolof/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/wolof/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -319,8 +317,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -345,8 +343,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -356,12 +354,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/data/themes/wolof/images/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/wolof/images/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/wolof/images/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/themes/wolof/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/themes/wolof/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/themes/wolof/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/data/words/Makefile.in
===================================================================
--- tuxtype/trunk/data/words/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/data/words/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/doc/Makefile.in
===================================================================
--- tuxtype/trunk/doc/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/doc/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -87,7 +87,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -135,7 +134,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -323,8 +321,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -349,8 +347,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -360,12 +358,13 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: tuxtype/trunk/doc/en/Makefile
===================================================================
--- tuxtype/trunk/doc/en/Makefile	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/doc/en/Makefile	2008-08-19 19:40:41 UTC (rev 658)
@@ -56,15 +56,15 @@
 dist_docDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_doc_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/local/src/soc-mobin-up/missing --run aclocal-1.10
-AMTAR = ${SHELL} /usr/local/src/soc-mobin-up/missing --run tar
-AUTOCONF = ${SHELL} /usr/local/src/soc-mobin-up/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/local/src/soc-mobin-up/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/local/src/soc-mobin-up/missing --run automake-1.10
-AWK = mawk
+ACLOCAL = ${SHELL} /root/tuxtype/trunk/missing --run aclocal-1.10
+AMTAR = ${SHELL} /root/tuxtype/trunk/missing --run tar
+AUTOCONF = ${SHELL} /root/tuxtype/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /root/tuxtype/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /root/tuxtype/trunk/missing --run automake-1.10
+AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CFLAGS = -g -O2 -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 CPP = gcc -E
 CPPFLAGS =  -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
@@ -89,12 +89,12 @@
 LIBICONV = -liconv
 LIBINTL = 
 LIBOBJS = 
-LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
+LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
 LN_S = ln -s
 LTLIBICONV = -liconv
 LTLIBINTL = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/local/src/soc-mobin-up/missing --run makeinfo
+MAKEINFO = ${SHELL} /root/tuxtype/trunk/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 MSGFMT = /usr/bin/msgfmt
 MSGFMT_015 = /usr/bin/msgfmt
@@ -111,9 +111,9 @@
 PACKAGE_VERSION = 1.5.16
 PATH_SEPARATOR = :
 POSUB = po
-SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
-SDL_CONFIG = /usr/bin/sdl-config
-SDL_LIBS = -L/usr/lib -lSDL
+SDL_CFLAGS = -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+SDL_CONFIG = /usr/local/bin/sdl-config
+SDL_LIBS = -L/usr/local/lib -Wl,-rpath,/usr/local/lib -lSDL -lpthread
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = 
@@ -122,10 +122,10 @@
 WINDRES = 
 XGETTEXT = /usr/bin/xgettext
 XGETTEXT_015 = /usr/bin/xgettext
-abs_builddir = /usr/local/src/soc-mobin-up/doc/en
-abs_srcdir = /usr/local/src/soc-mobin-up/doc/en
-abs_top_builddir = /usr/local/src/soc-mobin-up
-abs_top_srcdir = /usr/local/src/soc-mobin-up
+abs_builddir = /root/tuxtype/trunk/doc/en
+abs_srcdir = /root/tuxtype/trunk/doc/en
+abs_top_builddir = /root/tuxtype/trunk
+abs_top_srcdir = /root/tuxtype/trunk
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -152,7 +152,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /usr/local/src/soc-mobin-up/install-sh
+install_sh = $(SHELL) /root/tuxtype/trunk/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale

Modified: tuxtype/trunk/doc/en/Makefile.in
===================================================================
--- tuxtype/trunk/doc/en/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/doc/en/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -75,7 +75,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@

Modified: tuxtype/trunk/po/Makefile
===================================================================
--- tuxtype/trunk/po/Makefile	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/Makefile	2008-08-19 19:40:41 UTC (rev 658)
@@ -34,12 +34,12 @@
 # We use $(mkdir_p).
 # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
 # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# $(SHELL) /usr/local/src/soc-mobin-up/install-sh does not start with $(SHELL), so we add it.
+# $(SHELL) /root/tuxtype/trunk/install-sh does not start with $(SHELL), so we add it.
 # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
 # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
 # versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) $(SHELL) /usr/local/src/soc-mobin-up/install-sh -d
-install_sh = $(SHELL) $(SHELL) /usr/local/src/soc-mobin-up/install-sh
+mkinstalldirs = $(SHELL) $(SHELL) /root/tuxtype/trunk/install-sh -d
+install_sh = $(SHELL) $(SHELL) /root/tuxtype/trunk/install-sh
 MKDIR_P = /bin/mkdir -p
 mkdir_p = /bin/mkdir -p
 
@@ -61,17 +61,10 @@
 MSGCONV = msgconv
 MSGFILTER = msgfilter
 
-<<<<<<< .mine
 POFILES =  en at quot.po en at boldquot.po en_GB.po ml.po ru.po ar.po ne.po nb.po pt.po ca.po cs.po da.po de.po es.po eu.po fr.po el.po it.po ja.po lt.po nl.po nn.po sv.po sw.po wo.po
 GMOFILES =  en at quot.gmo en at boldquot.gmo en_GB.gmo ml.gmo ru.gmo ar.gmo ne.gmo nb.gmo pt.gmo ca.gmo cs.gmo da.gmo de.gmo es.gmo eu.gmo fr.gmo el.gmo it.gmo ja.gmo lt.gmo nl.gmo nn.gmo sv.gmo sw.gmo wo.gmo
 UPDATEPOFILES =  en at quot.po-update en at boldquot.po-update en_GB.po-update ml.po-update ru.po-update ar.po-update ne.po-update nb.po-update pt.po-update ca.po-update cs.po-update da.po-update de.po-update es.po-update eu.po-update fr.po-update el.po-update it.po-update ja.po-update lt.po-update nl.po-update nn.po-update sv.po-update sw.po-update wo.po-update
 DUMMYPOFILES =  en at quot.nop en at boldquot.nop en_GB.nop ml.nop ru.nop ar.nop ne.nop nb.nop pt.nop ca.nop cs.nop da.nop de.nop es.nop eu.nop fr.nop el.nop it.nop ja.nop lt.nop nl.nop nn.nop sv.nop sw.nop wo.nop
-=======
-POFILES =  en_US.po ml_IN.po
-GMOFILES =  en_US.gmo ml_IN.gmo
-UPDATEPOFILES =  en_US.po-update ml_IN.po-update
-DUMMYPOFILES =  en_US.nop ml_IN.nop
->>>>>>> .r616
 DISTFILES.common = Makefile.in.in remove-potcdate.sin \
 $(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
 DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
@@ -96,7 +89,6 @@
      .././src/theme.c \
      .././src/titlescreen.c
 
-
 CATALOGS =  en at quot.gmo en at boldquot.gmo en_GB.gmo ml.gmo ru.gmo ar.gmo ne.gmo nb.gmo pt.gmo ca.gmo cs.gmo da.gmo de.gmo es.gmo eu.gmo fr.gmo el.gmo it.gmo ja.gmo lt.gmo nl.gmo nn.gmo sv.gmo sw.gmo wo.gmo
 
 # Makevars gets inserted here. (Don't remove this line!)
@@ -239,7 +231,7 @@
 	fi
 
 
-install: install-exec install-data
+install: update-po install-exec install-data
 install-exec:
 install-data: install-data-yes
 	if test "$(PACKAGE)" = "gettext-tools"; then \

Modified: tuxtype/trunk/po/Makefile.in
===================================================================
--- tuxtype/trunk/po/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -34,12 +34,12 @@
 # We use $(mkdir_p).
 # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
 # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# $(SHELL) /usr/local/src/soc-mobin-up/install-sh does not start with $(SHELL), so we add it.
+# $(SHELL) /root/tuxtype/trunk/install-sh does not start with $(SHELL), so we add it.
 # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
 # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
 # versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) $(SHELL) /usr/local/src/soc-mobin-up/install-sh -d
-install_sh = $(SHELL) $(SHELL) /usr/local/src/soc-mobin-up/install-sh
+mkinstalldirs = $(SHELL) $(SHELL) /root/tuxtype/trunk/install-sh -d
+install_sh = $(SHELL) $(SHELL) /root/tuxtype/trunk/install-sh
 MKDIR_P = /bin/mkdir -p
 mkdir_p = /bin/mkdir -p
 
@@ -174,7 +174,7 @@
 	fi
 
 
-install: install-exec install-data
+install: update-po install-exec install-data
 install-exec:
 install-data: install-data-yes
 	if test "$(PACKAGE)" = "gettext-tools"; then \

Modified: tuxtype/trunk/po/ar.po
===================================================================
--- tuxtype/trunk/po/ar.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/ar.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,41 +40,41 @@
 msgid "Press space bar to return to game"
 msgstr "Press space bar to return to game"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "A[qarh"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "G3ank"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "@ovg"
 
 # levels for Cascade game:
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Tanta."
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Medium"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Hard"
 
 # general stuff
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Practice"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Congratulations"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Oh No!"
 
@@ -82,7 +82,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/ca.po
===================================================================
--- tuxtype/trunk/po/ca.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/ca.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,41 +42,41 @@
 msgid "Press space bar to return to game"
 msgstr "Premeu 'espai' per tornar al joc"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Nivell"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Vides"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Peix"
 
 # levels for Cascade game:
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Fàcil"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Mitg"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Difícil"
 
 # general stuff
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Practicar"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "L'enhorabona!"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Oh No!"
 
@@ -84,7 +84,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/cs.po
===================================================================
--- tuxtype/trunk/po/cs.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/cs.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: 2007-11-10 16:36+0100\n"
 "Last-Translator: JardaK <krejci at zstenis.com>\n"
 "Language-Team: czech <cs at li.org>\n"
@@ -49,47 +49,47 @@
 msgstr "Stiskni mezerník pro návrat do hry"
 
 #
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Úroveň"
 
 #
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Životy"
 
 #
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Ryba"
 
 #
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Snadná"
 
 #
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Střední"
 
 #
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Těžká"
 
 #
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Procvičování"
 
 #
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Gratuluji"
 
 #
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Ach jo!"
 
@@ -98,7 +98,7 @@
 msgid "Great!"
 msgstr "Skvělé!"
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/da.po
===================================================================
--- tuxtype/trunk/po/da.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/da.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: 2003-05-08 17:58+0200\n"
 "Last-Translator: Nikolai Beier <beier at ofir.dk>\n"
 "Language-Team: Danish\n"
@@ -40,41 +40,41 @@
 msgid "Press space bar to return to game"
 msgstr "Tryk på mellemrumstasten for at spille videre"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Niveau"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Liv"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Fisk"
 
 # levels for Cascade game:
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Let"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Mellem"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Hård"
 
 # general stuff
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Øv dig!"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Tillykke!"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Åh nej!"
 
@@ -82,7 +82,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/de.po
===================================================================
--- tuxtype/trunk/po/de.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/de.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: 2003-06-14 19:00+0000\n"
 "Last-Translator: Andreas Ramm <ace1 at gmx.net>\n"
 "Language-Team: German\n"
@@ -40,41 +40,41 @@
 msgid "Press space bar to return to game"
 msgstr "Drücke die Leertaste um weiterzuspielen"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Runde"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Leben"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Fisch"
 
 # levels for Cascade game:
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Einfach"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Mittel"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Schwer"
 
 # general stuff
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Fingerübung"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Herzlichen Glückwunsch!"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Oh Nein!"
 
@@ -82,7 +82,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/el.po
===================================================================
--- tuxtype/trunk/po/el.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/el.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,41 +40,41 @@
 msgid "Press space bar to return to game"
 msgstr "Πάτα το κενό για να γυρίσεις στο παιχνίδι"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Επίπεδο"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Ζωές"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Ψάρια"
 
 # levels for Cascade game:
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "1. Εύκολο"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "2. Κανονικό"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "3. Δύσκολο"
 
 # general stuff
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Εξάσκηση"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Συγχαρητήρια"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Ωχ! Όχι"
 
@@ -82,7 +82,7 @@
 msgid "Great!"
 msgstr "Μπράβο!"
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/en at boldquot.po
===================================================================
--- tuxtype/trunk/po/en at boldquot.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/en at boldquot.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -31,8 +31,8 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
-"PO-Revision-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"PO-Revision-Date: 2008-08-19 12:29-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -64,39 +64,39 @@
 msgid "Press space bar to return to game"
 msgstr "Press space bar to return to game"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Level"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Lives"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Fish"
 
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Easy"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Medium"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Hard"
 
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Practice"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Congratulations"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Oh No!"
 
@@ -104,7 +104,7 @@
 msgid "Great!"
 msgstr "Great!"
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr "Next letter "
 

Modified: tuxtype/trunk/po/en at quot.po
===================================================================
--- tuxtype/trunk/po/en at quot.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/en at quot.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -28,8 +28,8 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
-"PO-Revision-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
+"PO-Revision-Date: 2008-08-19 12:29-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -61,39 +61,39 @@
 msgid "Press space bar to return to game"
 msgstr "Press space bar to return to game"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Level"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Lives"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Fish"
 
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Easy"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Medium"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Hard"
 
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Practice"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Congratulations"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Oh No!"
 
@@ -101,7 +101,7 @@
 msgid "Great!"
 msgstr "Great!"
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr "Next letter "
 

Modified: tuxtype/trunk/po/en_GB.po
===================================================================
--- tuxtype/trunk/po/en_GB.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/en_GB.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tuxtype\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,39 +40,39 @@
 msgid "Press space bar to return to game"
 msgstr ""
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr ""
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr ""
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr ""
 
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr ""
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr ""
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr ""
 
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr ""
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr ""
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr ""
 
@@ -80,7 +80,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/es.po
===================================================================
--- tuxtype/trunk/po/es.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/es.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: 2007-09-16 19:00+0000\n"
 "Last-Translator: Amaya Rodrigo <amaya at debian.org>\n"
 "Language-Team: Spanish\n"
@@ -39,41 +39,41 @@
 msgid "Press space bar to return to game"
 msgstr "Pulsa la barra espaciadora para regresar al juego"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Nivel"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Vidas"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Pescado"
 
 # niveles para juego de cascada:
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Fácil"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Medio"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Difícil"
 
 # Cosas generales
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Practicar"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "¡Felicidades!"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "¡Oh, no!"
 
@@ -81,7 +81,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/eu.po
===================================================================
--- tuxtype/trunk/po/eu.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/eu.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,41 +40,41 @@
 msgid "Press space bar to return to game"
 msgstr "Sakatu berriz bitarte-barra jokora itzultzeko"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Maila"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Bizitzak"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Arraina"
 
 # levels for Cascade game:
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Erreza"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Ertaina"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Gaitza"
 
 # general stuff
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Trebakuntza"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Zorionak"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Oi ez!"
 
@@ -82,7 +82,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/fr.po
===================================================================
--- tuxtype/trunk/po/fr.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/fr.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,41 +42,41 @@
 msgid "Press space bar to return to game"
 msgstr "taper la touche espace pour jouer"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Niveau"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Vies"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Poissons"
 
 # levels for Cascade game:
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Facile"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Moyen"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Fort"
 
 # general stuff
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Pratique"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Flicitations"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Oh Non!"
 
@@ -84,7 +84,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/it.po
===================================================================
--- tuxtype/trunk/po/it.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/it.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,41 +40,41 @@
 msgid "Press space bar to return to game"
 msgstr "premi SPAZIO per ritornare al gioco"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Livello"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Vite"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Pesci"
 
 # levels for Cascade game:
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Facile"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Medio"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Difficile"
 
 # general stuff
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Pratica"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Congratulazioni"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Oh No! Prova di nuovo..."
 
@@ -82,7 +82,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/ja.po
===================================================================
--- tuxtype/trunk/po/ja.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/ja.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -39,39 +39,39 @@
 msgid "Press space bar to return to game"
 msgstr ""
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr ""
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr ""
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr ""
 
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr ""
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr ""
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr ""
 
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr ""
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr ""
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr ""
 
@@ -79,7 +79,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/lt.po
===================================================================
--- tuxtype/trunk/po/lt.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/lt.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: 2004-10-20\n"
 "Last-Translator: Gintautas Grigas <grigas at ktl.mii.lt>\n"
 "Language-Team: Lithuanian\n"
@@ -40,41 +40,41 @@
 msgid "Press space bar to return to game"
 msgstr "Jei norite grįžti į žaidimą, paspauskite tarpo klavišą"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "lygis"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Meškerių:"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Žuvų:"
 
 # levels for Cascade game:
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Lengvas"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Vidutinis"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Sunkus"
 
 # general stuff
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Pirštų pratimai"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Sveikiname!"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Deja..."
 
@@ -82,7 +82,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/ml.gmo
===================================================================
(Binary files differ)

Modified: tuxtype/trunk/po/ml.po
===================================================================
--- tuxtype/trunk/po/ml.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/ml.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tuxtype\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: Swathanthra|സ്വതന്ത്ര Malayalam|മലയാളം Computing|കമ്പ്യൂട്ടിങ്ങ് <smc-"
@@ -41,39 +41,39 @@
 msgid "Press space bar to return to game"
 msgstr "കളിയില്‍ തിരിച്ചെത്താന്‍ സ്പെയ്സ് കീ അടിക്കുക"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "തട്ട്"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "ആയുസ്സ്"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "മത്സ്യം"
 
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "എളുപ്പം"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "ഇടത്തരം"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "ബുദ്ധിമുട്ടുള്ളത്"
 
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "പരിശീലനം"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "കൊള്ളാലോ!!!"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "അയ്യോ!.."
 
@@ -81,7 +81,7 @@
 msgid "Great!"
 msgstr "അഭിനന്ദനങ്ങള്‍!"
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr "അടുത്തത് :"
 

Modified: tuxtype/trunk/po/nb.po
===================================================================
--- tuxtype/trunk/po/nb.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/nb.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: 2005-10-20 21:24+0200\n"
 "Last-Translator: Trond Mæhlum <trondm at skolelinux.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb at lister.ping.uio.no>\n"
@@ -41,39 +41,39 @@
 msgid "Press space bar to return to game"
 msgstr "Trykk mellomrom for å gå tilbake til spillet."
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Nivå"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Liv"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Fisk"
 
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Lett"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Middels"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Vanskelig"
 
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Øving"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Gratulerer!"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Uff!"
 
@@ -81,7 +81,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/ne.po
===================================================================
--- tuxtype/trunk/po/ne.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/ne.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -44,47 +44,47 @@
 msgstr "खेलमा फर्कन स्पेस बार  थिच्नुहोस । "
 
 #
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "श्रेणी"
 
 #
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "जिवनहरु"
 
 #
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "माछा"
 
 #
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "सजिलो"
 
 #
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "मध्यम"
 
 #
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "कठिन"
 
 #
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "प्रशिक्षण"
 
 #
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "तपाइलाई बधाई छ!!!"
 
 #
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "हेत्तेरिका!.."
 
@@ -94,7 +94,7 @@
 msgstr "उत्तम अति उत्तम ‍!"
 
 #
-#: src/practice.c:806
+#: src/practice.c:756
 #, fuzzy
 msgid "Next letter "
 msgstr "आगामी अक्षर"

Modified: tuxtype/trunk/po/nl.po
===================================================================
--- tuxtype/trunk/po/nl.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/nl.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tuxtype\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,41 +42,41 @@
 msgid "Press space bar to return to game"
 msgstr "terug naar het spel? druk op spatiebalk"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Level"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Levens"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Vissen"
 
 # levels for Cascade game:
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Gemakkelijk"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Moeilijker"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Echt Moeilijk"
 
 # general stuff
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Vingeroefeningen"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Gefeliciteerd !"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Oh Nee!"
 
@@ -84,7 +84,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/nn.po
===================================================================
--- tuxtype/trunk/po/nn.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/nn.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: 2005-02-12 13:13+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -40,39 +40,39 @@
 msgid "Press space bar to return to game"
 msgstr "Trykk mellomromstasten for å gå tilbake til spelet."
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Nivå"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Liv"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Fisk"
 
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Lett"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Middels"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Vanskeleg"
 
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Øving"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Gratulerer!"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Uff!"
 
@@ -80,7 +80,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/pt.po
===================================================================
--- tuxtype/trunk/po/pt.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/pt.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: 2007-02-07 16:08+0000\n"
 "Last-Translator: Hudson G M Figueredo <kynder at pquilinux.org>\n"
 "Language-Team:  <pt at li.org>\n"
@@ -39,41 +39,41 @@
 msgid "Press space bar to return to game"
 msgstr "Pressione a barra de espaço para voltar ao jogo"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Nível"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Vidas"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Peixes"
 
 # levels for Cascade game:
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Fácil"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Médio"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Difícil"
 
 # general stuff
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Praticar"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Parabéns"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Ah não!"
 
@@ -81,7 +81,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/ru.po
===================================================================
--- tuxtype/trunk/po/ru.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/ru.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Mobin M <mobinmohan at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,39 +40,39 @@
 msgid "Press space bar to return to game"
 msgstr "Нажмите пробел для возврата к игре"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Уровень"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Жизней"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Рыб"
 
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Легкий"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Средний"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Сложный"
 
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Практика"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Поздравляем"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "О, нет!"
 
@@ -80,7 +80,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/sv.po
===================================================================
--- tuxtype/trunk/po/sv.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/sv.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: tuxtype2 1.5.1\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: 2003-07-23 17:44+0200\n"
 "Last-Translator: Göran Uddeborg <goeran at uddeborg.se>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -39,41 +39,41 @@
 msgid "Press space bar to return to game"
 msgstr "Tryck mellanslag för att fortsätta spela"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Nivå"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Liv"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Fisk"
 
 # levels for Cascade game:
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Lätt"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Mellan"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Svårt"
 
 # general stuff
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Övning"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Gratulerar"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Åh nej!"
 
@@ -81,7 +81,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/sw.po
===================================================================
--- tuxtype/trunk/po/sw.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/sw.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -40,41 +40,41 @@
 msgid "Press space bar to return to game"
 msgstr "Press space bar to return to game"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Nivel"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Vidas"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Peces"
 
 # levels for Cascade game:
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Rahisi"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Ngumu"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Ngumu zaidi"
 
 # general stuff
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Jifunze"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Shukran"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Ahhhh"
 
@@ -82,7 +82,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/tuxtype.pot
===================================================================
--- tuxtype/trunk/po/tuxtype.pot	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/tuxtype.pot	2008-08-19 19:40:41 UTC (rev 658)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -39,39 +39,39 @@
 msgid "Press space bar to return to game"
 msgstr ""
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr ""
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr ""
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr ""
 
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr ""
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr ""
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr ""
 
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr ""
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr ""
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr ""
 
@@ -79,7 +79,7 @@
 msgid "Great!"
 msgstr ""
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/po/wo.po
===================================================================
--- tuxtype/trunk/po/wo.po	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/po/wo.po	2008-08-19 19:40:41 UTC (rev 658)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Tux Typing 1.5.16\n"
 "Report-Msgid-Bugs-To: tux4kids-tuxtype-dev at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2008-08-18 21:04-0500\n"
+"POT-Creation-Date: 2008-08-19 12:29-0400\n"
 "PO-Revision-Date: 2007-09-25 09:50-0000\n"
 "Last-Translator: Ousmane Faty Ndongo et Dominique Rochefort <alfanet at anafa."
 "org>\n"
@@ -41,41 +41,41 @@
 msgid "Press space bar to return to game"
 msgstr "Bësal banqaasu teqale ngir fo"
 
-#: src/playgame.c:963
+#: src/playgame.c:1017
 msgid "Level"
 msgstr "Tollu tollu"
 
-#: src/playgame.c:964
+#: src/playgame.c:1018
 msgid "Lives"
 msgstr "Dund yi"
 
-#: src/playgame.c:965
+#: src/playgame.c:1019
 msgid "Fish"
 msgstr "Jën yi"
 
 # levels for Cascade game:
-#: src/playgame.c:967 src/titlescreen.c:91
+#: src/playgame.c:1021 src/titlescreen.c:91
 msgid "Easy"
 msgstr "Yomb"
 
-#: src/playgame.c:968 src/titlescreen.c:92
+#: src/playgame.c:1022 src/titlescreen.c:92
 msgid "Medium"
 msgstr "Ci diggante bi"
 
-#: src/playgame.c:969 src/titlescreen.c:93
+#: src/playgame.c:1023 src/titlescreen.c:93
 msgid "Hard"
 msgstr "Dëgër"
 
 # general stuff
-#: src/playgame.c:970 src/titlescreen.c:92
+#: src/playgame.c:1024 src/titlescreen.c:92
 msgid "Practice"
 msgstr "Jëf ji"
 
-#: src/playgame.c:981
+#: src/playgame.c:1035
 msgid "Congratulations"
 msgstr "Waaw góor"
 
-#: src/playgame.c:985
+#: src/playgame.c:1039
 msgid "Oh No!"
 msgstr "Déedéet!"
 
@@ -83,7 +83,7 @@
 msgid "Great!"
 msgstr "Ndokkale!"
 
-#: src/practice.c:806
+#: src/practice.c:756
 msgid "Next letter "
 msgstr ""
 

Modified: tuxtype/trunk/src/Makefile.in
===================================================================
--- tuxtype/trunk/src/Makefile.in	2008-08-19 11:36:20 UTC (rev 657)
+++ tuxtype/trunk/src/Makefile.in	2008-08-19 19:40:41 UTC (rev 658)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -58,7 +58,7 @@
 tuxtype_LDADD = $(LDADD)
 tuxtype_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(tuxtype_LDFLAGS) \
 	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -89,7 +89,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -137,7 +136,6 @@
 WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -328,8 +326,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -341,8 +339,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -352,12 +350,13 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
+	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique




More information about the Tux4kids-commits mailing list