8 files changed, 2347 insertions, 7 deletions
diff --git a/nonworking/tetex/tetex-2.0.2/configure.patch b/nonworking/tetex/tetex-2.0.2/configure.patch
index e69de29bb2..66b1967742 100644
--- a/nonworking/tetex/tetex-2.0.2/configure.patch
+++ b/nonworking/tetex/tetex-2.0.2/configure.patch
@@ -0,0 +1,2222 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- tetex-src-2.0.2/libs/xpdf/configure.in~configure	2002-12-05 18:44:31.000000000 -0500
++++ tetex-src-2.0.2/libs/xpdf/configure.in	2004-01-26 20:17:53.000000000 -0500
+@@ -1,25 +1,35 @@
+ dnl Process this file with autoconf to produce a configure script.
+ dnl Copyright 1998-2002 Glyph & Cog, LLC
+ 
+-AC_INIT(xpdf/xpdf.cc)
++AC_INIT
++AC_CONFIG_SRCDIR([xpdf/xpdf.cc])
+ AC_CONFIG_HEADER(aconf.h)
+ 
+ dnl ##### Optional features.
+ AC_ARG_ENABLE(a4-paper,
+ [  --enable-a4-paper       use A4 paper size instead of Letter for
+                           PostScript output],
++AH_TEMPLATE([A4_PAPER], [Define if using A4 paper size instead of Letter for PS output])
+ AC_DEFINE(A4_PAPER))
++
+ AC_ARG_ENABLE(no-text-select,
+ [  --enable-no-text-select do not allow text selection],
++AH_TEMPLATE([NO_TEXT_SELECT], [Define if not allowing text selection])
+ AC_DEFINE(NO_TEXT_SELECT))
++
+ AC_ARG_ENABLE(opi,
+ [  --enable-opi            include support for OPI comments],
++AH_TEMPLATE([OPI_SUPPORT], [Define if including support for OPI comments])
+ AC_DEFINE(OPI_SUPPORT))
++
+ AC_ARG_ENABLE(multithreaded,
+ [  --enable-multithreaded  include support for multithreading],
++AH_TEMPLATE([MULTITHREADED], [Define if including support for multithreading])
+ AC_DEFINE(MULTITHREADED))
++
+ AC_ARG_WITH(appdef-dir,
+ [  --with-appdef-dir       set app-defaults directory],
++AH_TEMPLATE([APPDEFDIR], [Set to app-defaults directory])
+ AC_DEFINE_UNQUOTED(APPDEFDIR, "$with_appdef_dir"))
+ 
+ dnl ##### Path to xpdfrc.
+@@ -34,12 +44,13 @@
+ else
+   system_xpdfrc="$sysconfdir/xpdfrc"
+ fi
++AH_TEMPLATE([SYSTEM_XPDFRC], [Set to path to the xpdfrc])
+ AC_DEFINE_UNQUOTED(SYSTEM_XPDFRC, "$system_xpdfrc")
+ 
+ dnl ##### Checks for programs.
+ AC_PROG_CC
+ AC_ISC_POSIX
+-AC_PROG_CC_STDC
++
+ #if test -z "$CXX" -a "$CC" = "gcc"; then
+ #  CXX="gcc"
+ #fi
+@@ -56,9 +67,7 @@
+ dnl ##### Check for OS/2.
+ AC_CACHE_CHECK([for OS/2 (with EMX)],
+ xpdf_cv_sys_os2,
+-[AC_TRY_COMPILE([],
+-[__EMX__],
+-xpdf_cv_sys_os2=yes, xpdf_cv_sys_os2=no)])
++[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[__EMX__]])],[xpdf_cv_sys_os2=yes],[xpdf_cv_sys_os2=no])])
+ if test "$xpdf_cv_sys_os2" = yes; then
+   EXE=".exe"
+   LIBPREFIX=""
+@@ -68,9 +77,7 @@
+ dnl ##### Check for DOS (with DJGPP).
+ AC_CACHE_CHECK([for DOS (with DJGPP)],
+ xpdf_cv_sys_dos,
+-[AC_TRY_COMPILE([],
+-[__DJGPP__],
+-xpdf_cv_sys_dos=yes, xpdf_cv_sys_dos=no)])
++[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[__DJGPP__]])],[xpdf_cv_sys_dos=yes],[xpdf_cv_sys_dos=no])])
+ if test "$xpdf_cv_sys_dos" = yes; then
+   EXE=".exe"
+   LIBPREFIX="lib"
+@@ -91,7 +98,7 @@
+ dnl ##### Switch over to C++.  This will make the checks below a little
+ dnl ##### bit stricter (requiring function prototypes in include files).
+ dnl ##### (99% of xpdf is written in C++.)
+-AC_LANG_CPLUSPLUS
++AC_LANG([C++])
+ 
+ dnl ##### Check for extra libraries needed by X.  (LynxOS needs this.)
+ AC_CHECK_FUNC(gethostbyname)
+@@ -100,34 +107,33 @@
+ fi
+ 
+ dnl ##### Look for header that defines select() and fd_set.
++AH_TEMPLATE([HAVE_SYS_SELECT_H], [Define if you have sys/select.h])
++AH_TEMPLATE([HAVE_SYS_BSDTYPES_H], [Define if you have sys/bsdtypes.h])
+ AC_MSG_CHECKING([select() and fd_set in sys/select.h and sys/bsdtypes.h])
+-AC_TRY_COMPILE([#include <stdlib.h>
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
+ #include <stddef.h>
+ #include <unistd.h>
+-#include <sys/types.h>],
+-  [fd_set fds;
+-select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no)
++#include <sys/types.h>]], [[fd_set fds;
++select(0, NULL, NULL, NULL, NULL);]])],[xpdf_ok=yes],[xpdf_ok=no])
+ if test $xpdf_ok = yes; then
+   AC_MSG_RESULT([not needed])
+ else
+-  AC_TRY_COMPILE([#include <stdlib.h>
++  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
+ #include <stddef.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+-#include <sys/select.h>],
+-    [fd_set fds;
+-select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no)
++#include <sys/select.h>]], [[fd_set fds;
++select(0, NULL, NULL, NULL, NULL);]])],[xpdf_ok=yes],[xpdf_ok=no])
+   if test $xpdf_ok = yes; then
+     AC_DEFINE(HAVE_SYS_SELECT_H)
+     AC_MSG_RESULT([need sys/select.h])
+   else
+-    AC_TRY_COMPILE([#include <stdlib.h>
++    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
+ #include <stddef.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+-#include <sys/bsdtypes.h>],
+-      [fd_set fds;
+-select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no)
++#include <sys/bsdtypes.h>]], [[fd_set fds;
++select(0, NULL, NULL, NULL, NULL);]])],[xpdf_ok=yes],[xpdf_ok=no])
+     if test $xpdf_ok = yes; then
+       AC_DEFINE(HAVE_SYS_BSDTYPES_H)
+       AC_MSG_RESULT([need sys/bsdtypes.h])
+@@ -138,34 +144,33 @@
+ fi
+ 
+ dnl ##### Look for header that defines FD_ZERO.
++AH_TEMPLATE([HAVE_STRINGS_H], [Define if you need to include strings.h.])
++AH_TEMPLATE([HAVE_BSTRING_H], [Define if you need to include bstring.h.])
+ AC_MSG_CHECKING([FD_ZERO and strings.h or bstring.h])
+-AC_TRY_COMPILE([#include <stdlib.h>
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+-#endif],
+-[fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no)
++#endif]], [[fd_set fds; FD_ZERO(&fds);]])],[xpdf_ok=yes],[xpdf_ok=no])
+ if test $xpdf_ok = yes; then
+   AC_MSG_RESULT([not needed])
+ else
+-  AC_TRY_COMPILE([#include <stdlib.h>
++  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
+ #include <sys/types.h>
+ #include <strings.h>
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+-#endif],
+-    [fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no)
++#endif]], [[fd_set fds; FD_ZERO(&fds);]])],[xpdf_ok=yes],[xpdf_ok=no])
+   if test $xpdf_ok = yes; then
+     AC_DEFINE(HAVE_STRINGS_H)
+     AC_MSG_RESULT([need strings.h])
+   else
+-    AC_TRY_COMPILE([#include <stdlib.h>
++    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
+ #include <sys/types.h>
+ #include <bstring.h>
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+-#endif],
+-      [fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no)
++#endif]], [[fd_set fds; FD_ZERO(&fds);]])],[xpdf_ok=yes],[xpdf_ok=no])
+     if test $xpdf_ok = yes; then
+       AC_DEFINE(HAVE_BSTRING_H)
+       AC_MSG_RESULT([need bstring.h])
+@@ -186,46 +191,44 @@
+ dnl # This should use 'AC_CHECK_FUNCS(mkstemp)' but that fails if
+ dnl # the mkstemp exists in the library but isn't declared in the
+ dnl # include file (e.g., in cygwin 1.1.2).
++AH_TEMPLATE([HAVE_MKSTEMP], [Define if we have mkstemp])
+ AC_CACHE_CHECK([for mkstemp],
+ xpdf_cv_func_mkstemp,
+-[AC_TRY_LINK([#include <stdlib.h>
+-#include <unistd.h>],
+-[mkstemp("foo");],
+-xpdf_cv_func_mkstemp=yes, xpdf_cv_func_mkstemp=no)])
++[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
++#include <unistd.h>]], [[mkstemp("foo");]])],[xpdf_cv_func_mkstemp=yes],[xpdf_cv_func_mkstemp=no])])
+ if test "$xpdf_cv_func_mkstemp" = yes; then
+   AC_DEFINE(HAVE_MKSTEMP)
+ fi
++AH_TEMPLATE([HAVE_MKSTEMPS], [Define if we have mkstemps])
+ dnl # Check for mkstemps, just like mkstemp.
+ AC_CACHE_CHECK([for mkstemps],
+ xpdf_cv_func_mkstemps,
+-[AC_TRY_LINK([#include <stdlib.h>
+-#include <unistd.h>],
+-[mkstemps("foo", 0);],
+-xpdf_cv_func_mkstemps=yes, xpdf_cv_func_mkstemps=no)])
++[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
++#include <unistd.h>]], [[mkstemps("foo", 0);]])],[xpdf_cv_func_mkstemps=yes],[xpdf_cv_func_mkstemps=no])])
+ if test "$xpdf_cv_func_mkstemps" = yes; then
+   AC_DEFINE(HAVE_MKSTEMPS)
+ fi
+ 
++AH_TEMPLATE([SELECT_TAKES_INT], [Define if select takes an int * argument instead of fd_set *])
+ dnl ##### Check select argument type: on HP-UX before version 10, select
+ dnl ##### takes (int *) instead of (fd_set *).
+ AC_CACHE_CHECK([whether select takes fd_set arguments],
+ xpdf_cv_func_select_arg,
+-[AC_TRY_COMPILE([#include <sys/types.h>
++[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+-#endif],
+-[fd_set fds;
+-select(1, &fds, &fds, &fds, 0);],
+-xpdf_cv_func_select_arg=yes, xpdf_cv_func_select_arg=no)])
++#endif]], [[fd_set fds;
++select(1, &fds, &fds, &fds, 0);]])],[xpdf_cv_func_select_arg=yes],[xpdf_cv_func_select_arg=no])])
+ if test "$xpdf_cv_func_select_arg" != yes; then
+   AC_DEFINE(SELECT_TAKES_INT)
+ fi
+ 
+ dnl ##### Back to C for the library tests.
+-AC_LANG_C
++AC_LANG([C])
+ 
++AH_TEMPLATE([HAVE_FSEEK64], [Define if we have fseek64/ftell64])
+ dnl ##### Check for fseeko/ftello or fseek64/ftell64
+ dnl The LARGEFILE and FSEEKO macros have to be called in C, not C++, mode.
+ AC_SYS_LARGEFILE
+@@ -289,6 +292,7 @@
+ dnl ##### Look for FreeType 2.0.5+ first, and then FreeType 1.x.
+ dnl ##### (Note: FT_Get_Name_Index was added in FT 2.0.5, and is
+ dnl ##### the reason that Xpdf requires 2.0.5+.)
++AH_TEMPLATE([FREETYPE2], [Define if using freetype2])
+ if test -z "$no_x"; then
+   smr_CHECK_LIB(freetype2, freetype, [FreeType2 font rasterizer - version 2.0.5+],
+                 FT_Get_Name_Index, freetype/freetype.h,
+@@ -334,7 +338,8 @@
+ AC_SUBST(XPDF_TARGET)
+ 
+ dnl ##### Write the makefiles.
+-AC_OUTPUT(Makefile xpdf/Makefile goo/Makefile)
++AC_CONFIG_FILES([Makefile xpdf/Makefile goo/Makefile])
++AC_OUTPUT
+ 
+ dnl ##### Warn user if X is missing.
+ if test -n "$no_x"; then
+--- tetex-src-2.0.2/./texk/etc/autoconf/acspecific.m4~configure	2003-02-18 01:46:57.000000000 -0500
++++ tetex-src-2.0.2/./texk/etc/autoconf/acspecific.m4	2004-01-26 20:17:53.000000000 -0500
+@@ -56,7 +56,7 @@
+ dnl checking messages from result messages.
+ dnl Idea borrowed from dist 3.0.
+ dnl Internal use only.
+-AC_DEFUN(AC_PROG_ECHO_N,
++AC_DEFUN([AC_PROG_ECHO_N],
+ [if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+@@ -70,7 +70,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_PROG_CC,
++AC_DEFUN([AC_PROG_CC],
+ [AC_BEFORE([$0], [AC_PROG_CPP])dnl
+ AC_CHECK_PROG(CC, gcc, gcc)
+ if test -z "$CC"; then
+@@ -117,7 +117,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_PROG_CXX,
++AC_DEFUN([AC_PROG_CXX],
+ [AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
+ AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++ cl, gcc)
+ 
+@@ -166,7 +166,7 @@
+ dnl 77 compilers.
+ dnl 
+ dnl AC_PROG_F77()
+-AC_DEFUN(AC_PROG_F77,
++AC_DEFUN([AC_PROG_F77],
+ [AC_BEFORE([$0], [AC_PROG_CPP])dnl
+ if test -z "$F77"; then
+   AC_CHECK_PROGS(F77, g77 f77 f2c)
+@@ -198,7 +198,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_PROG_CC_WORKS,
++AC_DEFUN([AC_PROG_CC_WORKS],
+ [AC_MSG_CHECKING([whether the C compiler ($CC $CFLAGS $LDFLAGS) works])
+ AC_LANG_SAVE
+ AC_LANG_C
+@@ -213,7 +213,7 @@
+ cross_compiling=$ac_cv_prog_cc_cross
+ ])
+ 
+-AC_DEFUN(AC_PROG_CXX_WORKS,
++AC_DEFUN([AC_PROG_CXX_WORKS],
+ [AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+@@ -234,7 +234,7 @@
+ dnl compiler is `g77').
+ dnl 
+ dnl AC_PROG_F77_WORKS()
+-AC_DEFUN(AC_PROG_F77_WORKS,
++AC_DEFUN([AC_PROG_F77_WORKS],
+ [AC_MSG_CHECKING([whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works])
+ AC_LANG_SAVE
+ AC_LANG_FORTRAN77
+@@ -252,7 +252,7 @@
+ cross_compiling=$ac_cv_prog_f77_cross
+ ])
+ 
+-AC_DEFUN(AC_PROG_CC_GNU,
++AC_DEFUN([AC_PROG_CC_GNU],
+ [AC_CACHE_CHECK(whether we are using GNU C, ac_cv_prog_gcc,
+ [dnl The semicolon is to pacify NeXT's syntax-checking cpp.
+ cat > conftest.c <<EOF
+@@ -266,7 +266,7 @@
+   ac_cv_prog_gcc=no
+ fi])])
+ 
+-AC_DEFUN(AC_PROG_CXX_GNU,
++AC_DEFUN([AC_PROG_CXX_GNU],
+ [AC_CACHE_CHECK(whether we are using GNU C++, ac_cv_prog_gxx,
+ [dnl The semicolon is to pacify NeXT's syntax-checking cpp.
+ cat > conftest.C <<EOF
+@@ -285,7 +285,7 @@
+ dnl do CPP pre-processing.
+ dnl 
+ dnl AC_PROG_F77_GNU()
+-AC_DEFUN(AC_PROG_F77_GNU,
++AC_DEFUN([AC_PROG_F77_GNU],
+ [AC_CACHE_CHECK(whether we are using GNU Fortran 77, ac_cv_prog_g77,
+ [cat > conftest.fpp <<EOF
+ #ifdef __GNUC__
+@@ -298,7 +298,7 @@
+   ac_cv_prog_g77=no
+ fi])])
+ 
+-AC_DEFUN(AC_PROG_CC_G,
++AC_DEFUN([AC_PROG_CC_G],
+ [AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g,
+ [echo 'void f(){}' > conftest.c
+ if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+@@ -309,7 +309,7 @@
+ rm -f conftest*
+ ])])
+ 
+-AC_DEFUN(AC_PROG_CXX_G,
++AC_DEFUN([AC_PROG_CXX_G],
+ [AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g,
+ [echo 'void f(){}' > conftest.cc
+ if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
+@@ -324,7 +324,7 @@
+ dnl enable debugging.
+ dnl 
+ dnl AC_PROG_F77_G()
+-AC_DEFUN(AC_PROG_F77_G,
++AC_DEFUN([AC_PROG_F77_G],
+ [AC_CACHE_CHECK(whether $F77 accepts -g, ac_cv_prog_f77_g,
+ [cat > conftest.f << EOF
+        program conftest
+@@ -338,7 +338,7 @@
+ rm -f conftest*
+ ])])
+ 
+-AC_DEFUN(AC_PROG_GCC_TRADITIONAL,
++AC_DEFUN([AC_PROG_GCC_TRADITIONAL],
+ [AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_PROG_CPP])dnl
+ if test $ac_cv_prog_gcc = yes; then
+@@ -360,7 +360,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_PROG_CC_C_O,
++AC_DEFUN([AC_PROG_CC_C_O],
+ [if test "x$CC" != xcc; then
+   AC_MSG_CHECKING(whether $CC and cc understand -c and -o together)
+ else
+@@ -416,7 +416,7 @@
+ dnl completeness, since a similar test exists for the C compiler.
+ dnl 
+ dnl AC_PROG_F77_C_O
+-AC_DEFUN(AC_PROG_F77_C_O,
++AC_DEFUN([AC_PROG_F77_C_O],
+ [AC_BEFORE([$0], [AC_PROG_F77])dnl
+ AC_MSG_CHECKING(whether $F77 understand -c and -o together)
+ set dummy $F77; ac_f77="`echo [$]2 |
+@@ -448,7 +448,7 @@
+ ])
+ 
+ dnl Define SET_MAKE to set ${MAKE} if make doesn't.
+-AC_DEFUN(AC_PROG_MAKE_SET,
++AC_DEFUN([AC_PROG_MAKE_SET],
+ [AC_MSG_CHECKING(whether ${MAKE-make} sets \${MAKE})
+ set dummy ${MAKE-make}; ac_make=`echo "[$]2" | sed 'y%./+-%__p_%'`
+ AC_CACHE_VAL(ac_cv_prog_make_${ac_make}_set,
+@@ -476,17 +476,17 @@
+ AC_SUBST([SET_MAKE])dnl
+ ])
+ 
+-AC_DEFUN(AC_PROG_RANLIB,
++AC_DEFUN([AC_PROG_RANLIB],
+ [AC_CHECK_PROG(RANLIB, ranlib, ranlib, :)])
+ 
+ dnl Check for mawk first since it's generally faster.
+-AC_DEFUN(AC_PROG_AWK,
++AC_DEFUN([AC_PROG_AWK],
+ [AC_CHECK_PROGS(AWK, mawk gawk nawk awk, )])
+ 
+-AC_DEFUN(AC_PROG_YACC,
++AC_DEFUN([AC_PROG_YACC],
+ [AC_CHECK_PROGS(YACC, 'bison -y' byacc, yacc)])
+ 
+-AC_DEFUN(AC_PROG_CPP,
++AC_DEFUN([AC_PROG_CPP],
+ [AC_MSG_CHECKING(how to run the C preprocessor)
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+@@ -518,7 +518,7 @@
+ AC_SUBST(CPP)dnl
+ ])
+ 
+-AC_DEFUN(AC_PROG_CXXCPP,
++AC_DEFUN([AC_PROG_CXXCPP],
+ [AC_MSG_CHECKING(how to run the C++ preprocessor)
+ if test -z "$CXXCPP"; then
+ AC_CACHE_VAL(ac_cv_prog_CXXCPP,
+@@ -537,10 +537,10 @@
+ 
+ dnl Require finding the C or C++ preprocessor, whichever is the
+ dnl current language.
+-AC_DEFUN(AC_REQUIRE_CPP,
++AC_DEFUN([AC_REQUIRE_CPP],
+ [ifelse(AC_LANG, C, [AC_REQUIRE([AC_PROG_CPP])], [AC_REQUIRE([AC_PROG_CXXCPP])])])
+ 
+-AC_DEFUN(AC_PROG_LEX,
++AC_DEFUN([AC_PROG_LEX],
+ [AC_CHECK_PROG(LEX, flex, flex, lex)
+ if test -z "$LEXLIB"
+ then
+@@ -554,7 +554,7 @@
+ 
+ dnl Check if lex declares yytext as a char * by default, not a char[].
+ undefine([AC_DECL_YYTEXT])
+-AC_DEFUN(AC_DECL_YYTEXT,
++AC_DEFUN([AC_DECL_YYTEXT],
+ [AC_REQUIRE_CPP()dnl
+ AC_REQUIRE([AC_PROG_LEX])dnl
+ AC_CACHE_CHECK(lex output file root, ac_cv_prog_lex_root,
+@@ -660,7 +660,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_PROG_INSTALL,
++AC_DEFUN([AC_PROG_INSTALL],
+ [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+@@ -730,7 +730,7 @@
+ AC_SUBST(INSTALL_DATA)dnl
+ ])
+ 
+-AC_DEFUN(AC_PROG_LN_S,
++AC_DEFUN([AC_PROG_LN_S],
+ [AC_MSG_CHECKING(whether ln -s works)
+ AC_CACHE_VAL(ac_cv_prog_LN_S,
+ [rm -f conftestdata
+@@ -752,7 +752,7 @@
+ AC_SUBST(LN_S)dnl
+ ])
+ 
+-define(AC_RSH,
++define([AC_RSH],
+ [errprint(__file__:__line__: [$0] has been removed; replace it with equivalent code
+ )m4exit(4)])
+ 
+@@ -760,7 +760,7 @@
+ dnl ### Checks for header files
+ 
+ 
+-AC_DEFUN(AC_HEADER_STDC,
++AC_DEFUN([AC_HEADER_STDC],
+ [AC_REQUIRE_CPP()dnl
+ AC_CACHE_CHECK(for ANSI C header files, ac_cv_header_stdc,
+ [AC_TRY_CPP([#include <stdlib.h>
+@@ -794,11 +794,11 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_UNISTD_H,
++AC_DEFUN([AC_UNISTD_H],
+ [AC_OBSOLETE([$0], [; instead use AC_CHECK_HEADERS(unistd.h)])dnl
+ AC_CHECK_HEADER(unistd.h, AC_DEFINE(HAVE_UNISTD_H))])
+ 
+-AC_DEFUN(AC_USG,
++AC_DEFUN([AC_USG],
+ [AC_OBSOLETE([$0],
+   [; instead use AC_CHECK_HEADERS(string.h) and HAVE_STRING_H])dnl
+ AC_MSG_CHECKING([for BSD string and memory functions])
+@@ -808,7 +808,7 @@
+ 
+ dnl If memchr and the like aren't declared in <string.h>, include <memory.h>.
+ dnl To avoid problems, don't check for gcc2 built-ins.
+-AC_DEFUN(AC_MEMORY_H,
++AC_DEFUN([AC_MEMORY_H],
+ [AC_OBSOLETE([$0], [; instead use AC_CHECK_HEADERS(memory.h) and HAVE_MEMORY_H])dnl
+ AC_MSG_CHECKING(whether string.h declares mem functions)
+ AC_EGREP_HEADER(memchr, string.h, ac_found=yes, ac_found=no)
+@@ -818,7 +818,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_HEADER_MAJOR,
++AC_DEFUN([AC_HEADER_MAJOR],
+ [AC_CACHE_CHECK(whether sys/types.h defines makedev,
+   ac_cv_header_sys_types_h_makedev,
+ [AC_TRY_LINK([#include <sys/types.h>], [return makedev(0, 0);],
+@@ -834,7 +834,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_HEADER_DIRENT,
++AC_DEFUN([AC_HEADER_DIRENT],
+ [ac_header_dirent=no
+ AC_CHECK_HEADERS_DIRENT(dirent.h sys/ndir.h sys/dir.h ndir.h,
+   [ac_header_dirent=$ac_hdr; break])
+@@ -849,7 +849,7 @@
+ dnl Like AC_CHECK_HEADER, except also make sure that HEADER-FILE
+ dnl defines the type `DIR'.  dirent.h on NextStep 3.2 doesn't.
+ dnl AC_CHECK_HEADER_DIRENT(HEADER-FILE, ACTION-IF-FOUND)
+-AC_DEFUN(AC_CHECK_HEADER_DIRENT,
++AC_DEFUN([AC_CHECK_HEADER_DIRENT],
+ [ac_safe=`echo "$1" | sed 'y%./+-%__p_%'`
+ AC_MSG_CHECKING([for $1 that defines DIR])
+ AC_CACHE_VAL(ac_cv_header_dirent_$ac_safe,
+@@ -868,7 +868,7 @@
+ dnl Like AC_CHECK_HEADERS, except succeed only for a HEADER-FILE that
+ dnl defines `DIR'.
+ dnl AC_CHECK_HEADERS_DIRENT(HEADER-FILE... [, ACTION])
+-define(AC_CHECK_HEADERS_DIRENT,
++define([AC_CHECK_HEADERS_DIRENT],
+ [for ac_hdr in $1
+ do
+ AC_CHECK_HEADER_DIRENT($ac_hdr,
+@@ -878,7 +878,7 @@
+   AC_DEFINE_UNQUOTED($ac_tr_hdr) $2])dnl
+ done])
+ 
+-AC_DEFUN(AC_DIR_HEADER,
++AC_DEFUN([AC_DIR_HEADER],
+ [AC_OBSOLETE([$0], [; instead use AC_HEADER_DIRENT])dnl
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+@@ -902,7 +902,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_HEADER_STAT,
++AC_DEFUN([AC_HEADER_STAT],
+ [AC_CACHE_CHECK(whether stat file-mode macros are broken,
+   ac_cv_header_stat_broken,
+ [AC_EGREP_CPP([You lose], [#include <sys/types.h>
+@@ -937,7 +937,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_DECL_SYS_SIGLIST,
++AC_DEFUN([AC_DECL_SYS_SIGLIST],
+ [AC_CACHE_CHECK([for sys_siglist declaration in signal.h or unistd.h],
+   ac_cv_decl_sys_siglist,
+ [AC_TRY_COMPILE([#include <sys/types.h>
+@@ -952,7 +952,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_HEADER_SYS_WAIT,
++AC_DEFUN([AC_HEADER_SYS_WAIT],
+ [AC_CACHE_CHECK([for sys/wait.h that is POSIX.1 compatible],
+   ac_cv_header_sys_wait_h,
+ [AC_TRY_COMPILE([#include <sys/types.h>
+@@ -975,7 +975,7 @@
+ dnl ### Checks for typedefs
+ 
+ 
+-AC_DEFUN(AC_TYPE_GETGROUPS,
++AC_DEFUN([AC_TYPE_GETGROUPS],
+ [AC_REQUIRE([AC_TYPE_UID_T])dnl
+ AC_CACHE_CHECK(type of array argument to getgroups, ac_cv_type_getgroups,
+ [AC_TRY_RUN(
+@@ -1015,7 +1015,7 @@
+ AC_DEFINE_UNQUOTED(GETGROUPS_T, $ac_cv_type_getgroups)
+ ])
+ 
+-AC_DEFUN(AC_TYPE_UID_T,
++AC_DEFUN([AC_TYPE_UID_T],
+ [AC_CACHE_CHECK(for uid_t in sys/types.h, ac_cv_type_uid_t,
+ [AC_EGREP_HEADER(uid_t, sys/types.h,
+   ac_cv_type_uid_t=yes, ac_cv_type_uid_t=no)])
+@@ -1025,20 +1025,20 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_TYPE_SIZE_T,
++AC_DEFUN([AC_TYPE_SIZE_T],
+ [AC_CHECK_TYPE(size_t, unsigned)])
+ 
+-AC_DEFUN(AC_TYPE_PID_T,
++AC_DEFUN([AC_TYPE_PID_T],
+ [AC_CHECK_TYPE(pid_t, int)])
+ 
+-AC_DEFUN(AC_TYPE_OFF_T,
++AC_DEFUN([AC_TYPE_OFF_T],
+ [AC_CHECK_TYPE(off_t, long)])
+ 
+-AC_DEFUN(AC_TYPE_MODE_T,
++AC_DEFUN([AC_TYPE_MODE_T],
+ [AC_CHECK_TYPE(mode_t, int)])
+ 
+ dnl Note that identifiers starting with SIG are reserved by ANSI C.
+-AC_DEFUN(AC_TYPE_SIGNAL,
++AC_DEFUN([AC_TYPE_SIGNAL],
+ [AC_CACHE_CHECK([return type of signal handlers], ac_cv_type_signal,
+ [AC_TRY_COMPILE([#include <sys/types.h>
+ #include <signal.h>
+@@ -1059,7 +1059,7 @@
+ dnl ### Checks for functions
+ 
+ 
+-AC_DEFUN(AC_FUNC_CLOSEDIR_VOID,
++AC_DEFUN([AC_FUNC_CLOSEDIR_VOID],
+ [AC_REQUIRE([AC_HEADER_DIRENT])dnl
+ AC_CACHE_CHECK(whether closedir returns void, ac_cv_func_closedir_void,
+ [AC_TRY_RUN([#include <sys/types.h>
+@@ -1071,7 +1071,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_FUNC_FNMATCH,
++AC_DEFUN([AC_FUNC_FNMATCH],
+ [AC_CACHE_CHECK(for working fnmatch, ac_cv_func_fnmatch_works,
+ # Some versions of Solaris or SCO have a broken fnmatch function.
+ # So we run a test program.  If we are cross-compiling, take no chance.
+@@ -1084,7 +1084,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_FUNC_MMAP,
++AC_DEFUN([AC_FUNC_MMAP],
+ [AC_CHECK_HEADERS(unistd.h)
+ AC_CHECK_FUNCS(getpagesize)
+ AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped,
+@@ -1231,7 +1231,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_FUNC_GETPGRP,
++AC_DEFUN([AC_FUNC_GETPGRP],
+ [AC_CACHE_CHECK(whether getpgrp takes no argument, ac_cv_func_getpgrp_void,
+ [AC_TRY_RUN([
+ /*
+@@ -1292,7 +1292,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_FUNC_SETPGRP,
++AC_DEFUN([AC_FUNC_SETPGRP],
+ [AC_CACHE_CHECK(whether setpgrp takes no argument, ac_cv_func_setpgrp_void,
+ AC_TRY_RUN([
+ #ifdef HAVE_UNISTD_H
+@@ -1318,14 +1318,14 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_FUNC_VPRINTF,
++AC_DEFUN([AC_FUNC_VPRINTF],
+ [AC_CHECK_FUNC(vprintf, AC_DEFINE(HAVE_VPRINTF))
+ if test "$ac_cv_func_vprintf" != yes; then
+ AC_CHECK_FUNC(_doprnt, AC_DEFINE(HAVE_DOPRNT))
+ fi
+ ])
+ 
+-AC_DEFUN(AC_FUNC_VFORK,
++AC_DEFUN([AC_FUNC_VFORK],
+ [AC_REQUIRE([AC_TYPE_PID_T])dnl
+ AC_CHECK_HEADER(vfork.h, AC_DEFINE(HAVE_VFORK_H))
+ AC_CACHE_CHECK(for working vfork, ac_cv_func_vfork_works,
+@@ -1428,7 +1428,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_FUNC_WAIT3,
++AC_DEFUN([AC_FUNC_WAIT3],
+ [AC_CACHE_CHECK(for wait3 that fills in rusage, ac_cv_func_wait3_rusage,
+ [AC_TRY_RUN([#include <sys/types.h>
+ #include <sys/time.h>
+@@ -1464,7 +1464,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_FUNC_ALLOCA,
++AC_DEFUN([AC_FUNC_ALLOCA],
+ [AC_REQUIRE_CPP()dnl Set CPP; we run AC_EGREP_CPP conditionally.
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+@@ -1549,7 +1549,7 @@
+ AC_SUBST(ALLOCA)dnl
+ ])
+ 
+-AC_DEFUN(AC_FUNC_GETLOADAVG,
++AC_DEFUN([AC_FUNC_GETLOADAVG],
+ [ac_have_func=no # yes means we've found a way to get the load average.
+ 
+ # Some systems with -lutil have (and need) -lkvm as well, some do not.
+@@ -1651,7 +1651,7 @@
+ AC_SUBST(KMEM_GROUP)dnl
+ ])
+ 
+-AC_DEFUN(AC_FUNC_UTIME_NULL,
++AC_DEFUN([AC_FUNC_UTIME_NULL],
+ [AC_CACHE_CHECK(whether utime accepts a null argument, ac_cv_func_utime_null,
+ [rm -f conftestdata; > conftestdata
+ # Sequent interprets utime(file, 0) to mean use start of epoch.  Wrong.
+@@ -1670,7 +1670,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_FUNC_STRCOLL,
++AC_DEFUN([AC_FUNC_STRCOLL],
+ [AC_CACHE_CHECK(for working strcoll, ac_cv_func_strcoll_works,
+ [AC_TRY_RUN([#include <string.h>
+ main ()
+@@ -1685,7 +1685,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_FUNC_SETVBUF_REVERSED,
++AC_DEFUN([AC_FUNC_SETVBUF_REVERSED],
+ [AC_CACHE_CHECK(whether setvbuf arguments are reversed,
+   ac_cv_func_setvbuf_reversed,
+ [AC_TRY_RUN([#include <stdio.h>
+@@ -1705,21 +1705,21 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_FUNC_GETMNTENT,
++AC_DEFUN([AC_FUNC_GETMNTENT],
+ [# getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX, -lgen on Unixware.
+ AC_CHECK_LIB(sun, getmntent, LIBS="-lsun $LIBS",
+   [AC_CHECK_LIB(seq, getmntent, LIBS="-lseq $LIBS",
+     [AC_CHECK_LIB(gen, getmntent, LIBS="-lgen $LIBS")])])
+ AC_CHECK_FUNC(getmntent, [AC_DEFINE(HAVE_GETMNTENT)])])
+ 
+-AC_DEFUN(AC_FUNC_STRFTIME,
++AC_DEFUN([AC_FUNC_STRFTIME],
+ [AC_CHECK_FUNC(strftime, [AC_DEFINE(HAVE_STRFTIME)],
+ [# strftime is in -lintl on SCO UNIX.
+ AC_CHECK_LIB(intl, strftime, 
+ [AC_DEFINE(HAVE_STRFTIME)
+ LIBS="-lintl $LIBS"])])])
+ 
+-AC_DEFUN(AC_FUNC_MEMCMP,
++AC_DEFUN([AC_FUNC_MEMCMP],
+ [AC_CACHE_CHECK(for 8-bit clean memcmp, ac_cv_func_memcmp_clean,
+ [AC_TRY_RUN([
+ main()
+@@ -1733,7 +1733,7 @@
+ AC_SUBST(LIBOBJS)dnl
+ ])
+ 
+-AC_DEFUN(AC_FUNC_SELECT_ARGTYPES,
++AC_DEFUN([AC_FUNC_SELECT_ARGTYPES],
+ [AC_MSG_CHECKING([types of arguments for select()])
+  AC_CACHE_VAL(ac_cv_func_select_arg234,dnl
+  [AC_CACHE_VAL(ac_cv_func_select_arg1,dnl
+@@ -1777,7 +1777,7 @@
+ dnl ### Checks for structure members
+ 
+ 
+-AC_DEFUN(AC_HEADER_TIME,
++AC_DEFUN([AC_HEADER_TIME],
+ [AC_CACHE_CHECK([whether time.h and sys/time.h may both be included],
+   ac_cv_header_time,
+ [AC_TRY_COMPILE([#include <sys/types.h>
+@@ -1789,7 +1789,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_STRUCT_TM,
++AC_DEFUN([AC_STRUCT_TM],
+ [AC_CACHE_CHECK([whether struct tm is in sys/time.h or time.h],
+   ac_cv_struct_tm,
+ [AC_TRY_COMPILE([#include <sys/types.h>
+@@ -1801,7 +1801,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_STRUCT_TIMEZONE,
++AC_DEFUN([AC_STRUCT_TIMEZONE],
+ [AC_REQUIRE([AC_STRUCT_TM])dnl
+ AC_CACHE_CHECK([for tm_zone in struct tm], ac_cv_struct_tm_zone,
+ [AC_TRY_COMPILE([#include <sys/types.h>
+@@ -1825,7 +1825,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_STRUCT_ST_BLOCKS,
++AC_DEFUN([AC_STRUCT_ST_BLOCKS],
+ [AC_CACHE_CHECK([for st_blocks in struct stat], ac_cv_struct_st_blocks,
+ [AC_TRY_COMPILE([#include <sys/types.h>
+ #include <sys/stat.h>], [struct stat s; s.st_blocks;],
+@@ -1838,7 +1838,7 @@
+ AC_SUBST(LIBOBJS)dnl
+ ])
+ 
+-AC_DEFUN(AC_STRUCT_ST_BLKSIZE,
++AC_DEFUN([AC_STRUCT_ST_BLKSIZE],
+ [AC_CACHE_CHECK([for st_blksize in struct stat], ac_cv_struct_st_blksize,
+ [AC_TRY_COMPILE([#include <sys/types.h>
+ #include <sys/stat.h>], [struct stat s; s.st_blksize;],
+@@ -1848,7 +1848,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_STRUCT_ST_RDEV,
++AC_DEFUN([AC_STRUCT_ST_RDEV],
+ [AC_CACHE_CHECK([for st_rdev in struct stat], ac_cv_struct_st_rdev,
+ [AC_TRY_COMPILE([#include <sys/types.h>
+ #include <sys/stat.h>], [struct stat s; s.st_rdev;],
+@@ -1862,10 +1862,10 @@
+ dnl ### Checks for compiler characteristics
+ 
+ 
+-AC_DEFUN(AC_C_CROSS,
++AC_DEFUN([AC_C_CROSS],
+ [AC_OBSOLETE([$0], [; it has been merged into AC_PROG_CC])])
+ 
+-AC_DEFUN(AC_C_CHAR_UNSIGNED,
++AC_DEFUN([AC_C_CHAR_UNSIGNED],
+ [AC_CACHE_CHECK(whether char is unsigned, ac_cv_c_char_unsigned,
+ [if test "$GCC" = yes; then
+   # GCC predefines this symbol on systems where it applies.
+@@ -1889,7 +1889,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_C_LONG_DOUBLE,
++AC_DEFUN([AC_C_LONG_DOUBLE],
+ [AC_CACHE_CHECK(for long double, ac_cv_c_long_double,
+ [if test "$GCC" = yes; then
+   ac_cv_c_long_double=yes
+@@ -1906,7 +1906,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_INT_16_BITS,
++AC_DEFUN([AC_INT_16_BITS],
+ [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(int)])dnl
+ AC_MSG_CHECKING(whether int is 16 bits)
+ AC_TRY_RUN([main() { exit(sizeof(int) != 2); }],
+@@ -1914,7 +1914,7 @@
+  AC_DEFINE(INT_16_BITS)], AC_MSG_RESULT(no))
+ ])
+ 
+-AC_DEFUN(AC_LONG_64_BITS,
++AC_DEFUN([AC_LONG_64_BITS],
+ [AC_OBSOLETE([$0], [; instead use AC_CHECK_SIZEOF(long)])dnl
+ AC_MSG_CHECKING(whether long int is 64 bits)
+ AC_TRY_RUN([main() { exit(sizeof(long int) != 8); }],
+@@ -1922,7 +1922,7 @@
+  AC_DEFINE(LONG_64_BITS)], AC_MSG_RESULT(no))
+ ])
+ 
+-AC_DEFUN(AC_C_BIGENDIAN,
++AC_DEFUN([AC_C_BIGENDIAN],
+ [AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian,
+ [ac_cv_c_bigendian=unknown
+ # See if sys/param.h defines the BYTE_ORDER macro.
+@@ -1956,7 +1956,7 @@
+ dnl Do nothing if the compiler accepts the inline keyword.
+ dnl Otherwise define inline to __inline__ or __inline if one of those work,
+ dnl otherwise define inline to be empty.
+-AC_DEFUN(AC_C_INLINE,
++AC_DEFUN([AC_C_INLINE],
+ [AC_CACHE_CHECK([for inline], ac_cv_c_inline,
+ [ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+@@ -1970,7 +1970,7 @@
+ esac
+ ])
+ 
+-AC_DEFUN(AC_C_CONST,
++AC_DEFUN([AC_C_CONST],
+ [dnl This message is consistent in form with the other checking messages,
+ dnl and with the result message.
+ AC_CACHE_CHECK([for working const], ac_cv_c_const,
+@@ -2026,7 +2026,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_C_STRINGIZE, [
++AC_DEFUN([AC_C_STRINGIZE], [
+ AC_REQUIRE([AC_PROG_CPP])
+ AC_MSG_CHECKING([for preprocessor stringizing operator])
+ AC_CACHE_VAL(ac_cv_c_stringize,
+@@ -2042,14 +2042,14 @@
+ AC_MSG_RESULT([${ac_cv_c_stringize}])
+ ])dnl
+ 
+-define(AC_ARG_ARRAY,
++define([AC_ARG_ARRAY],
+ [errprint(__file__:__line__: [$0] has been removed; don't do unportable things with arguments
+ )m4exit(4)])
+ 
+ dnl Check the object extension used by the compiler: typically .o or
+ dnl .obj.  If this is called, some other behaviour will change,
+ dnl determined by ac_objext.
+-AC_DEFUN(AC_OBJEXT,
++AC_DEFUN([AC_OBJEXT],
+ [AC_MSG_CHECKING([for object suffix])
+ AC_CACHE_VAL(ac_cv_objext,
+ [rm -f conftest*
+@@ -2098,7 +2098,7 @@
+ dnl extremely useful macro.  Thank you John.
+ dnl
+ dnl AC_F77_LIBRARY_LDFLAGS()
+-AC_DEFUN(AC_F77_LIBRARY_LDFLAGS,
++AC_DEFUN([AC_F77_LIBRARY_LDFLAGS],
+ [AC_MSG_CHECKING([for Fortran 77 libraries])
+ AC_REQUIRE([AC_PROG_F77])
+ AC_REQUIRE([AC_CANONICAL_HOST])
+@@ -2285,7 +2285,7 @@
+ dnl ### Checks for operating system services
+ 
+ 
+-AC_DEFUN(AC_SYS_INTERPRETER,
++AC_DEFUN([AC_SYS_INTERPRETER],
+ [# Pull the hash mark out of the macro call to avoid m4 problems.
+ ac_msg="whether #! works in shell scripts"
+ AC_CACHE_CHECK($ac_msg, ac_cv_sys_interpreter,
+@@ -2303,11 +2303,11 @@
+ interpval="$ac_cv_sys_interpreter"
+ ])
+ 
+-define(AC_HAVE_POUNDBANG,
++define([AC_HAVE_POUNDBANG],
+ [errprint(__file__:__line__: [$0 has been replaced by AC_SYS_INTERPRETER, taking no arguments
+ ])m4exit(4)])
+ 
+-AC_DEFUN(AC_SYS_LONG_FILE_NAMES,
++AC_DEFUN([AC_SYS_LONG_FILE_NAMES],
+ [AC_CACHE_CHECK(for long file names, ac_cv_sys_long_file_names,
+ [ac_cv_sys_long_file_names=yes
+ # Test for long file names in all the places we know might matter:
+@@ -2343,7 +2343,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_SYS_RESTARTABLE_SYSCALLS,
++AC_DEFUN([AC_SYS_RESTARTABLE_SYSCALLS],
+ [AC_CACHE_CHECK(for restartable system calls, ac_cv_sys_restartable_syscalls,
+ [AC_TRY_RUN(
+ [/* Exit 0 (true) if wait returns something other than -1,
+@@ -2366,7 +2366,7 @@
+ fi
+ ])
+ 
+-AC_DEFUN(AC_PATH_X,
++AC_DEFUN([AC_PATH_X],
+ [AC_REQUIRE_CPP()dnl Set CPP; we run AC_PATH_X_DIRECT conditionally.
+ # If we find X, set shell vars x_includes and x_libraries to the
+ # paths, otherwise set no_x=yes.
+@@ -2417,7 +2417,7 @@
+ 
+ dnl Internal subroutine of AC_PATH_X.
+ dnl Set ac_x_includes and/or ac_x_libraries.
+-AC_DEFUN(AC_PATH_X_XMKMF,
++AC_DEFUN([AC_PATH_X_XMKMF],
+ [rm -fr conftestdir
+ if mkdir conftestdir; then
+   cd conftestdir
+@@ -2455,7 +2455,7 @@
+ 
+ dnl Internal subroutine of AC_PATH_X.
+ dnl Set ac_x_includes and/or ac_x_libraries.
+-AC_DEFUN(AC_PATH_X_DIRECT,
++AC_DEFUN([AC_PATH_X_DIRECT],
+ [if test "$ac_x_includes" = NO; then
+   # Guess where to find include files, by looking for this one X11 .h file.
+   test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
+@@ -2577,7 +2577,7 @@
+ ])
+ 
+ dnl Find additional X libraries, magic flags, etc.
+-AC_DEFUN(AC_PATH_XTRA,
++AC_DEFUN([AC_PATH_XTRA],
+ [AC_REQUIRE([AC_PATH_X])dnl
+ if test "$no_x" = yes; then
+   # Not all programs may use this symbol, but it does not hurt to define it.
+@@ -2690,13 +2690,13 @@
+ ])
+ 
+ dnl The old Cygwin32 macro is deprecated.
+-AC_DEFUN(AC_CYGWIN32,
++AC_DEFUN([AC_CYGWIN32],
+ [AC_OBSOLETE([$0], [; instead use AC_CYGWIN])dnl
+ AC_CYGWIN])
+ 
+ dnl Check for Cygwin.  This is a way to set the right value for
+ dnl EXEEXT.
+-AC_DEFUN(AC_CYGWIN,
++AC_DEFUN([AC_CYGWIN],
+ [AC_CACHE_CHECK(for Cygwin environment, ac_cv_cygwin,
+ [AC_TRY_COMPILE(,[
+ #ifndef __CYGWIN__
+@@ -2710,7 +2710,7 @@
+ 
+ dnl Check for mingw32.  This is another way to set the right value for
+ dnl EXEEXT.
+-AC_DEFUN(AC_MINGW32,
++AC_DEFUN([AC_MINGW32],
+ [AC_CACHE_CHECK(for mingw32 environment, ac_cv_mingw32,
+ [AC_TRY_COMPILE(,[return __MINGW32__;],
+ ac_cv_mingw32=yes, ac_cv_mingw32=no)
+@@ -2719,7 +2719,7 @@
+ test "$ac_cv_mingw32" = yes && MINGW32=yes])
+ 
+ dnl Check for djgpp.
+-AC_DEFUN(AC_DJGPP,
++AC_DEFUN([AC_DJGPP],
+ [AC_CACHE_CHECK(for djgpp environment, ac_cv_djgpp,
+ [AC_TRY_COMPILE(,[
+ #if defined (DJGPP) || defined (__DJGPP__)
+@@ -2732,7 +2732,7 @@
+ test "$ac_cv_djgpp" = yes && HAVE_DJGPP=yes])
+ 
+ dnl Check for win32.
+-AC_DEFUN(AC_WIN32,
++AC_DEFUN([AC_WIN32],
+ [AC_CACHE_CHECK(for win32 environment, ac_cv_win32,
+ [AC_TRY_COMPILE(,[
+ #if defined(WIN32) || defined(__WIN32__) || defined(_WIN32)
+@@ -2748,7 +2748,7 @@
+ dnl add .exe for Cygwin or mingw32.  Otherwise, it compiles a test
+ dnl executable.  If this is called, the executable extensions will be
+ dnl automatically used by link commands run by the configure script.
+-AC_DEFUN(AC_EXE