From 1f206dea091773e255cd7d3c00069e61bb6af7c0 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Tue, 13 Feb 2007 23:20:02 +0000 Subject: [PATCH] * m4/unlinkdir.m4 (gl_UNLINKDIR): Fix m4 quoting bug. * m4/unlink-busy.m4 (gl_FUNC_UNLINK_BUSY_TEXT): Likewise. --- ChangeLog | 5 +++++ m4/unlink-busy.m4 | 8 ++++---- m4/unlinkdir.m4 | 8 ++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index e989a476c7..7b1ab0729a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-02-13 Ralf Wildenhues + + * m4/unlinkdir.m4 (gl_UNLINKDIR): Fix m4 quoting bug. + * m4/unlink-busy.m4 (gl_FUNC_UNLINK_BUSY_TEXT): Likewise. + 2007-02-13 Bruno Haible * m4/intdiv0.m4 (gt_INTDIV0): Assume ANSI C. Fix underquoting bug. diff --git a/m4/unlink-busy.m4 b/m4/unlink-busy.m4 index cdc5f74a0a..687f900da1 100644 --- a/m4/unlink-busy.m4 +++ b/m4/unlink-busy.m4 @@ -1,10 +1,10 @@ -#serial 10 +#serial 11 dnl From J. David Anglin. dnl HPUX and other systems can't unlink shared text that is being executed. -# Copyright (C) 2000, 2001, 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2004, 2007 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. @@ -16,12 +16,12 @@ AC_DEFUN([gl_FUNC_UNLINK_BUSY_TEXT], [ AC_RUN_IFELSE( [AC_LANG_SOURCE( - [AC_INCLUDES_DEFAULT + [AC_INCLUDES_DEFAULT[ int main (int argc, char **argv) { return !argc || unlink (argv[0]) != 0; - }])], + }]])], jm_cv_func_unlink_busy_text=yes, jm_cv_func_unlink_busy_text=no, jm_cv_func_unlink_busy_text=no diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4 index 9ec7e08b71..6ef7168a37 100644 --- a/m4/unlinkdir.m4 +++ b/m4/unlinkdir.m4 @@ -1,6 +1,6 @@ -#serial 4 +#serial 5 -# Copyright (C) 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -23,9 +23,9 @@ AC_DEFUN([gl_UNLINKDIR], # and might create garbage in the file system, # so the code below simply relies on the kernel name and version number. case $host in - *-*-gnu[0-9]* | \ + *-*-gnu[[0-9]]* | \ *-*-linux-* | *-*-linux | \ - *-*-freebsd2.2* | *-*-freebsd[3-9]* | *-*-freebsd[1-9][0-9]* | \ + *-*-freebsd2.2* | *-*-freebsd[[3-9]]* | *-*-freebsd[[1-9]][[0-9]]* | \ *-cygwin) AC_DEFINE([UNLINK_CANNOT_UNLINK_DIR], 1, [Define to 1 if unlink (dir) cannot possibly succeed.]);; -- 2.30.2