Commit 42d1eda5 authored by Jim Meyering's avatar Jim Meyering

many *.m4 files: improve m4 quoting

99% of this change was performed by running the following commands:
git ls-files | grep '\.m4$' | xargs perl -pi \
  -e 's/(AC_\w+\()([^[()]+?)([,)])/$1\[$2]$3/g;' \
  -e 's/(AC_\w+\((?:\[[^,]+?\], ){1})([^,[()]+?)([,)])/$1\[$2]$3/g;' \
  -e 's/(AC_\w+\((?:\[[^,]+?\], ){2})([^,[()]+?)([,)])/$1\[$2]$3/g;' \
  -e 's/(AC_\w+\((?:\[[^,]+?\], ){3})([^,[()]+?)([,)])/$1\[$2]$3/g'
perl -pi -e 's/\[\.\.\.\]/.../' m4/onceonly.m4

The remainder were to add Copyright dates, increment serial numbers,
undo some changes in comments, exclude m4/intl.m4, and add quotes
around the "1" in ",1" where the unusual spacing prohibited the
above regexps from doing the job.  For more details, see
<http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/16175>.
parent 951fba5c
# acl.m4 - check for access control list (ACL) primitives
# serial 8
# serial 9
# Copyright (C) 2002, 2004-2008 Free Software Foundation, Inc.
# Copyright (C) 2002, 2004-2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -52,7 +52,7 @@ int type = ACL_FIRST_ENTRY;]],
[gl_cv_acl_ACL_FIRST_ENTRY=yes],
[gl_cv_acl_ACL_FIRST_ENTRY=no])])
if test $gl_cv_acl_ACL_FIRST_ENTRY = yes; then
AC_DEFINE([HAVE_ACL_FIRST_ENTRY], 1,
AC_DEFINE([HAVE_ACL_FIRST_ENTRY], [1],
[Define to 1 if the constant ACL_FIRST_ENTRY exists.])
fi
dnl On MacOS X, other types of ACLs are supported.
......@@ -65,7 +65,7 @@ int type = ACL_TYPE_EXTENDED;]],
[gl_cv_acl_ACL_TYPE_EXTENDED=yes],
[gl_cv_acl_ACL_TYPE_EXTENDED=no])])
if test $gl_cv_acl_ACL_TYPE_EXTENDED = yes; then
AC_DEFINE([HAVE_ACL_TYPE_EXTENDED], 1,
AC_DEFINE([HAVE_ACL_TYPE_EXTENDED], [1],
[Define to 1 if the ACL type ACL_TYPE_EXTENDED exists.])
fi
else
......@@ -133,7 +133,7 @@ int type = ACL_TYPE_EXTENDED;]],
# but sets errno = ENOENT for an existing file or directory.
AC_DEFUN([gl_ACL_GET_FILE],
[
AC_CACHE_CHECK([for working acl_get_file], gl_cv_func_working_acl_get_file,
AC_CACHE_CHECK([for working acl_get_file], [gl_cv_func_working_acl_get_file],
[AC_RUN_IFELSE(
[AC_LANG_PROGRAM(
[[#include <sys/types.h>
......
#serial 9
# serial 10
# Copyright (C) 1999, 2000, 2001, 2004, 2008 Free Software Foundation, Inc.
# Copyright (C) 1999-2001, 2004, 2008-2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_AFS],
[
AC_ARG_WITH(afs,
AC_ARG_WITH([afs],
AS_HELP_STRING([--with-afs],
[support for the Andrew File System [[default=no]]]),
test "$withval" = no || with_afs=yes, with_afs=no)
if test "$with_afs" = yes; then
AC_DEFINE(AFS, 1, [Define if you have the Andrew File System.])
AC_DEFINE([AFS], [1], [Define if you have the Andrew File System.])
fi
])
# alloca.m4 serial 8
dnl Copyright (C) 2002-2004, 2006, 2007 Free Software Foundation, Inc.
# alloca.m4 serial 9
dnl Copyright (C) 2002-2004, 2006, 2007, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
......@@ -26,7 +26,7 @@ AC_DEFUN([gl_FUNC_ALLOCA],
])
if test $gl_cv_rpl_alloca = yes; then
dnl OK, alloca can be implemented through a compiler built-in.
AC_DEFINE([HAVE_ALLOCA], 1,
AC_DEFINE([HAVE_ALLOCA], [1],
[Define to 1 if you have 'alloca' after including <alloca.h>,
a header that may be supplied by this distribution.])
ALLOCA_H=alloca.h
......
# argp.m4 serial 8
dnl Copyright (C) 2003-2007 Free Software Foundation, Inc.
# argp.m4 serial 9
dnl Copyright (C) 2003-2007, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
......@@ -12,18 +12,18 @@ AC_DEFUN([gl_ARGP],
dnl argp-parse.c depends on GNU getopt internals, therefore use GNU getopt
dnl always.
gl_GETOPT_SUBSTITUTE
dnl Note: gl_GETOPT_SUBSTITUTE does AC_LIBOBJ(getopt), AC_LIBOBJ(getopt1).
dnl Note: gl_GETOPT_SUBSTITUTE does AC_LIBOBJ([getopt]), AC_LIBOBJ([getopt1]).
AC_CHECK_DECL([program_invocation_name],
[AC_DEFINE(HAVE_DECL_PROGRAM_INVOCATION_NAME, 1,
[AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_NAME], [1],
[Define if program_invocation_name is declared])],
[AC_DEFINE(GNULIB_PROGRAM_INVOCATION_NAME, 1,
[AC_DEFINE([GNULIB_PROGRAM_INVOCATION_NAME], [1],
[Define to 1 to add extern declaration of program_invocation_name to argp.h])],
[#include <errno.h>])
AC_CHECK_DECL([program_invocation_short_name],
[AC_DEFINE(HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME, 1,
[AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME], [1],
[Define if program_invocation_short_name is declared])],
[AC_DEFINE(GNULIB_PROGRAM_INVOCATION_SHORT_NAME, 1,
[AC_DEFINE([GNULIB_PROGRAM_INVOCATION_SHORT_NAME], [1],
[Define to 1 to add extern declaration of program_invocation_short_name to argp.h])],
[#include <errno.h>])
......@@ -31,21 +31,21 @@ AC_DEFUN([gl_ARGP],
# are defined elsewhere. It is improbable that only one of them will
# be defined and other not, I prefer to stay on the safe side and to
# test each one separately.
AC_MSG_CHECKING(whether program_invocation_name is defined)
AC_MSG_CHECKING([whether program_invocation_name is defined])
AC_TRY_LINK([#include <argp.h>],
[ program_invocation_name = "test"; ],
[ AC_DEFINE(HAVE_PROGRAM_INVOCATION_NAME,1,
[ AC_DEFINE([HAVE_PROGRAM_INVOCATION_NAME], [1],
[Define if program_invocation_name is defined])
AC_MSG_RESULT(yes)],
[ AC_MSG_RESULT(no)] )
AC_MSG_RESULT([yes])],
[ AC_MSG_RESULT([no])] )
AC_MSG_CHECKING(whether program_invocation_short_name is defined)
AC_MSG_CHECKING([whether program_invocation_short_name is defined])
AC_TRY_LINK([#include <argp.h>],
[ program_invocation_short_name = "test"; ],
[ AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME,1,
[ AC_DEFINE([HAVE_PROGRAM_INVOCATION_SHORT_NAME], [1],
[Define if program_invocation_short_name is defined])
AC_MSG_RESULT(yes)],
[ AC_MSG_RESULT(no)] )
AC_MSG_RESULT([yes])],
[ AC_MSG_RESULT([no])] )
AC_CHECK_DECLS_ONCE([clearerr_unlocked])
AC_CHECK_DECLS_ONCE([feof_unlocked])
......
# Portability macros for glibc argz. -*- Autoconf -*-
#
# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# Copyright (C) 2004-2009 Free Software Foundation, Inc.
# Written by Gary V. Vaughan <gary@gnu.org>
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# serial 6 argz.m4
# serial 7 argz.m4
AC_DEFUN([gl_FUNC_ARGZ],
[gl_PREREQ_ARGZ
......@@ -68,7 +68,7 @@ AS_IF([test -z "$ARGZ_H"],
*) lt_cv_sys_argz_works=yes ;;
esac]])
AS_IF([test $lt_cv_sys_argz_works = yes],
[AC_DEFINE([HAVE_WORKING_ARGZ], 1,
[AC_DEFINE([HAVE_WORKING_ARGZ], [1],
[This value is set to 1 to indicate that the system argz facility works])],
[ARGZ_H=argz.h
AC_LIBOBJ([argz])])])
......
# atexit.m4 serial 2
dnl Copyright (C) 2002 Free Software Foundation, Inc.
# atexit.m4 serial 3
dnl Copyright (C) 2002, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_FUNC_ATEXIT],
[
AC_REPLACE_FUNCS(atexit)
AC_REPLACE_FUNCS([atexit])
if test $ac_cv_func_atexit = no; then
gl_PREREQ_ATEXIT
fi
......
# bison-i18n.m4 serial 2
dnl Copyright (C) 2005-2006 Free Software Foundation, Inc.
# bison-i18n.m4 serial 3
dnl Copyright (C) 2005-2006, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
......@@ -42,7 +42,7 @@ AC_DEFUN([BISON_I18N],
fi
fi
if test $BISON_USE_NLS = yes; then
AC_DEFINE([YYENABLE_NLS], 1,
AC_DEFINE([YYENABLE_NLS], [1],
[Define to 1 to internationalize bison runtime messages.])
fi
])
#serial 4
# serial 5
# Copyright (C) 2002, 2005 Free Software Foundation, Inc.
# Copyright (C) 2002, 2005, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -14,10 +14,10 @@ dnl Declaring YACC & YFLAGS precious will not be necessary after GNULIB
dnl requires an Autoconf greater than 2.59c, but it will probably still be
dnl useful to override the description of YACC in the --help output, re
dnl getdate.y assuming `bison -y'.
AC_ARG_VAR(YACC,
AC_ARG_VAR([YACC],
[The `Yet Another C Compiler' implementation to use. Defaults to `bison -y'.
Values other than `bison -y' will most likely break on most systems.])dnl
AC_ARG_VAR(YFLAGS,
AC_ARG_VAR([YFLAGS],
[YFLAGS contains the list arguments that will be passed by default to Bison.
This script will default YFLAGS to the empty string to avoid a default value of
`-d' given by some make applications.])dnl
......
# byteswap.m4 serial 2
dnl Copyright (C) 2005, 2007 Free Software Foundation, Inc.
# byteswap.m4 serial 3
dnl Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
......@@ -14,5 +14,5 @@ AC_DEFUN([gl_BYTESWAP],
], [
BYTESWAP_H='byteswap.h'
])
AC_SUBST(BYTESWAP_H)
AC_SUBST([BYTESWAP_H])
])
# Check prerequisites for compiling lib/c-stack.c.
# Copyright (C) 2002, 2003, 2004, 2008 Free Software Foundation, Inc.
# Copyright (C) 2002, 2003, 2004, 2008, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# Written by Paul Eggert.
# serial 8
# serial 9
AC_DEFUN([AC_SYS_XSI_STACK_OVERFLOW_HEURISTIC],
[# for STACK_DIRECTION
......@@ -307,7 +307,7 @@ int main ()
[ac_cv_sys_xsi_stack_overflow_heuristic=cross-compiling])])
if test $ac_cv_sys_xsi_stack_overflow_heuristic = yes; then
AC_DEFINE(HAVE_XSI_STACK_OVERFLOW_HEURISTIC, 1,
AC_DEFINE([HAVE_XSI_STACK_OVERFLOW_HEURISTIC], [1],
[Define to 1 if extending the stack slightly past the limit causes
a SIGSEGV, and an alternate stack can be established with sigaltstack,
and the signal handler is passed a context that specifies the
......
# c-strtod.m4 serial 9
# c-strtod.m4 serial 10
# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
# Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -29,7 +29,7 @@ AC_DEFUN([gl_C99_STRTOLD],
[gl_cv_func_c99_strtold=yes],
[gl_cv_func_c99_strtold=no])])
if test $gl_cv_func_c99_strtold = yes; then
AC_DEFINE([HAVE_C99_STRTOLD], 1, [Define to 1 if strtold conforms to C99.])
AC_DEFINE([HAVE_C99_STRTOLD], [1], [Define to 1 if strtold conforms to C99.])
fi
])
......
# calloc.m4 serial 8
# calloc.m4 serial 9
# Copyright (C) 2004-2008 Free Software Foundation, Inc.
# Copyright (C) 2004-2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -12,12 +12,12 @@
# If so, define HAVE_CALLOC. Otherwise, define calloc to rpl_calloc
# and arrange to use a calloc wrapper function that does work in that case.
# _AC_FUNC_CALLOC_IF(IF-WORKS, IF-NOT)
# _AC_FUNC_CALLOC_IF([IF-WORKS], [IF-NOT])
# -------------------------------------
# If `calloc (0, 0)' is properly handled, run IF-WORKS, otherwise, IF-NOT.
AC_DEFUN([_AC_FUNC_CALLOC_IF],
[AC_REQUIRE([AC_TYPE_SIZE_T])dnl
AC_CACHE_CHECK([for GNU libc compatible calloc], ac_cv_func_calloc_0_nonnull,
AC_CACHE_CHECK([for GNU libc compatible calloc], [ac_cv_func_calloc_0_nonnull],
[AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
[[exit (!calloc (0, 0) || calloc ((size_t) -1 / 8 + 1, 8));]])],
[ac_cv_func_calloc_0_nonnull=yes],
......@@ -33,10 +33,10 @@ AS_IF([test $ac_cv_func_calloc_0_nonnull = yes], [$1], [$2])
# needed.
AC_DEFUN([AC_FUNC_CALLOC],
[_AC_FUNC_CALLOC_IF(
[AC_DEFINE([HAVE_CALLOC], 1,
[AC_DEFINE([HAVE_CALLOC], [1],
[Define to 1 if your system has a GNU libc compatible `calloc'
function, and to 0 otherwise.])],
[AC_DEFINE([HAVE_CALLOC], 0)
[AC_DEFINE([HAVE_CALLOC], [0])
AC_LIBOBJ([calloc])
AC_DEFINE([calloc], [rpl_calloc],
[Define to rpl_calloc if the replacement function should be used.])])
......@@ -52,7 +52,7 @@ AC_DEFUN([gl_FUNC_CALLOC_POSIX],
AC_REQUIRE([gl_CHECK_MALLOC_POSIX])
if test $gl_cv_func_malloc_posix = yes; then
HAVE_CALLOC_POSIX=1
AC_DEFINE([HAVE_CALLOC_POSIX], 1,
AC_DEFINE([HAVE_CALLOC_POSIX], [1],
[Define if the 'calloc' function is POSIX compliant.])
else
AC_LIBOBJ([calloc])
......
# canonicalize-lgpl.m4 serial 4
dnl Copyright (C) 2003, 2006-2007 Free Software Foundation, Inc.
# canonicalize-lgpl.m4 serial 5
dnl Copyright (C) 2003, 2006-2007, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
......@@ -8,10 +8,10 @@ AC_DEFUN([gl_CANONICALIZE_LGPL],
[
dnl Do this replacement check manually because the file name is shorter
dnl than the function name.
AC_CHECK_DECLS_ONCE(canonicalize_file_name)
AC_CHECK_FUNCS_ONCE(canonicalize_file_name)
AC_CHECK_DECLS_ONCE([canonicalize_file_name])
AC_CHECK_FUNCS_ONCE([canonicalize_file_name])
if test $ac_cv_func_canonicalize_file_name = no; then
AC_LIBOBJ(canonicalize-lgpl)
AC_LIBOBJ([canonicalize-lgpl])
AC_DEFINE([realpath], [rpl_realpath],
[Define to a replacement function name for realpath().])
gl_PREREQ_CANONICALIZE_LGPL
......@@ -22,14 +22,14 @@ AC_DEFUN([gl_CANONICALIZE_LGPL],
# (no AC_LIBOBJ).
AC_DEFUN([gl_CANONICALIZE_LGPL_SEPARATE],
[
AC_CHECK_DECLS_ONCE(canonicalize_file_name)
AC_CHECK_FUNCS_ONCE(canonicalize_file_name)
AC_CHECK_DECLS_ONCE([canonicalize_file_name])
AC_CHECK_FUNCS_ONCE([canonicalize_file_name])
gl_PREREQ_CANONICALIZE_LGPL
])
# Prerequisites of lib/canonicalize-lgpl.c.
AC_DEFUN([gl_PREREQ_CANONICALIZE_LGPL],
[
AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h)
AC_CHECK_FUNCS_ONCE(getcwd readlink)
AC_CHECK_HEADERS_ONCE([sys/param.h unistd.h])
AC_CHECK_FUNCS_ONCE([getcwd readlink])
])
#serial 17
# serial 18
# Determine whether we need the chown wrapper.
dnl Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2007 Free
dnl Software Foundation, Inc.
dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009
dnl Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
......@@ -22,7 +22,7 @@ AC_DEFUN([gl_FUNC_CHOWN],
AC_REQUIRE([gl_FUNC_CHOWN_FOLLOWS_SYMLINK])
if test $ac_cv_func_chown_works = no; then
AC_DEFINE(CHOWN_FAILS_TO_HONOR_ID_OF_NEGATIVE_ONE, 1,
AC_DEFINE([CHOWN_FAILS_TO_HONOR_ID_OF_NEGATIVE_ONE], [1],
[Define if chown is not POSIX compliant regarding IDs of -1.])
fi
......@@ -31,7 +31,7 @@ AC_DEFUN([gl_FUNC_CHOWN],
: # no wrapper needed
else
REPLACE_CHOWN=1
AC_LIBOBJ(chown)
AC_LIBOBJ([chown])
gl_PREREQ_CHOWN
fi
])
......@@ -71,7 +71,7 @@ AC_DEFUN([gl_FUNC_CHOWN_FOLLOWS_SYMLINK],
)
if test $gl_cv_func_chown_follows_symlink = no; then
AC_DEFINE(CHOWN_MODIFIES_SYMLINK, 1,
AC_DEFINE([CHOWN_MODIFIES_SYMLINK], [1],
[Define if chown modifies symlinks.])
fi
])
......@@ -79,5 +79,5 @@ AC_DEFUN([gl_FUNC_CHOWN_FOLLOWS_SYMLINK],
# Prerequisites of lib/chown.c.
AC_DEFUN([gl_PREREQ_CHOWN],
[
AC_CHECK_FUNC([fchown], , [AC_LIBOBJ(fchown-stub)])
AC_CHECK_FUNC([fchown], , [AC_LIBOBJ([fchown-stub])])
])
# clock_time.m4 serial 8
dnl Copyright (C) 2002-2006 Free Software Foundation, Inc.
# clock_time.m4 serial 9
dnl Copyright (C) 2002-2006, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
......@@ -21,10 +21,10 @@ AC_DEFUN([gl_CLOCK_TIME],
# programs in the package would end up linked with that potentially-shared
# library, inducing unnecessary run-time overhead.
gl_saved_libs=$LIBS
AC_SEARCH_LIBS(clock_gettime, [rt posix4],
AC_SEARCH_LIBS([clock_gettime], [rt posix4],
[test "$ac_cv_search_clock_gettime" = "none required" ||
LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
AC_SUBST([LIB_CLOCK_GETTIME])
AC_CHECK_FUNCS(clock_gettime clock_settime)
AC_CHECK_FUNCS([clock_gettime clock_settime])
LIBS=$gl_saved_libs
])
# codeset.m4 serial 3 (gettext-0.18)
dnl Copyright (C) 2000-2002, 2006, 2008 Free Software Foundation, Inc.
# codeset.m4 serial 4 (gettext-0.18)
dnl Copyright (C) 2000-2002, 2006, 2008, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
......@@ -15,7 +15,7 @@ AC_DEFUN([AM_LANGINFO_CODESET],
[am_cv_langinfo_codeset=no])
])
if test $am_cv_langinfo_codeset = yes; then
AC_DEFINE([HAVE_LANGINFO_CODESET], 1,
AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
[Define if you have <langinfo.h> and nl_langinfo(CODESET).])
fi
])
# copy-file.m4 serial 2
dnl Copyright (C) 2003 Free Software Foundation, Inc.
# copy-file.m4 serial 3
dnl Copyright (C) 2003, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_COPY_FILE],
[
AC_CHECK_HEADERS_ONCE(unistd.h utime.h)
AC_CHECK_FUNCS(chown utime utimes)
AC_CHECK_HEADERS_ONCE([unistd.h utime.h])
AC_CHECK_FUNCS([chown utime utimes])
])
# csharp.m4 serial 2 (gettext-0.14.2)
dnl Copyright (C) 2004-2005 Free Software Foundation, Inc.
# csharp.m4 serial 3 (gettext-0.14.2)
dnl Copyright (C) 2004-2005, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
......@@ -9,19 +9,19 @@ dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gt_CSHARP_CHOICE],
[
AC_MSG_CHECKING([for preferred C[#] implementation])
AC_ARG_ENABLE(csharp,
AC_ARG_ENABLE([csharp],
[ --enable-csharp[[=IMPL]] choose preferred C[#] implementation (pnet or mono)],
[CSHARP_CHOICE="$enableval"],
CSHARP_CHOICE=any)
AC_SUBST(CSHARP_CHOICE)
AC_SUBST([CSHARP_CHOICE])
AC_MSG_RESULT([$CSHARP_CHOICE])
case "$CSHARP_CHOICE" in
pnet)
AC_DEFINE([CSHARP_CHOICE_PNET], 1,
AC_DEFINE([CSHARP_CHOICE_PNET], [1],
[Define if pnet is the preferred C# implementation.])
;;
mono)
AC_DEFINE([CSHARP_CHOICE_MONO], 1,
AC_DEFINE([CSHARP_CHOICE_MONO], [1],
[Define if mono is the preferred C# implementation.])
;;
esac
......
# csharpcomp.m4 serial 7
dnl Copyright (C) 2003-2005, 2007 Free Software Foundation, Inc.
# csharpcomp.m4 serial 8
dnl Copyright (C) 2003-2005, 2007, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
......@@ -17,9 +17,9 @@ AC_DEFUN([gt_CSHARPCOMP],
pushdef([AC_MSG_CHECKING],[:])dnl
pushdef([AC_CHECKING],[:])dnl
pushdef([AC_MSG_RESULT],[:])dnl
AC_CHECK_PROG(HAVE_CSCC_IN_PATH, cscc, yes)
AC_CHECK_PROG(HAVE_MCS_IN_PATH, mcs, yes)
AC_CHECK_PROG(HAVE_CSC_IN_PATH, csc, yes)
AC_CHECK_PROG([HAVE_CSCC_IN_PATH], [cscc], [yes])
AC_CHECK_PROG([HAVE_MCS_IN_PATH], [mcs], [yes])
AC_CHECK_PROG([HAVE_CSC_IN_PATH], [csc], [yes])
popdef([AC_MSG_RESULT])dnl
popdef([AC_CHECKING])dnl
popdef([AC_MSG_CHECKING])dnl
......@@ -67,12 +67,12 @@ AC_DEFUN([gt_CSHARPCOMP],
esac
done
AC_MSG_RESULT([$ac_result])
AC_SUBST(HAVE_CSCC)
AC_SUBST(HAVE_MCS)
AC_SUBST(HAVE_CSC)
AC_SUBST([HAVE_CSCC])
AC_SUBST([HAVE_MCS])
AC_SUBST([HAVE_CSC])
dnl Provide a default for CSHARPCOMPFLAGS.
if test -z "${CSHARPCOMPFLAGS+set}"; then
CSHARPCOMPFLAGS="-O -g"
fi
AC_SUBST(CSHARPCOMPFLAGS)
AC_SUBST([CSHARPCOMPFLAGS])
])
# csharpexec.m4 serial 3 (gettext-0.15)
dnl Copyright (C) 2003-2005 Free Software Foundation, Inc.
# csharpexec.m4 serial 4 (gettext-0.15)
dnl Copyright (C) 2003-2005, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
......@@ -13,7 +13,7 @@ AC_DEFUN([gt_CSHARPEXEC],
[
AC_REQUIRE([gt_CSHARP_CHOICE])
AC_MSG_CHECKING([for C[#] program execution engine])
AC_EGREP_CPP(yes, [
AC_EGREP_CPP([yes], [
#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
yes
#endif
......@@ -22,9 +22,9 @@ AC_DEFUN([gt_CSHARPEXEC],
pushdef([AC_MSG_CHECKING],[:])dnl
pushdef([AC_CHECKING],[:])dnl
pushdef([AC_MSG_RESULT],[:])dnl
AC_CHECK_PROG(HAVE_ILRUN_IN_PATH, ilrun, yes)
AC_CHECK_PROG(HAVE_MONO_IN_PATH, mono, yes)
AC_CHECK_PROG(HAVE_CLIX_IN_PATH, clix, yes)
AC_CHECK_PROG([HAVE_ILRUN_IN_PATH], [ilrun], [yes])
AC_CHECK_PROG([HAVE_MONO_IN_PATH], [mono], [yes])
AC_CHECK_PROG([HAVE_CLIX_IN_PATH], [clix], [yes])
popdef([AC_MSG_RESULT])dnl
popdef([AC_CHECKING])dnl
popdef([AC_MSG_CHECKING])dnl
......@@ -76,11 +76,11 @@ AC_DEFUN([gt_CSHARPEXEC],
esac
done
AC_MSG_RESULT([$ac_result])
AC_SUBST(MONO_PATH)
AC_SUBST(MONO_PATH_SEPARATOR)
AC_SUBST(CLIX_PATH_VAR)
AC_SUBST(CLIX_PATH)
AC_SUBST(HAVE_ILRUN)
AC_SUBST(HAVE_MONO)
AC_SUBST(HAVE_CLIX)
AC_SUBST([MONO_PATH])
AC_SUBST([MONO_PATH_SEPARATOR])
AC_SUBST([CLIX_PATH_VAR])
AC_SUBST([CLIX_PATH])
AC_SUBST([HAVE_ILRUN])
AC_SUBST([HAVE_MONO])
AC_SUBST([HAVE_CLIX])
])
#serial 10
# serial 11
dnl From Jim Meyering.
dnl
dnl Check whether struct dirent has a member named d_ino.
dnl
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2006, 2007 Free Software
# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009 Free Software
# Foundation, Inc.
# This file is free software; the Free Software Foundation
......@@ -34,7 +34,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO],
[gl_cv_struct_dirent_d_ino=no],
[gl_cv_struct_dirent_d_ino=no])])
if test $gl_cv_struct_dirent_d_ino = yes; then
AC_DEFINE(D_INO_IN_DIRENT, 1,
AC_DEFINE([D_INO_IN_DIRENT], [1],
[Define if struct dirent has a member d_ino that actually works.])
fi
]
......
#serial 9
# serial 10
dnl From Jim Meyering.
dnl
dnl Check whether struct dirent has a member named d_type.
dnl
# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software
# Foundation, Inc.
# Copyright (C) 1997, 1999-2004, 2006, 2009 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -27,7 +26,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE],
]
)
if test $gl_cv_struct_dirent_d_type = yes; then
AC_DEFINE(HAVE_STRUCT_DIRENT_D_TYPE, 1,
AC_DEFINE([HAVE_STRUCT_DIRENT_D_TYPE], [1],
[Define if there is a member named d_type in the struct describing
directory headers.])
fi
......
#serial 15 -*- Autoconf -*-
# serial 16 -*- Autoconf -*-
dnl Find out how to get the file descriptor associated with an open DIR*.
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 Free Software
# Foundation, Inc.
# Copyright (C) 2001-2006, 2008-2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......@@ -22,7 +21,7 @@ AC_DEFUN([gl_FUNC_DIRFD],
AC_REQUIRE([AC_PROG_CPP])
AC_REQUIRE([AC_PROG_EGREP])
AC_CHECK_FUNCS(dirfd)
AC_CHECK_FUNCS([dirfd])
AC_CHECK_DECLS([dirfd], , ,
[#include <sys/types.h>
#include <dirent.h>])
......@@ -69,7 +68,7 @@ AC_DEFUN([gl_FUNC_DIRFD],
]
)
if test $gl_cv_sys_dir_fd_member_name != no_such_member; then
AC_DEFINE_UNQUOTED(DIR_FD_MEMBER_NAME,
AC_DEFINE_UNQUOTED([DIR_FD_MEMBER_NAME],
$gl_cv_sys_dir_fd_member_name,
[the name of the file descriptor member of DIR])
fi
......
# double-slash-root.m4 serial 3 -*- Autoconf -*-
dnl Copyright (C) 2006, 2008 Free Software Foundation, Inc.
# double-slash-root.m4 serial 4 -*- Autoconf -*-
dnl Copyright (C) 2006, 2008, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
......@@ -32,7 +32,7 @@ AC_DEFUN([gl_DOUBLE_SLASH_ROOT],
fi
fi])
if test "$gl_cv_double_slash_root" = yes; then
AC_DEFINE([DOUBLE_SLASH_IS_DISTINCT_ROOT], 1,
AC_DEFINE([DOUBLE_SLASH_IS_DISTINCT_ROOT], [1],
[Define to 1 if // is a file system root distinct from /.])
fi
])
# eaccess.m4 serial 1 (gettext-0.12)
dnl Copyright (C) 2003 Free Software Foundation, Inc.
# eaccess.m4 serial 2 (gettext-0.12)
dnl Copyright (C) 2003, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_FUNC_EACCESS],
[
AC_CHECK_FUNC(eaccess, ,
[AC_DEFINE(eaccess, access,
AC_CHECK_FUNC([eaccess], ,
[AC_DEFINE([eaccess], [access],
[Define as 'access' if you don't have the eaccess() function.])])
])
# eealloc.m4 serial 1
dnl Copyright (C) 2003 Free Software Foundation, Inc.
# eealloc.m4 serial 2
dnl Copyright (C) 2003, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
......@@ -16,7 +16,7 @@ AC_DEFUN([gl_EEMALLOC],
_AC_FUNC_MALLOC_IF(
[gl_cv_func_malloc_0_nonnull=1],
[gl_cv_func_malloc_0_nonnull=0])
AC_DEFINE_UNQUOTED([MALLOC_0_IS_NONNULL], $gl_cv_func_malloc_0_nonnull,
AC_DEFINE_UNQUOTED([MALLOC_0_IS_NONNULL], [$gl_cv_func_malloc_0_nonnull],
[If malloc(0) is != NULL, define this to 1. Otherwise define this
to 0.])
])
......@@ -26,7 +26,7 @@ AC_DEFUN([gl_EEREALLOC],
_AC_FUNC_REALLOC_IF(
[gl_cv_func_realloc_0_nonnull=1],
[gl_cv_func_realloc_0_nonnull=0])
AC_DEFINE_UNQUOTED([REALLOC_0_IS_NONNULL], $gl_cv_func_realloc_0_nonnull,
AC_DEFINE_UNQUOTED([REALLOC_0_IS_NONNULL], [$gl_cv_func_realloc_0_nonnull],
[If realloc(NULL,0) is != NULL, define this to 1. Otherwise define this