From: Akim Demaille <akim@epita.fr>
Date: Fri, 14 Jan 2000 15:40:15 +0000 (+0000)
Subject: 1999-10-31  Akim Demaille  <akim@epita.fr>
X-Git-Tag: autoconf-2.50~1287
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91c72f0940748070d360481e54fb3925db3d3735;p=thirdparty%2Fautoconf.git

1999-10-31  Akim Demaille  <akim@epita.fr>

	* acgeneral.m4 (AC_INIT_NOTICE, AC_INIT_PREPARE, AC_ARG_ENABLE,
	AC_ARG_WITH, AC, TRY_COMPILER, AC_TRY_RUN, AC_TRY_CPP,
	AC_EGREP_CPP): Use @PND@ instead of [#]: it looses the editors
	that try to match the pairs of (), [] etc.
---

diff --git a/ChangeLog b/ChangeLog
index 9cdaf9a1b..a9c1a631c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-10-31  Akim Demaille  <akim@epita.fr>
+
+	* acgeneral.m4 (AC_INIT_NOTICE, AC_INIT_PREPARE, AC_ARG_ENABLE,
+	AC_ARG_WITH, AC, TRY_COMPILER, AC_TRY_RUN, AC_TRY_CPP,
+	AC_EGREP_CPP): Use @PND@ instead of [#]: it looses the editors
+	that try to match the pairs of (), [] etc.
+
 1999-10-31  Akim Demaille  <akim@epita.fr>
 
 	Fix the compatibility of the compiling macros with C++.
diff --git a/acgeneral.m4 b/acgeneral.m4
index eb71da35a..2f0476828 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -780,7 +780,7 @@ ac_arg_with_help=
 ac_arg_enable_help=
 ac_arg_var_help=
 ac_default_prefix=/usr/local
-[#] Any additions from configure.in:])
+@PND@ Any additions from configure.in:])
 
 
 dnl AC_PREFIX_DEFAULT(PREFIX)
@@ -1289,9 +1289,9 @@ AC_DEFUN(AC_INIT_PREPARE,
 # 3 some systems may open it to /dev/tty
 # 4 used on the Kubota Titan
 define(AC_FD_MSG, 6)dnl
-[#] AC_FD_MSG checking for... messages and results
+@PND@ AC_FD_MSG checking for... messages and results
 define(AC_FD_CC, 5)dnl
-[#] AC_FD_CC compiler messages saved in config.log
+@PND@ AC_FD_CC compiler messages saved in config.log
 if test "$silent" = yes; then
   exec AC_FD_MSG>/dev/null
 else
@@ -1422,7 +1422,7 @@ AC_DEFUN(AC_ARG_ENABLE,
 ac_arg_enable_help="$ac_arg_enable_help
 [$2]"
 AC_DIVERT_POP()dnl
-[#] Check whether --enable-[$1] or --disable-[$1] was given.
+@PND@ Check whether --enable-[$1] or --disable-[$1] was given.
 if test "[${enable_]patsubst([$1], -, _)+set}" = set; then
   enableval="[$enable_]patsubst([$1], -, _)"
   ifelse([$3], , :, [$3])
@@ -1442,12 +1442,13 @@ dnl ### Working with optional software
 
 
 dnl AC_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE [, ACTION-IF-FALSE])
+dnl ---------------------------------------------------------------------
 AC_DEFUN(AC_ARG_WITH,
 [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 ac_arg_with_help="$ac_arg_with_help
 [$2]"
 AC_DIVERT_POP()dnl
-[#] Check whether --with-[$1] or --without-[$1] was given.
+@PND@ Check whether --with-[$1] or --without-[$1] was given.
 if test "[${with_]patsubst([$1], -, _)+set}" = set; then
   withval="[$with_]patsubst([$1], -, _)"
   ifelse([$3], , :, [$3])
@@ -2372,7 +2373,7 @@ AC_DEFUN(AC_TRY_COMPILER,
 [cat >conftest.$ac_ext <<EOF
 ifelse(AC_LANG, [FORTRAN77], ,
 [
-[#]line __oline__ "configure"
+@PND@line __oline__ "configure"
 #include "confdefs.h"
 ])
 [$1]
@@ -2499,10 +2500,11 @@ dnl ### Examining declarations
 
 
 dnl AC_TRY_CPP(INCLUDES, [ACTION-IF-TRUE [, ACTION-IF-FALSE]])
+dnl ----------------------------------------------------------
 AC_DEFUN(AC_TRY_CPP,
 [AC_REQUIRE_CPP()dnl
 cat >conftest.$ac_ext <<EOF
-[#]line __oline__ "configure"
+@PND@line __oline__ "configure"
 #include "confdefs.h"
 [$1]
 EOF
@@ -2539,7 +2541,7 @@ dnl              ACTION-IF-NOT-FOUND]])
 AC_DEFUN(AC_EGREP_CPP,
 [AC_REQUIRE_CPP()dnl
 cat >conftest.$ac_ext <<EOF
-[#]line __oline__ "configure"
+@PND@line __oline__ "configure"
 #include "confdefs.h"
 [$2]
 EOF
@@ -2574,8 +2576,8 @@ ifelse(AC_LANG, [FORTRAN77],
 [$2]
       end],
 [dnl This sometimes fails to find confdefs.h, for some reason.
-dnl [#]line __oline__ "[$]0"
-[#]line __oline__ "configure"
+dnl @PND@line __oline__ "[$]0"
+@PND@line __oline__ "configure"
 #include "confdefs.h"
 [$1]
 int
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index eb71da35a..2f0476828 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -780,7 +780,7 @@ ac_arg_with_help=
 ac_arg_enable_help=
 ac_arg_var_help=
 ac_default_prefix=/usr/local
-[#] Any additions from configure.in:])
+@PND@ Any additions from configure.in:])
 
 
 dnl AC_PREFIX_DEFAULT(PREFIX)
@@ -1289,9 +1289,9 @@ AC_DEFUN(AC_INIT_PREPARE,
 # 3 some systems may open it to /dev/tty
 # 4 used on the Kubota Titan
 define(AC_FD_MSG, 6)dnl
-[#] AC_FD_MSG checking for... messages and results
+@PND@ AC_FD_MSG checking for... messages and results
 define(AC_FD_CC, 5)dnl
-[#] AC_FD_CC compiler messages saved in config.log
+@PND@ AC_FD_CC compiler messages saved in config.log
 if test "$silent" = yes; then
   exec AC_FD_MSG>/dev/null
 else
@@ -1422,7 +1422,7 @@ AC_DEFUN(AC_ARG_ENABLE,
 ac_arg_enable_help="$ac_arg_enable_help
 [$2]"
 AC_DIVERT_POP()dnl
-[#] Check whether --enable-[$1] or --disable-[$1] was given.
+@PND@ Check whether --enable-[$1] or --disable-[$1] was given.
 if test "[${enable_]patsubst([$1], -, _)+set}" = set; then
   enableval="[$enable_]patsubst([$1], -, _)"
   ifelse([$3], , :, [$3])
@@ -1442,12 +1442,13 @@ dnl ### Working with optional software
 
 
 dnl AC_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE [, ACTION-IF-FALSE])
+dnl ---------------------------------------------------------------------
 AC_DEFUN(AC_ARG_WITH,
 [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 ac_arg_with_help="$ac_arg_with_help
 [$2]"
 AC_DIVERT_POP()dnl
-[#] Check whether --with-[$1] or --without-[$1] was given.
+@PND@ Check whether --with-[$1] or --without-[$1] was given.
 if test "[${with_]patsubst([$1], -, _)+set}" = set; then
   withval="[$with_]patsubst([$1], -, _)"
   ifelse([$3], , :, [$3])
@@ -2372,7 +2373,7 @@ AC_DEFUN(AC_TRY_COMPILER,
 [cat >conftest.$ac_ext <<EOF
 ifelse(AC_LANG, [FORTRAN77], ,
 [
-[#]line __oline__ "configure"
+@PND@line __oline__ "configure"
 #include "confdefs.h"
 ])
 [$1]
@@ -2499,10 +2500,11 @@ dnl ### Examining declarations
 
 
 dnl AC_TRY_CPP(INCLUDES, [ACTION-IF-TRUE [, ACTION-IF-FALSE]])
+dnl ----------------------------------------------------------
 AC_DEFUN(AC_TRY_CPP,
 [AC_REQUIRE_CPP()dnl
 cat >conftest.$ac_ext <<EOF
-[#]line __oline__ "configure"
+@PND@line __oline__ "configure"
 #include "confdefs.h"
 [$1]
 EOF
@@ -2539,7 +2541,7 @@ dnl              ACTION-IF-NOT-FOUND]])
 AC_DEFUN(AC_EGREP_CPP,
 [AC_REQUIRE_CPP()dnl
 cat >conftest.$ac_ext <<EOF
-[#]line __oline__ "configure"
+@PND@line __oline__ "configure"
 #include "confdefs.h"
 [$2]
 EOF
@@ -2574,8 +2576,8 @@ ifelse(AC_LANG, [FORTRAN77],
 [$2]
       end],
 [dnl This sometimes fails to find confdefs.h, for some reason.
-dnl [#]line __oline__ "[$]0"
-[#]line __oline__ "configure"
+dnl @PND@line __oline__ "[$]0"
+@PND@line __oline__ "configure"
 #include "confdefs.h"
 [$1]
 int