From 10cfbc553f4777dc7a3cb9c2f933f07fc045474b Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Wed, 18 May 2016 13:41:31 +0100
Subject: [PATCH] get rid of m4-safe

and don't copy the .m4 files recommended by glib-gettextize either
---
 .gitignore                |  7 ++++++-
 bootstrap.sh              | 27 +++++++++++----------------
 {m4-safe => m4}/gif.m4    |  0
 {m4-safe => m4}/jpeg.m4   |  0
 {m4-safe => m4}/mkdir.m4  |  0
 {m4-safe => m4}/png.m4    |  0
 {m4-safe => m4}/python.m4 |  0
 {m4-safe => m4}/tiff.m4   |  0
 {m4-safe => m4}/webp.m4   |  0
 {m4-safe => m4}/zip.m4    |  0
 10 files changed, 17 insertions(+), 17 deletions(-)
 rename {m4-safe => m4}/gif.m4 (100%)
 rename {m4-safe => m4}/jpeg.m4 (100%)
 rename {m4-safe => m4}/mkdir.m4 (100%)
 rename {m4-safe => m4}/png.m4 (100%)
 rename {m4-safe => m4}/python.m4 (100%)
 rename {m4-safe => m4}/tiff.m4 (100%)
 rename {m4-safe => m4}/webp.m4 (100%)
 rename {m4-safe => m4}/zip.m4 (100%)

diff --git a/.gitignore b/.gitignore
index 9f43ecb2..566dd31b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,7 +48,12 @@ libtool
 libvips/include/vips/version.h
 fred
 ltmain.sh
-m4
+m4/gtk-doc.m4
+m4/libtool.m4
+m4/lt~obsolete.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
 missing
 mkinstalldirs
 po/Makefile.in.in
diff --git a/bootstrap.sh b/bootstrap.sh
index d07f5f1c..8b3d3a3f 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -5,11 +5,15 @@
 # a bunch of cleaning up ... make certain everything will be regenerated
 rm -f Makefile Makefile.in aclocal.m4 
 rm -rf autom4te.cache
-# m4/ contains only stuff from the build system ... the m4 files we have
-# written and maintain are in m4-safe
-rm -rf m4
-mkdir m4
-cp m4-safe/* m4/
+
+# remove m4/ macros put there by libtool etc.
+rm -f m4/libtool.m4
+rm -f m4/lt~obsolete.m4
+rm -f m4/ltoptions.m4
+rm -f m4/ltsugar.m4
+rm -f m4/ltversion.m4
+rm -f m4/gtk-doc.m4
+
 rm -f config.* configure depcomp
 rm -f install-sh intltool-* libtool ltmain.sh missing mkinstalldirs
 rm -f stamp-* vipsCC-7.19.pc vips-7.19.spec vips-7.19.pc
@@ -35,18 +39,10 @@ if [ -e $ACDIR/dirlist ]; then
   ACDIR=`cat $ACDIR/dirlist`
 fi
 
-# glib-gettextize asks us to copy these files to m4 if they aren't there:
-files="codeset gettext glibc21 iconv isc-posix lcmessage progtest introspection"
-for dir in $ACDIR; do
-  test -d $dir && for file in $files; do
-    test -e $dir/$file.m4 && cp $dir/$file.m4 m4
-  done
-done
-
 gtkdocize --copy --docdir doc --flavour no-tmpl || exit 1
 
 # some systems need libtoolize, some glibtoolize ... how annoying
-echo testing for glibtoolize ...
+echo -n "testing for glibtoolize ... "
 if glibtoolize --version >/dev/null 2>&1; then
   LIBTOOLIZE=glibtoolize
   echo using glibtoolize
@@ -60,8 +56,7 @@ test -r aclocal.m4 || touch aclocal.m4
 # it ... hopefully any errors will go to stderr and not be hidden
 glib-gettextize --force --copy > /dev/null
 test -r aclocal.m4 && chmod u+w aclocal.m4
-# intltoolize --copy --force --automake
-aclocal -I m4
+intltoolize --copy --force --automake
 autoconf
 autoheader
 $LIBTOOLIZE --copy --force --automake
diff --git a/m4-safe/gif.m4 b/m4/gif.m4
similarity index 100%
rename from m4-safe/gif.m4
rename to m4/gif.m4
diff --git a/m4-safe/jpeg.m4 b/m4/jpeg.m4
similarity index 100%
rename from m4-safe/jpeg.m4
rename to m4/jpeg.m4
diff --git a/m4-safe/mkdir.m4 b/m4/mkdir.m4
similarity index 100%
rename from m4-safe/mkdir.m4
rename to m4/mkdir.m4
diff --git a/m4-safe/png.m4 b/m4/png.m4
similarity index 100%
rename from m4-safe/png.m4
rename to m4/png.m4
diff --git a/m4-safe/python.m4 b/m4/python.m4
similarity index 100%
rename from m4-safe/python.m4
rename to m4/python.m4
diff --git a/m4-safe/tiff.m4 b/m4/tiff.m4
similarity index 100%
rename from m4-safe/tiff.m4
rename to m4/tiff.m4
diff --git a/m4-safe/webp.m4 b/m4/webp.m4
similarity index 100%
rename from m4-safe/webp.m4
rename to m4/webp.m4
diff --git a/m4-safe/zip.m4 b/m4/zip.m4
similarity index 100%
rename from m4-safe/zip.m4
rename to m4/zip.m4