23 files changed, 68 insertions, 253 deletions
diff --git a/Makefile.in b/Makefile.in
index e88d6bf7..c0393762 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -81,14 +77,16 @@ AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = data doc nls src util
 MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =  version.h
 DIST_COMMON =  README ./stamp-h.in AUTHORS INSTALL Makefile.am \
-Makefile.in TODO aclocal.m4 config.h.in configure configure.in \
-install-sh missing mkinstalldirs version.h.in
+Makefile.in TODO config.h.in configure configure.in install-sh missing \
+mkinstalldirs version.h.in
+
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
@@ -103,8 +101,6 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
-	cd $(srcdir) && $(ACLOCAL)
 
 config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index 29290472..00000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,160 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 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 This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-# Do all the work for Automake.  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.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
-
-AC_DEFUN([AM_CONFIG_HEADER],
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated.  We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
-  case " <<$>>CONFIG_HEADERS " in
-  *" <<$>>am_file "*<<)>>
-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-    ;;
-  esac
-  am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
-
diff --git a/data/Makefile.in b/data/Makefile.in
index 999b01f6..d3013dac 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -86,6 +82,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  README Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/data/styles/Makefile.in b/data/styles/Makefile.in
index c6ac1e4e..907590e8 100644
--- a/data/styles/Makefile.in
+++ b/data/styles/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -88,6 +84,9 @@ DATA =  $(style_DATA)
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 2edd9e35..a7f9bbd3 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -93,6 +89,9 @@ NROFF = nroff
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/nls/C/Makefile.in b/nls/C/Makefile.in
index 261493ad..a07fca90 100644
--- a/nls/C/Makefile.in
+++ b/nls/C/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -88,6 +84,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/nls/Makefile.in b/nls/Makefile.in
index 59bc72fe..0462f9bc 100644
--- a/nls/Makefile.in
+++ b/nls/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -88,6 +84,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/nls/da_DK/Makefile.in b/nls/da_DK/Makefile.in
index fb403dcf..b0843a0b 100644
--- a/nls/da_DK/Makefile.in
+++ b/nls/da_DK/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -88,6 +84,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/nls/de_DE/Makefile.in b/nls/de_DE/Makefile.in
index 3cb22b5e..716d5d8d 100644
--- a/nls/de_DE/Makefile.in
+++ b/nls/de_DE/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -88,6 +84,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/nls/es_ES/Makefile.in b/nls/es_ES/Makefile.in
index f62a4bd5..c84901b2 100644
--- a/nls/es_ES/Makefile.in
+++ b/nls/es_ES/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -88,6 +84,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/nls/et_EE/Makefile.in b/nls/et_EE/Makefile.in
index 90d65c15..0b79feec 100644
--- a/nls/et_EE/Makefile.in
+++ b/nls/et_EE/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -88,6 +84,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/nls/fr_FR/Makefile.in b/nls/fr_FR/Makefile.in
index 9e9ac645..617766bc 100644
--- a/nls/fr_FR/Makefile.in
+++ b/nls/fr_FR/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -88,6 +84,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/nls/it_IT/Makefile.in b/nls/it_IT/Makefile.in
index 7caece23..e4648c4e 100644
--- a/nls/it_IT/Makefile.in
+++ b/nls/it_IT/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -88,6 +84,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/nls/ja_JP/Makefile.in b/nls/ja_JP/Makefile.in
index ce94b31b..c9e7d986 100644
--- a/nls/ja_JP/Makefile.in
+++ b/nls/ja_JP/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -88,6 +84,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/nls/nl_NL/Makefile.in b/nls/nl_NL/Makefile.in
index e83e4c2c..8b88c75d 100644
--- a/nls/nl_NL/Makefile.in
+++ b/nls/nl_NL/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -88,6 +84,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/nls/pt_BR/Makefile.in b/nls/pt_BR/Makefile.in
index aac4d8e1..e6803211 100644
--- a/nls/pt_BR/Makefile.in
+++ b/nls/pt_BR/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -88,6 +84,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/nls/ru_RU/Makefile.in b/nls/ru_RU/Makefile.in
index 5c295e16..86f3d20a 100644
--- a/nls/ru_RU/Makefile.in
+++ b/nls/ru_RU/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -88,6 +84,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/nls/sl_SI/Makefile.in b/nls/sl_SI/Makefile.in
index aaf704da..7da3b480 100644
--- a/nls/sl_SI/Makefile.in
+++ b/nls/sl_SI/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -88,6 +84,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/nls/sv_SE/Makefile.in b/nls/sv_SE/Makefile.in
index 381429cf..92e4ad14 100644
--- a/nls/sv_SE/Makefile.in
+++ b/nls/sv_SE/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -88,6 +84,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/nls/tr_TR/Makefile.in b/nls/tr_TR/Makefile.in
index b9911fc1..e97b98b0 100644
--- a/nls/tr_TR/Makefile.in
+++ b/nls/tr_TR/Makefile.in
@@ -68,16 +68,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -92,6 +88,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/nls/zh_CN/Makefile.in b/nls/zh_CN/Makefile.in
index eeb26c03..6042d48c 100644
--- a/nls/zh_CN/Makefile.in
+++ b/nls/zh_CN/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -88,6 +84,9 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/src/Makefile.in b/src/Makefile.in
index 0aaf4ee1..547550ba 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -83,16 +83,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -138,6 +134,9 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
diff --git a/util/Makefile.in b/util/Makefile.in
index 7256bca2..998f3e42 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -64,16 +64,12 @@ CLOBBER = @CLOBBER@
 CXX = @CXX@
 DEBUG = @DEBUG@
 INTERLACE = @INTERLACE@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
 NEWWMSPEC = @NEWWMSPEC@
 NLS = @NLS@
 ORDEREDPSEUDO = @ORDEREDPSEUDO@
-PACKAGE = @PACKAGE@
 SHAPE = @SHAPE@
 SLIT = @SLIT@
 TIMEDCACHE = @TIMEDCACHE@
-VERSION = @VERSION@
 gencat_cmd = @gencat_cmd@
 regex_cmd = @regex_cmd@
 
@@ -113,6 +109,9 @@ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
 DIST_COMMON =  Makefile.am Makefile.in
 
 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar