fix bootstrap warnings

for ubuntu 13.10

.gitignore

@@ -9,6 +9,7 @@ Makefile.in
 config.*
 autom4te.cache
 aclocal.m4
+m4/
 compile
 configure
 depcomp

ChangeLog

@@ -1,3 +1,6 @@
+started 7.36.4 18/10/13
+- fix bootstrap warnings
+
 started 7.36.3 16/10/13
 - better load of workspaces with closed columns
 

bootstrap.sh

@@ -8,7 +8,25 @@ rm -rf autom4te.cache
 rm -f install-sh intltool-* ltmain.sh missing mkinstalldirs
 rm -f src/*.o src/nip2 src/Makefile src/Makefile.in 
 
-# exit
+# glib-gettextize asks us to copy these files to m4 if they aren't there
+# I don't have $ACDIR/isc-posix.m4, how mysterious
+ACDIR=`aclocal --print-ac-dir`
+
+# OS X with brew sets ACDIR to
+# /usr/local/Cellar/automake/1.13.1/share/aclocal, the staging area, which is
+# totally wrong argh
+if [ ! -d $ACDIR ]; then
+	ACDIR=/usr/local/share/aclocal
+fi
+
+mkdir -p m4
+cp $ACDIR/codeset.m4 m4
+cp $ACDIR/gettext.m4 m4
+cp $ACDIR/glibc21.m4 m4
+cp $ACDIR/iconv.m4 m4
+cp $ACDIR/isc-posix.m4 m4
+cp $ACDIR/lcmessage.m4 m4
+cp $ACDIR/progtest.m4 m4
 
 # some systems need libtoolize, some glibtoolize ... how annoying
 echo testing for glibtoolize ...

configure.ac

@@ -1,13 +1,14 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([nip2], [7.36.3])
+AC_INIT([nip2], [7.36.4])
 AM_INIT_AUTOMAKE([-Wall])
 
 # foreign stops complaints about a missing README (we use README.md instead)
 # and missing INSTALL (the standard Gnu INSTALL is not very useful)
 AM_INIT_AUTOMAKE([foreign])
 
 AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_MACRO_DIR([m4])
 
 dnl
 dnl We do the version number components as m4 macros
@@ -17,21 +18,20 @@ dnl
 
 m4_define([nip_major_version], [7])
 m4_define([nip_minor_version], [36])
-m4_define([nip_micro_version], [3])
+m4_define([nip_micro_version], [4])
 m4_define([nip_version],
           [nip_major_version.nip_minor_version.nip_micro_version])
 
 MAJOR_VERSION=nip_major_version()
 MINOR_VERSION=nip_minor_version()
 MICRO_VERSION=nip_micro_version()
 
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-
 AC_DEFINE_UNQUOTED(MAJOR_VERSION, $MAJOR_VERSION, [Major version number])
 AC_DEFINE_UNQUOTED(MINOR_VERSION, $MINOR_VERSION, [Minor version number])
 AC_DEFINE_UNQUOTED(MICRO_VERSION, $MICRO_VERSION, [Micro version number])
 
+AC_CANONICAL_HOST
+
 AC_MSG_CHECKING([for native Win32])
 case "$host" in
   *-*-mingw*)