|
 |
35a2604 |
--- a2ps-4.13/m4/c-bs-a.m4.underquoted 2004-12-07 15:48:56.317799029 +0000
|
|
 |
35a2604 |
+++ a2ps-4.13/m4/c-bs-a.m4 2004-12-07 15:49:09.240315913 +0000
|
|
 |
35a2604 |
@@ -2,7 +2,7 @@
|
|
 |
35a2604 |
|
|
 |
35a2604 |
dnl From Paul Eggert.
|
|
 |
35a2604 |
|
|
 |
35a2604 |
-AC_DEFUN(AC_C_BACKSLASH_A,
|
|
 |
35a2604 |
+AC_DEFUN([AC_C_BACKSLASH_A],
|
|
 |
35a2604 |
[
|
|
 |
35a2604 |
AC_CACHE_CHECK([whether backslash-a works in strings], ac_cv_c_backslash_a,
|
|
 |
35a2604 |
[AC_TRY_COMPILE([],
|
|
 |
35a2604 |
@@ -22,7 +22,7 @@
|
|
 |
35a2604 |
fi
|
|
 |
35a2604 |
])
|
|
 |
35a2604 |
|
|
 |
35a2604 |
-AC_DEFUN(jm_PREREQ_QUOTEARG,
|
|
 |
35a2604 |
+AC_DEFUN([jm_PREREQ_QUOTEARG],
|
|
 |
35a2604 |
[
|
|
 |
35a2604 |
AC_CHECK_FUNCS(isascii mbrtowc)
|
|
 |
35a2604 |
AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h)
|
|
 |
35a2604 |
--- a2ps-4.13/m4/error.m4.underquoted 2004-12-07 15:49:21.559948942 +0000
|
|
 |
35a2604 |
+++ a2ps-4.13/m4/error.m4 2004-12-07 15:49:28.235666455 +0000
|
|
 |
35a2604 |
@@ -1,7 +1,7 @@
|
|
 |
35a2604 |
dnl From Jim Meyering. Use this if you use the GNU error.[ch].
|
|
 |
35a2604 |
dnl FIXME: Migrate into libit
|
|
 |
35a2604 |
|
|
 |
35a2604 |
-AC_DEFUN(AM_FUNC_ERROR_AT_LINE,
|
|
 |
35a2604 |
+AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
|
|
 |
35a2604 |
[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
|
|
 |
35a2604 |
[AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
|
|
 |
35a2604 |
am_cv_lib_error_at_line=yes,
|
|
 |
35a2604 |
--- a2ps-4.13/m4/obstack.m4.underquoted 2004-12-07 15:49:39.826439920 +0000
|
|
 |
35a2604 |
+++ a2ps-4.13/m4/obstack.m4 2004-12-07 15:49:49.827518954 +0000
|
|
 |
35a2604 |
@@ -1,7 +1,7 @@
|
|
 |
35a2604 |
dnl From Jim Meyering.
|
|
 |
35a2604 |
dnl FIXME: migrate into libit.
|
|
 |
35a2604 |
|
|
 |
35a2604 |
-AC_DEFUN(AM_FUNC_OBSTACK,
|
|
 |
35a2604 |
+AC_DEFUN([AM_FUNC_OBSTACK],
|
|
 |
35a2604 |
[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack,
|
|
 |
35a2604 |
[AC_TRY_LINK([#include "obstack.h"],
|
|
 |
35a2604 |
[struct obstack *mem;obstack_free(mem,(char *) 0)],
|
|
 |
35a2604 |
--- a2ps-4.13/m4/libtool.m4.underquoted 2004-12-07 15:50:24.793804138 +0000
|
|
 |
35a2604 |
+++ a2ps-4.13/m4/libtool.m4 2004-12-07 15:52:28.530057547 +0000
|
|
 |
35a2604 |
@@ -22,7 +22,7 @@
|
|
 |
35a2604 |
## the same distribution terms that you use for the rest of that program.
|
|
 |
35a2604 |
|
|
 |
35a2604 |
# serial 40 AC_PROG_LIBTOOL
|
|
 |
35a2604 |
-AC_DEFUN(AC_PROG_LIBTOOL,
|
|
 |
35a2604 |
+AC_DEFUN([AC_PROG_LIBTOOL],
|
|
 |
35a2604 |
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
|
|
 |
35a2604 |
|
|
 |
35a2604 |
# Save cache, so that ltconfig can load it
|
|
 |
35a2604 |
@@ -52,7 +52,7 @@
|
|
 |
35a2604 |
exec 5>>./config.log
|
|
 |
35a2604 |
])
|
|
 |
35a2604 |
|
|
 |
35a2604 |
-AC_DEFUN(AC_LIBTOOL_SETUP,
|
|
 |
35a2604 |
+AC_DEFUN([AC_LIBTOOL_SETUP],
|
|
 |
35a2604 |
[AC_PREREQ(2.13)dnl
|
|
 |
35a2604 |
AC_REQUIRE([AC_ENABLE_SHARED])dnl
|
|
 |
35a2604 |
AC_REQUIRE([AC_ENABLE_STATIC])dnl
|
|
 |
35a2604 |
@@ -132,16 +132,16 @@
|
|
 |
35a2604 |
])
|
|
 |
35a2604 |
|
|
 |
35a2604 |
# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
|
|
 |
35a2604 |
-AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
|
|
 |
35a2604 |
+AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
|
|
 |
35a2604 |
|
|
 |
35a2604 |
# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
|
|
 |
35a2604 |
-AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
|
|
 |
35a2604 |
+AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
|
|
 |
35a2604 |
|
|
 |
35a2604 |
# AC_ENABLE_SHARED - implement the --enable-shared flag
|
|
 |
35a2604 |
# Usage: AC_ENABLE_SHARED[(DEFAULT)]
|
|
 |
35a2604 |
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
|
 |
35a2604 |
# `yes'.
|
|
 |
35a2604 |
-AC_DEFUN(AC_ENABLE_SHARED, [dnl
|
|
 |
35a2604 |
+AC_DEFUN([AC_ENABLE_SHARED], [dnl
|
|
 |
35a2604 |
define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
|
|
 |
35a2604 |
AC_ARG_ENABLE(shared,
|
|
 |
35a2604 |
changequote(<<, >>)dnl
|
|
 |
35a2604 |
@@ -167,14 +167,14 @@
|
|
 |
35a2604 |
])
|
|
 |
35a2604 |
|
|
 |
35a2604 |
# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
|
|
 |
35a2604 |
-AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
|
 |
35a2604 |
+AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
|
 |
35a2604 |
AC_ENABLE_SHARED(no)])
|
|
 |
35a2604 |
|
|
 |
35a2604 |
# AC_ENABLE_STATIC - implement the --enable-static flag
|
|
 |
35a2604 |
# Usage: AC_ENABLE_STATIC[(DEFAULT)]
|
|
 |
35a2604 |
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
|
 |
35a2604 |
# `yes'.
|
|
 |
35a2604 |
-AC_DEFUN(AC_ENABLE_STATIC, [dnl
|
|
 |
35a2604 |
+AC_DEFUN([AC_ENABLE_STATIC], [dnl
|
|
 |
35a2604 |
define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
|
|
 |
35a2604 |
AC_ARG_ENABLE(static,
|
|
 |
35a2604 |
changequote(<<, >>)dnl
|
|
 |
35a2604 |
@@ -200,7 +200,7 @@
|
|
 |
35a2604 |
])
|
|
 |
35a2604 |
|
|
 |
35a2604 |
# AC_DISABLE_STATIC - set the default static flag to --disable-static
|
|
 |
35a2604 |
-AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
|
 |
35a2604 |
+AC_DEFUN([AC_DISABLE_STATIC], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
|
 |
35a2604 |
AC_ENABLE_STATIC(no)])
|
|
 |
35a2604 |
|
|
 |
35a2604 |
|
|
 |
35a2604 |
@@ -208,7 +208,7 @@
|
|
 |
35a2604 |
# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
|
|
 |
35a2604 |
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
|
 |
35a2604 |
# `yes'.
|
|
 |
35a2604 |
-AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
|
|
 |
35a2604 |
+AC_DEFUN([AC_ENABLE_FAST_INSTALL], [dnl
|
|
 |
35a2604 |
define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
|
|
 |
35a2604 |
AC_ARG_ENABLE(fast-install,
|
|
 |
35a2604 |
changequote(<<, >>)dnl
|
|
 |
35a2604 |
@@ -234,11 +234,11 @@
|
|
 |
35a2604 |
])
|
|
 |
35a2604 |
|
|
 |
35a2604 |
# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
|
|
 |
35a2604 |
-AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
|
 |
35a2604 |
+AC_DEFUN([AC_DISABLE_FAST_INSTALL], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
|
 |
35a2604 |
AC_ENABLE_FAST_INSTALL(no)])
|
|
 |
35a2604 |
|
|
 |
35a2604 |
# AC_PROG_LD - find the path to the GNU or non-GNU linker
|
|
 |
35a2604 |
-AC_DEFUN(AC_PROG_LD,
|
|
 |
35a2604 |
+AC_DEFUN([AC_PROG_LD],
|
|
 |
35a2604 |
[AC_ARG_WITH(gnu-ld,
|
|
 |
35a2604 |
[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
|
|
 |
35a2604 |
test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
|
|
 |
35a2604 |
@@ -308,7 +308,7 @@
|
|
 |
35a2604 |
AC_PROG_LD_GNU
|
|
 |
35a2604 |
])
|
|
 |
35a2604 |
|
|
 |
35a2604 |
-AC_DEFUN(AC_PROG_LD_GNU,
|
|
 |
35a2604 |
+AC_DEFUN([AC_PROG_LD_GNU],
|
|
 |
35a2604 |
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
|
|
 |
35a2604 |
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
|
 |
35a2604 |
if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
|
|
 |
35a2604 |
@@ -319,7 +319,7 @@
|
|
 |
35a2604 |
])
|
|
 |
35a2604 |
|
|
 |
35a2604 |
# AC_PROG_NM - find the path to a BSD-compatible name lister
|
|
 |
35a2604 |
-AC_DEFUN(AC_PROG_NM,
|
|
 |
35a2604 |
+AC_DEFUN([AC_PROG_NM],
|
|
 |
35a2604 |
[AC_MSG_CHECKING([for BSD-compatible nm])
|
|
 |
35a2604 |
AC_CACHE_VAL(ac_cv_path_NM,
|
|
 |
35a2604 |
[if test -n "$NM"; then
|
|
 |
35a2604 |
@@ -353,7 +353,7 @@
|
|
 |
35a2604 |
])
|
|
 |
35a2604 |
|
|
 |
35a2604 |
# AC_CHECK_LIBM - check for math library
|
|
 |
35a2604 |
-AC_DEFUN(AC_CHECK_LIBM,
|
|
 |
35a2604 |
+AC_DEFUN([AC_CHECK_LIBM],
|
|
 |
35a2604 |
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
 |
35a2604 |
LIBM=
|
|
 |
35a2604 |
case "$lt_target" in
|
|
 |
35a2604 |
@@ -378,7 +378,7 @@
|
|
 |
35a2604 |
# '${top_builddir}/' (note the single quotes!) if your package is not
|
|
 |
35a2604 |
# flat, and, if you're not using automake, define top_builddir as
|
|
 |
35a2604 |
# appropriate in the Makefiles.
|
|
 |
35a2604 |
-AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
|
 |
35a2604 |
+AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
|
 |
35a2604 |
case "$enable_ltdl_convenience" in
|
|
 |
35a2604 |
no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
|
|
 |
35a2604 |
"") enable_ltdl_convenience=yes
|
|
 |
35a2604 |
@@ -397,7 +397,7 @@
|
|
 |
35a2604 |
# flat, and, if you're not using automake, define top_builddir as
|
|
 |
35a2604 |
# appropriate in the Makefiles.
|
|
 |
35a2604 |
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
|
|
 |
35a2604 |
-AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
|
 |
35a2604 |
+AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
|
 |
35a2604 |
AC_CHECK_LIB(ltdl, main,
|
|
 |
35a2604 |
[test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
|
|
 |
35a2604 |
[if test x"$enable_ltdl_install" = xno; then
|
|
 |
35a2604 |
@@ -418,13 +418,13 @@
|
|
 |
35a2604 |
])
|
|
 |
35a2604 |
|
|
 |
35a2604 |
dnl old names
|
|
 |
35a2604 |
-AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
|
|
 |
35a2604 |
-AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
|
|
 |
35a2604 |
-AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
|
|
 |
35a2604 |
-AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
|
|
 |
35a2604 |
-AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
|
|
 |
35a2604 |
-AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
|
|
 |
35a2604 |
-AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
|
|
 |
35a2604 |
+AC_DEFUN([AM_PROG_LIBTOOL], [indir([AC_PROG_LIBTOOL])])dnl
|
|
 |
35a2604 |
+AC_DEFUN([AM_ENABLE_SHARED], [indir([AC_ENABLE_SHARED], $@)])dnl
|
|
 |
35a2604 |
+AC_DEFUN([AM_ENABLE_STATIC], [indir([AC_ENABLE_STATIC], $@)])dnl
|
|
 |
35a2604 |
+AC_DEFUN([AM_DISABLE_SHARED], [indir([AC_DISABLE_SHARED], $@)])dnl
|
|
 |
35a2604 |
+AC_DEFUN([AM_DISABLE_STATIC], [indir([AC_DISABLE_STATIC], $@)])dnl
|
|
 |
35a2604 |
+AC_DEFUN([AM_PROG_LD], [indir([AC_PROG_LD])])dnl
|
|
 |
35a2604 |
+AC_DEFUN([AM_PROG_NM], [indir([AC_PROG_NM])])dnl
|
|
 |
35a2604 |
|
|
 |
35a2604 |
dnl This is just to silence aclocal about the macro not being used
|
|
 |
35a2604 |
ifelse([AC_DISABLE_FAST_INSTALL])dnl
|
|
 |
35a2604 |
--- a2ps-4.13/m4/lex.m4.underquoted 2004-12-07 15:53:11.815755409 +0000
|
|
 |
35a2604 |
+++ a2ps-4.13/m4/lex.m4 2004-12-07 15:53:20.523085631 +0000
|
|
 |
35a2604 |
@@ -3,7 +3,7 @@
|
|
 |
35a2604 |
|
|
 |
35a2604 |
dnl AM_PROG_LEX
|
|
 |
35a2604 |
dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
|
|
 |
35a2604 |
-AC_DEFUN(AM_PROG_LEX,
|
|
 |
35a2604 |
+AC_DEFUN([AM_PROG_LEX],
|
|
 |
35a2604 |
[AC_REQUIRE([AM_MISSING_HAS_RUN])
|
|
 |
35a2604 |
AC_CHECK_PROGS(LEX, flex lex, [${am_missing_run}flex])
|
|
 |
35a2604 |
AC_PROG_LEX
|