From 22e43e84f4176bfefbad291c70f3b5a705356b58 Mon Sep 17 00:00:00 2001
From: Akim Demaille <akim@epita.fr>
Date: Tue, 14 Mar 2000 08:28:20 +0000
Subject: [PATCH] * acgeneral.m4: s/@%:@line __oline__/#line __oline__/g.
 __oline__ is not a macro, so there is just no use in avoiding `#'.

---
 ChangeLog               |  5 +++++
 acgeneral.m4            | 16 ++++++++--------
 lib/autoconf/general.m4 | 16 ++++++++--------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0cb6e377..22085d82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-14  Akim Demaille  <akim@epita.fr>
+
+	* acgeneral.m4: s/@%:@line __oline__/#line __oline__/g. __oline__
+	is not a macro, so there is just no use in avoiding `#'.
+
 2000-03-14  Akim Demaille  <akim@epita.fr>
 
 	* acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): When there were no
diff --git a/acgeneral.m4 b/acgeneral.m4
index 13dd7f76..123d5595 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2438,7 +2438,7 @@ AC_DEFUN(AC_TRY_COMPILER,
 [cat >conftest.$ac_ext <<EOF
 AC_LANG_CASE([FORTRAN77], ,
 [
-@%:@line __oline__ "configure"
+#line __oline__ "configure"
 #include "confdefs.h"
 ])
 [$1]
@@ -2589,7 +2589,7 @@ popdef([AC_Lib_Name])dnl
 AC_DEFUN(AC_TRY_CPP,
 [AC_REQUIRE_CPP()dnl
 cat >conftest.$ac_ext <<EOF
-@%:@line __oline__ "configure"
+#line __oline__ "configure"
 #include "confdefs.h"
 [$1]
 EOF
@@ -2631,7 +2631,7 @@ AC_DEFUN(AC_EGREP_HEADER,
 AC_DEFUN(AC_EGREP_CPP,
 [AC_REQUIRE_CPP()dnl
 cat >conftest.$ac_ext <<EOF
-@%:@line __oline__ "configure"
+#line __oline__ "configure"
 #include "confdefs.h"
 [$2]
 EOF
@@ -2670,8 +2670,8 @@ AC_LANG_CASE([FORTRAN77],
 [$2]
       end],
 [dnl This sometimes fails to find confdefs.h, for some reason.
-dnl @%:@line __oline__ "[$]0"
-@%:@line __oline__ "configure"
+dnl #line __oline__ "[$]0"
+#line __oline__ "configure"
 #include "confdefs.h"
 [$1]
 int
@@ -2716,8 +2716,8 @@ AC_LANG_CASE([FORTRAN77],
       end
 ],
 [dnl This sometimes fails to find confdefs.h, for some reason.
-dnl @%:@line __oline__ "[$]0"
-@%:@line __oline__ "configure"
+dnl #line __oline__ "[$]0"
+#line __oline__ "configure"
 #include "confdefs.h"
 [$1]
 int
@@ -2781,7 +2781,7 @@ fi
 # Like AC_TRY_RUN but assumes a native-environment (non-cross) compiler.
 AC_DEFUN(AC_TRY_RUN_NATIVE,
 [cat >conftest.$ac_ext <<EOF
-@%:@line __oline__ "configure"
+#line __oline__ "configure"
 #include "confdefs.h"
 AC_LANG_CASE(CPLUSPLUS, [#ifdef __cplusplus
 extern "C" void exit(int);
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 13dd7f76..123d5595 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2438,7 +2438,7 @@ AC_DEFUN(AC_TRY_COMPILER,
 [cat >conftest.$ac_ext <<EOF
 AC_LANG_CASE([FORTRAN77], ,
 [
-@%:@line __oline__ "configure"
+#line __oline__ "configure"
 #include "confdefs.h"
 ])
 [$1]
@@ -2589,7 +2589,7 @@ popdef([AC_Lib_Name])dnl
 AC_DEFUN(AC_TRY_CPP,
 [AC_REQUIRE_CPP()dnl
 cat >conftest.$ac_ext <<EOF
-@%:@line __oline__ "configure"
+#line __oline__ "configure"
 #include "confdefs.h"
 [$1]
 EOF
@@ -2631,7 +2631,7 @@ AC_DEFUN(AC_EGREP_HEADER,
 AC_DEFUN(AC_EGREP_CPP,
 [AC_REQUIRE_CPP()dnl
 cat >conftest.$ac_ext <<EOF
-@%:@line __oline__ "configure"
+#line __oline__ "configure"
 #include "confdefs.h"
 [$2]
 EOF
@@ -2670,8 +2670,8 @@ AC_LANG_CASE([FORTRAN77],
 [$2]
       end],
 [dnl This sometimes fails to find confdefs.h, for some reason.
-dnl @%:@line __oline__ "[$]0"
-@%:@line __oline__ "configure"
+dnl #line __oline__ "[$]0"
+#line __oline__ "configure"
 #include "confdefs.h"
 [$1]
 int
@@ -2716,8 +2716,8 @@ AC_LANG_CASE([FORTRAN77],
       end
 ],
 [dnl This sometimes fails to find confdefs.h, for some reason.
-dnl @%:@line __oline__ "[$]0"
-@%:@line __oline__ "configure"
+dnl #line __oline__ "[$]0"
+#line __oline__ "configure"
 #include "confdefs.h"
 [$1]
 int
@@ -2781,7 +2781,7 @@ fi
 # Like AC_TRY_RUN but assumes a native-environment (non-cross) compiler.
 AC_DEFUN(AC_TRY_RUN_NATIVE,
 [cat >conftest.$ac_ext <<EOF
-@%:@line __oline__ "configure"
+#line __oline__ "configure"
 #include "confdefs.h"
 AC_LANG_CASE(CPLUSPLUS, [#ifdef __cplusplus
 extern "C" void exit(int);