copy iconv.m4 and friends in bootstrap

ChangeLog

@@ -17,6 +17,7 @@
 - special-case 3x3 makss in im_conv() for a 20% speedup
 - add IM_TYPE_RW flag for im__rw_image, helps nip2 auto-wrap inplace ops
 - im_insertplace() casts and bandalikes
+- copy iconv.m4 and friends in bootstrap, thanks Mike
 
 12/5/10 started 7.22.2
 - the conditional image of ifthenelse can be any format, a (!=0) is added if

bootstrap.sh

@@ -5,6 +5,7 @@
 # a bunch of cleaning up ... make certain everything will be regenerated
 rm -f Makefile Makefile.in aclocal.m4 
 rm -rf autom4te.cache
+rm -f 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
@@ -14,6 +15,18 @@ rm -f swig/vipsCC/VImage.py python/vipsCC/VError.py python/vipsCC/VMask.py pytho
 rm -f benchmark/temp*
 ( cd doc ; mkdir poop ; mv reference/libvips-docs.sgml.in poop ; mv reference/Makefile.am poop ; mv reference/images poop ; rm -rf reference/* ; mv poop/* reference ; rmdir poop )
 
+# 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`
+mkdir 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
+
 gtkdocize --copy --docdir doc/reference --flavour no-tmpl || exit 1
 
 # some systems need libtoolize, some glibtoolize ... how annoying

configure.in

@@ -142,6 +142,7 @@ AC_SYS_LARGEFILE
 AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_CC_STDC
+AC_PROG_CXX
 AC_C_CONST
 AC_C_RESTRICT
 AC_PROG_RANLIB
@@ -157,7 +158,6 @@ AC_ARG_ENABLE(cxx,
   AS_HELP_STRING([--enable-cxx], [build C++ components (default: enabled)]))
 
 if test x"$enable_cxx" != "xno"; then
-  AC_PROG_CXX
   AC_DEFINE(ENABLE_CXX,1,[build C++ components])
   AM_CONDITIONAL(ENABLE_CXX, true)
   enable_cxx=yes