From 35a260427b256d7c1270b5bed8bd0f801c0961a3 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Dec 07 2004 17:34:16 +0000 Subject: - Fixed configure.in. - Fixed m4 files. --- diff --git a/a2ps-underquoted.patch b/a2ps-underquoted.patch new file mode 100644 index 0000000..4cd609d --- /dev/null +++ b/a2ps-underquoted.patch @@ -0,0 +1,208 @@ +--- a2ps-4.13/m4/c-bs-a.m4.underquoted 2004-12-07 15:48:56.317799029 +0000 ++++ a2ps-4.13/m4/c-bs-a.m4 2004-12-07 15:49:09.240315913 +0000 +@@ -2,7 +2,7 @@ + + dnl From Paul Eggert. + +-AC_DEFUN(AC_C_BACKSLASH_A, ++AC_DEFUN([AC_C_BACKSLASH_A], + [ + AC_CACHE_CHECK([whether backslash-a works in strings], ac_cv_c_backslash_a, + [AC_TRY_COMPILE([], +@@ -22,7 +22,7 @@ + fi + ]) + +-AC_DEFUN(jm_PREREQ_QUOTEARG, ++AC_DEFUN([jm_PREREQ_QUOTEARG], + [ + AC_CHECK_FUNCS(isascii mbrtowc) + AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h) +--- a2ps-4.13/m4/error.m4.underquoted 2004-12-07 15:49:21.559948942 +0000 ++++ a2ps-4.13/m4/error.m4 2004-12-07 15:49:28.235666455 +0000 +@@ -1,7 +1,7 @@ + dnl From Jim Meyering. Use this if you use the GNU error.[ch]. + dnl FIXME: Migrate into libit + +-AC_DEFUN(AM_FUNC_ERROR_AT_LINE, ++AC_DEFUN([AM_FUNC_ERROR_AT_LINE], + [AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line, + [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");], + am_cv_lib_error_at_line=yes, +--- a2ps-4.13/m4/obstack.m4.underquoted 2004-12-07 15:49:39.826439920 +0000 ++++ a2ps-4.13/m4/obstack.m4 2004-12-07 15:49:49.827518954 +0000 +@@ -1,7 +1,7 @@ + dnl From Jim Meyering. + dnl FIXME: migrate into libit. + +-AC_DEFUN(AM_FUNC_OBSTACK, ++AC_DEFUN([AM_FUNC_OBSTACK], + [AC_CACHE_CHECK([for obstacks], am_cv_func_obstack, + [AC_TRY_LINK([#include "obstack.h"], + [struct obstack *mem;obstack_free(mem,(char *) 0)], +--- a2ps-4.13/m4/libtool.m4.underquoted 2004-12-07 15:50:24.793804138 +0000 ++++ a2ps-4.13/m4/libtool.m4 2004-12-07 15:52:28.530057547 +0000 +@@ -22,7 +22,7 @@ + ## the same distribution terms that you use for the rest of that program. + + # serial 40 AC_PROG_LIBTOOL +-AC_DEFUN(AC_PROG_LIBTOOL, ++AC_DEFUN([AC_PROG_LIBTOOL], + [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl + + # Save cache, so that ltconfig can load it +@@ -52,7 +52,7 @@ + exec 5>>./config.log + ]) + +-AC_DEFUN(AC_LIBTOOL_SETUP, ++AC_DEFUN([AC_LIBTOOL_SETUP], + [AC_PREREQ(2.13)dnl + AC_REQUIRE([AC_ENABLE_SHARED])dnl + AC_REQUIRE([AC_ENABLE_STATIC])dnl +@@ -132,16 +132,16 @@ + ]) + + # AC_LIBTOOL_DLOPEN - enable checks for dlopen support +-AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) ++AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) + + # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's +-AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) ++AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) + + # AC_ENABLE_SHARED - implement the --enable-shared flag + # Usage: AC_ENABLE_SHARED[(DEFAULT)] + # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to + # `yes'. +-AC_DEFUN(AC_ENABLE_SHARED, [dnl ++AC_DEFUN([AC_ENABLE_SHARED], [dnl + define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl + AC_ARG_ENABLE(shared, + changequote(<<, >>)dnl +@@ -167,14 +167,14 @@ + ]) + + # AC_DISABLE_SHARED - set the default shared flag to --disable-shared +-AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + AC_ENABLE_SHARED(no)]) + + # AC_ENABLE_STATIC - implement the --enable-static flag + # Usage: AC_ENABLE_STATIC[(DEFAULT)] + # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to + # `yes'. +-AC_DEFUN(AC_ENABLE_STATIC, [dnl ++AC_DEFUN([AC_ENABLE_STATIC], [dnl + define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl + AC_ARG_ENABLE(static, + changequote(<<, >>)dnl +@@ -200,7 +200,7 @@ + ]) + + # AC_DISABLE_STATIC - set the default static flag to --disable-static +-AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_DEFUN([AC_DISABLE_STATIC], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + AC_ENABLE_STATIC(no)]) + + +@@ -208,7 +208,7 @@ + # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] + # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to + # `yes'. +-AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl ++AC_DEFUN([AC_ENABLE_FAST_INSTALL], [dnl + define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl + AC_ARG_ENABLE(fast-install, + changequote(<<, >>)dnl +@@ -234,11 +234,11 @@ + ]) + + # AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install +-AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_DEFUN([AC_DISABLE_FAST_INSTALL], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + AC_ENABLE_FAST_INSTALL(no)]) + + # AC_PROG_LD - find the path to the GNU or non-GNU linker +-AC_DEFUN(AC_PROG_LD, ++AC_DEFUN([AC_PROG_LD], + [AC_ARG_WITH(gnu-ld, + [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], + test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) +@@ -308,7 +308,7 @@ + AC_PROG_LD_GNU + ]) + +-AC_DEFUN(AC_PROG_LD_GNU, ++AC_DEFUN([AC_PROG_LD_GNU], + [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld, + [# I'd rather use --version here, but apparently some GNU ld's only accept -v. + if $LD -v 2>&1 &5; then +@@ -319,7 +319,7 @@ + ]) + + # AC_PROG_NM - find the path to a BSD-compatible name lister +-AC_DEFUN(AC_PROG_NM, ++AC_DEFUN([AC_PROG_NM], + [AC_MSG_CHECKING([for BSD-compatible nm]) + AC_CACHE_VAL(ac_cv_path_NM, + [if test -n "$NM"; then +@@ -353,7 +353,7 @@ + ]) + + # AC_CHECK_LIBM - check for math library +-AC_DEFUN(AC_CHECK_LIBM, ++AC_DEFUN([AC_CHECK_LIBM], + [AC_REQUIRE([AC_CANONICAL_HOST])dnl + LIBM= + case "$lt_target" in +@@ -378,7 +378,7 @@ + # '${top_builddir}/' (note the single quotes!) if your package is not + # flat, and, if you're not using automake, define top_builddir as + # appropriate in the Makefiles. +-AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + case "$enable_ltdl_convenience" in + no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; + "") enable_ltdl_convenience=yes +@@ -397,7 +397,7 @@ + # flat, and, if you're not using automake, define top_builddir as + # appropriate in the Makefiles. + # In the future, this macro may have to be called after AC_PROG_LIBTOOL. +-AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ++AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl + AC_CHECK_LIB(ltdl, main, + [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], + [if test x"$enable_ltdl_install" = xno; then +@@ -418,13 +418,13 @@ + ]) + + dnl old names +-AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl +-AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl +-AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl +-AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl +-AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl +-AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl +-AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl ++AC_DEFUN([AM_PROG_LIBTOOL], [indir([AC_PROG_LIBTOOL])])dnl ++AC_DEFUN([AM_ENABLE_SHARED], [indir([AC_ENABLE_SHARED], $@)])dnl ++AC_DEFUN([AM_ENABLE_STATIC], [indir([AC_ENABLE_STATIC], $@)])dnl ++AC_DEFUN([AM_DISABLE_SHARED], [indir([AC_DISABLE_SHARED], $@)])dnl ++AC_DEFUN([AM_DISABLE_STATIC], [indir([AC_DISABLE_STATIC], $@)])dnl ++AC_DEFUN([AM_PROG_LD], [indir([AC_PROG_LD])])dnl ++AC_DEFUN([AM_PROG_NM], [indir([AC_PROG_NM])])dnl + + dnl This is just to silence aclocal about the macro not being used + ifelse([AC_DISABLE_FAST_INSTALL])dnl +--- a2ps-4.13/m4/lex.m4.underquoted 2004-12-07 15:53:11.815755409 +0000 ++++ a2ps-4.13/m4/lex.m4 2004-12-07 15:53:20.523085631 +0000 +@@ -3,7 +3,7 @@ + + dnl AM_PROG_LEX + dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT +-AC_DEFUN(AM_PROG_LEX, ++AC_DEFUN([AM_PROG_LEX], + [AC_REQUIRE([AM_MISSING_HAS_RUN]) + AC_CHECK_PROGS(LEX, flex lex, [${am_missing_run}flex]) + AC_PROG_LEX diff --git a/a2ps.spec b/a2ps.spec index 600583d..e091aa9 100644 --- a/a2ps.spec +++ b/a2ps.spec @@ -30,6 +30,8 @@ Patch20: a2ps-4.13-hebrew.patch Patch21: a2ps-4.13-malloc.patch Patch22: a2ps-shell.patch Patch23: a2ps-includes.patch +Patch24: a2ps-underquoted.patch +Patch25: a2ps-autoconf.patch Requires: fileutils sh-utils info BuildRequires: /usr/bin/emacs, gperf, flex, libtool, texinfo Url: http://www.inf.enst.fr/~demaille/a2ps/ @@ -91,9 +93,18 @@ and medias. # Apply patch from bug #122699 to fix "too many includes" error. %patch23 -p1 -b .includes +# Fixed m4 files. +%patch24 -p1 -b .underquoted + +# Fixed configure.in. +%patch25 -p1 -b .autoconf + # Fix reference to a2ps binary (bug #112930). perl -pi -e "s,/usr/local/bin,%{_bindir}," contrib/emacs/a2ps.el libtoolize --copy --force +cp /usr/share/aclocal/libtool.m4 m4/ +aclocal -I m4 +autoconf %build chmod 644 {po/ja.po,encoding/euc-jp.edf,README.eucJP}.euc @@ -199,6 +210,8 @@ fi %changelog * Tue Dec 7 2004 Tim Waugh 4.13b-42 +- Fixed configure.in. +- Fixed m4 files. - Apply patch from bug #122699 to fix "too many includes" error. * Tue Oct 5 2004 Tim Waugh 4.13b-41