[Freeciv-Dev] (PR#6198) 1.14: iconv.m4 is incomplete

["Reinier Post" <rp@xxxxxxxxxx>]

beta2 still has the same problem, now with m4/lib-prefix.m4:
autogen.sh fails on it when using autoconf 2.13, which is still supposed 
to be supported, I think.

I found the solution at

  http://mail.gnu.org/archive/html/bug-gnu-utils/2003-07/msg00011.html
  http://os.inf.tu-dresden.de/dice/faq.xml#faq10

Quoting from the second URL:

Check your version of automake (and aclocal). This is a known bug of 
aclocal version 1.4-p4 (See this message).
To fix it change line 16 in /usr/share/aclocal/lib-prefix.m4 to 
[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]).

(end of quote)

The attached patch does this and has been verified to work with autoconf 
2.13, aclocal 1.4p5 and freeciv-1.14.1-beta2.

diff -Nurd -x'.when-*' -x'.newest-*' -Xdiff_ignore 
../freeciv.orig/./m4/lib-prefix.m4 ./m4/lib-prefix.m4
--- ../freeciv.orig/./m4/lib-prefix.m4  Sun Sep 21 01:56:27 2003
+++ ./m4/lib-prefix.m4  Mon Oct 27 12:20:40 2003
@@ -11,9 +11,11 @@
 dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
 dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
 dnl require excessive bracketing.
+dnl
+dnl patched to fix Freeciv bug RT#6198, see http://rt.freeciv.org/
 ifdef([AC_HELP_STRING],
 [AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
 
 dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
 dnl to access previously installed libraries. The basic assumption is that