* acinclude.m4: aclocal 1.9 wants quoting on AC_DEFUN arguments.

This commit is contained in:
David Shaw 2004-11-17 04:51:49 +00:00
parent a82054370d
commit 4c49b856f9
2 changed files with 15 additions and 11 deletions

View File

@ -1,3 +1,7 @@
2004-11-16 David Shaw <dshaw@jabberwocky.com>
* acinclude.m4: aclocal 1.9 wants quoting on AC_DEFUN arguments.
2004-08-25 Werner Koch <wk@g10code.de> 2004-08-25 Werner Koch <wk@g10code.de>
Released 1.2.6. Released 1.2.6.
@ -1439,7 +1443,8 @@ Fri Feb 13 19:43:41 1998 Werner Koch (wk@isil.d.shuttle.de)
* Makefile.am: Likewise * Makefile.am: Likewise
Copyright 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc. Copyright 1998, 1999, 2000, 2001, 2002, 2003,
2004 Free Software Foundation, Inc.
This file is free software; as a special exception the author gives This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without unlimited permission to copy and/or distribute it, with or without

View File

@ -28,7 +28,7 @@ define(GNUPG_MSG_PRINT,
dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME) dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME)
dnl Check whether a typedef exists and create a #define $2 if it exists dnl Check whether a typedef exists and create a #define $2 if it exists
dnl dnl
AC_DEFUN(GNUPG_CHECK_TYPEDEF, AC_DEFUN([GNUPG_CHECK_TYPEDEF],
[ AC_MSG_CHECKING(for $1 typedef) [ AC_MSG_CHECKING(for $1 typedef)
AC_CACHE_VAL(gnupg_cv_typedef_$1, AC_CACHE_VAL(gnupg_cv_typedef_$1,
[AC_TRY_COMPILE([#define _GNU_SOURCE 1 [AC_TRY_COMPILE([#define _GNU_SOURCE 1
@ -46,7 +46,7 @@ AC_DEFUN(GNUPG_CHECK_TYPEDEF,
dnl GNUPG_CHECK_GNUMAKE dnl GNUPG_CHECK_GNUMAKE
dnl dnl
AC_DEFUN(GNUPG_CHECK_GNUMAKE, AC_DEFUN([GNUPG_CHECK_GNUMAKE],
[ [
if ${MAKE-make} --version 2>/dev/null | grep '^GNU ' >/dev/null 2>&1; then if ${MAKE-make} --version 2>/dev/null | grep '^GNU ' >/dev/null 2>&1; then
: :
@ -64,7 +64,7 @@ AC_DEFUN(GNUPG_CHECK_GNUMAKE,
dnl GNUPG_CHECK_FAQPROG dnl GNUPG_CHECK_FAQPROG
dnl dnl
AC_DEFUN(GNUPG_CHECK_FAQPROG, AC_DEFUN([GNUPG_CHECK_FAQPROG],
[ AC_MSG_CHECKING(for faqprog.pl) [ AC_MSG_CHECKING(for faqprog.pl)
if faqprog.pl -V 2>/dev/null | grep '^faqprog.pl ' >/dev/null 2>&1; then if faqprog.pl -V 2>/dev/null | grep '^faqprog.pl ' >/dev/null 2>&1; then
working_faqprog=yes working_faqprog=yes
@ -91,7 +91,7 @@ dnl fi
dnl GNUPG_CHECK_DOCBOOK_TO_TEXI dnl GNUPG_CHECK_DOCBOOK_TO_TEXI
dnl dnl
AC_DEFUN(GNUPG_CHECK_DOCBOOK_TO_TEXI, AC_DEFUN([GNUPG_CHECK_DOCBOOK_TO_TEXI],
[ [
AC_CHECK_PROG(DOCBOOK_TO_TEXI, docbook2texi, yes, no) AC_CHECK_PROG(DOCBOOK_TO_TEXI, docbook2texi, yes, no)
AC_MSG_CHECKING(for sgml to texi tools) AC_MSG_CHECKING(for sgml to texi tools)
@ -459,7 +459,7 @@ define(GNUPG_CHECK_MLOCK,
################################################################ ################################################################
# GNUPG_PROG_NM - find the path to a BSD-compatible name lister # GNUPG_PROG_NM - find the path to a BSD-compatible name lister
AC_DEFUN(GNUPG_PROG_NM, AC_DEFUN([GNUPG_PROG_NM],
[AC_MSG_CHECKING([for BSD-compatible nm]) [AC_MSG_CHECKING([for BSD-compatible nm])
AC_CACHE_VAL(ac_cv_path_NM, AC_CACHE_VAL(ac_cv_path_NM,
[if test -n "$NM"; then [if test -n "$NM"; then
@ -493,7 +493,7 @@ AC_SUBST(NM)
# GNUPG_SYS_NM_PARSE - Check for command ro grab the raw symbol name followed # GNUPG_SYS_NM_PARSE - Check for command ro grab the raw symbol name followed
# by C symbol name from nm. # by C symbol name from nm.
AC_DEFUN(GNUPG_SYS_NM_PARSE, AC_DEFUN([GNUPG_SYS_NM_PARSE],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl [AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([GNUPG_PROG_NM])dnl AC_REQUIRE([GNUPG_PROG_NM])dnl
# Check for command to grab the raw symbol name followed by C symbol from nm. # Check for command to grab the raw symbol name followed by C symbol from nm.
@ -660,14 +660,14 @@ AC_MSG_RESULT($ac_result)
]) ])
# GNUPG_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32 # GNUPG_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32
AC_DEFUN(GNUPG_SYS_LIBTOOL_CYGWIN32, AC_DEFUN([GNUPG_SYS_LIBTOOL_CYGWIN32],
[AC_CHECK_TOOL(DLLTOOL, dlltool, false) [AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(AS, as, false)
]) ])
# GNUPG_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols # GNUPG_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
# with an underscore? # with an underscore?
AC_DEFUN(GNUPG_SYS_SYMBOL_UNDERSCORE, AC_DEFUN([GNUPG_SYS_SYMBOL_UNDERSCORE],
[tmp_do_check="no" [tmp_do_check="no"
case "${target}" in case "${target}" in
i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp) i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp)
@ -728,7 +728,7 @@ fi
dnl Stolen from gcc dnl Stolen from gcc
dnl Define MKDIR_TAKES_ONE_ARG if mkdir accepts only one argument instead dnl Define MKDIR_TAKES_ONE_ARG if mkdir accepts only one argument instead
dnl of the usual 2. dnl of the usual 2.
AC_DEFUN(GNUPG_FUNC_MKDIR_TAKES_ONE_ARG, AC_DEFUN([GNUPG_FUNC_MKDIR_TAKES_ONE_ARG],
[AC_CHECK_HEADERS(sys/stat.h unistd.h direct.h) [AC_CHECK_HEADERS(sys/stat.h unistd.h direct.h)
AC_CACHE_CHECK([if mkdir takes one argument], gnupg_cv_mkdir_takes_one_arg, AC_CACHE_CHECK([if mkdir takes one argument], gnupg_cv_mkdir_takes_one_arg,
[AC_TRY_COMPILE([ [AC_TRY_COMPILE([
@ -748,4 +748,3 @@ if test $gnupg_cv_mkdir_takes_one_arg = yes ; then
[Defined if mkdir() does not take permission flags]) [Defined if mkdir() does not take permission flags])
fi fi
]) ])