Description: Patch to move from internal m4 to system (gnulib) m4
Author: Karl Goetz <karl@kgoetz.id.au>
Forwarded: no
Last-Update: <2010-06-27>

--- freeciv-2.2.1.orig/Makefile.am
+++ freeciv-2.2.1/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-ACLOCAL_AMFLAGS = -I m4 -I dependencies/m4
+ACLOCAL_AMFLAGS = -I m4 -I /usr/share/gnulib/m4
 
 if CLIENT
 CSUBDIRS = client
--- freeciv-2.2.1.orig/Makefile.in
+++ freeciv-2.2.1/Makefile.in
@@ -46,8 +46,8 @@ DIST_COMMON = README $(am__configure_dep
 	bootstrap/config.sub bootstrap/depcomp bootstrap/install-sh \
 	bootstrap/ltmain.sh bootstrap/missing bootstrap/mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/dependencies/m4/mkstemp.m4 \
-	$(top_srcdir)/dependencies/m4/stdlib_h.m4 \
+am__aclocal_m4_deps = /usr/share/gnulib/m4/mkstemp.m4 \
+	/usr/share/gnulib/m4/stdlib_h.m4 \
 	$(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
 	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
 	$(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
@@ -388,7 +388,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I m4 -I dependencies/m4
+ACLOCAL_AMFLAGS = -I m4 -I /usr/share/gnulib/m4
 @CLIENT_FALSE@CSUBDIRS = 
 @CLIENT_TRUE@CSUBDIRS = client
 @SERVER_FALSE@SSUBDIRS = 
--- freeciv-2.2.1.orig/aclocal.m4
+++ freeciv-2.2.1/aclocal.m4
@@ -8907,8 +8907,8 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([dependencies/m4/mkstemp.m4])
-m4_include([dependencies/m4/stdlib_h.m4])
+m4_include([/usr/share/gnulib/m4/mkstemp.m4])
+m4_include([/usr/share/gnulib/m4/stdlib_h.m4])
 m4_include([m4/auth.m4])
 m4_include([m4/c99.m4])
 m4_include([m4/codeset.m4])
--- freeciv-2.2.1.orig/autogen.sh
+++ freeciv-2.2.1/autogen.sh
@@ -262,7 +262,7 @@ if [ "$DIE" -eq 1 ]; then
 fi
 
 echo "+ running $ACLOCAL ..."
-$ACLOCAL -I m4 -I dependencies/m4 $ACLOCAL_FLAGS || {
+$ACLOCAL -I m4 -I /usr/share/gnulib/m4 $ACLOCAL_FLAGS || {
   echo
   echo "$ACLOCAL failed - check that all needed development files are present on system"
   exit 1
