minor stuff

diff --git a/acgeneral.m4 b/acgeneral.m4
index 6e77b16bc81743e3450c44e9cc0803c4dd24f3f8..7b809a243935ca3cb820191e33eb946caabf5e45 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -494,7 +494,7 @@ fi
 dnl
 AC_DEFUN(AC_ENABLE,
 [AC_OBSOLETE([$0], [; instead use AC_ARG_ENABLE])dnl
-AC_ARG_ENABLE([$1], [--enable-$1], [$2], [$3])dnl
+AC_ARG_ENABLE([$1], [  --enable-$1], [$2], [$3])dnl
 ])dnl
 dnl
 dnl AC_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE [, ACTION-IF-FALSE])
@@ -515,7 +515,7 @@ fi
 dnl
 AC_DEFUN(AC_WITH,
 [AC_OBSOLETE([$0], [; instead use AC_ARG_WITH])dnl
-AC_ARG_WITH([$1], [--with-$1], [$2], [$3])dnl
+AC_ARG_WITH([$1], [  --with-$1], [$2], [$3])dnl
 ])dnl
 dnl
 dnl AC_CONFIG_HEADER(HEADER-TO-CREATE ...)
@@ -1121,7 +1121,7 @@ dnl              ACTION-IF-NOT-FOUND])
 AC_DEFUN(AC_EGREP_CPP,
 [AC_REQUIRE_CPP()dnl
 cat > conftest.${ac_ext} <<EOF
-#line __LINE__ "configure"
+[#]line __oline__ "configure"
 #include "confdefs.h"
 [$2]
 EOF
@@ -1152,8 +1152,8 @@ dnl             ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
 AC_DEFUN(AC_TRY_LINK,
 [cat > conftest.${ac_ext} <<EOF
 dnl This sometimes fails to find confdefs.h, for some reason.
-dnl [#]line __LINE__ "[$]0"
-#line __LINE__ "configure"
+dnl [#]line __oline__ "[$]0"
+[#]line __oline__ "configure"
 #include "confdefs.h"
 ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
 extern "C" void exit(int);
@@ -1187,7 +1187,7 @@ $4
 ])
 else
 cat > conftest.${ac_ext} <<EOF
-#line __LINE__ "configure"
+[#]line __oline__ "configure"
 #include "confdefs.h"
 ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
 extern "C" void exit(int);
@@ -1209,7 +1209,7 @@ dnl AC_TRY_CPP(INCLUDES, ACTION-IF-TRUE [, ACTION-IF-FALSE])
 AC_DEFUN(AC_TRY_CPP,
 [AC_REQUIRE_CPP()dnl
 cat > conftest.${ac_ext} <<EOF
-#line __LINE__ "configure"
+[#]line __oline__ "configure"
 #include "confdefs.h"
 [$1]
 EOF

diff --git a/autoconf.in b/autoconf.in
index ac8e87b4c31df602e6ed3fc50dd9aec81f232c7a..5edf0b7b71e1cf33ec2fc31fa46a74d7787e7700 100644 (file)
--- a/autoconf.in
+++ b/autoconf.in
@@ -117,10 +117,10 @@ fi
 
 # Put the real line numbers into configure to make config.log more helpful.
 awk '
-/__LINE__/ { printf "%d:", NR + 1 }
+/__oline__/ { printf "%d:", NR + 1 }
            { print }
 ' $tmpout | sed '
-/__LINE__/s/^\([0-9][0-9]*\):\(.*\)__LINE__\(.*\)$/\2\1\3/
+/__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__\(.*\)$/\2\1\3/
 '
 
 rm -f $tmpout

diff --git a/autoconf.sh b/autoconf.sh
index ac8e87b4c31df602e6ed3fc50dd9aec81f232c7a..5edf0b7b71e1cf33ec2fc31fa46a74d7787e7700 100644 (file)
--- a/autoconf.sh
+++ b/autoconf.sh
@@ -117,10 +117,10 @@ fi
 
 # Put the real line numbers into configure to make config.log more helpful.
 awk '
-/__LINE__/ { printf "%d:", NR + 1 }
+/__oline__/ { printf "%d:", NR + 1 }
            { print }
 ' $tmpout | sed '
-/__LINE__/s/^\([0-9][0-9]*\):\(.*\)__LINE__\(.*\)$/\2\1\3/
+/__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__\(.*\)$/\2\1\3/
 '
 
 rm -f $tmpout

diff --git a/bin/autoconf.in b/bin/autoconf.in
index ac8e87b4c31df602e6ed3fc50dd9aec81f232c7a..5edf0b7b71e1cf33ec2fc31fa46a74d7787e7700 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -117,10 +117,10 @@ fi
 
 # Put the real line numbers into configure to make config.log more helpful.
 awk '
-/__LINE__/ { printf "%d:", NR + 1 }
+/__oline__/ { printf "%d:", NR + 1 }
            { print }
 ' $tmpout | sed '
-/__LINE__/s/^\([0-9][0-9]*\):\(.*\)__LINE__\(.*\)$/\2\1\3/
+/__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__\(.*\)$/\2\1\3/
 '
 
 rm -f $tmpout

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 6e77b16bc81743e3450c44e9cc0803c4dd24f3f8..7b809a243935ca3cb820191e33eb946caabf5e45 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -494,7 +494,7 @@ fi
 dnl
 AC_DEFUN(AC_ENABLE,
 [AC_OBSOLETE([$0], [; instead use AC_ARG_ENABLE])dnl
-AC_ARG_ENABLE([$1], [--enable-$1], [$2], [$3])dnl
+AC_ARG_ENABLE([$1], [  --enable-$1], [$2], [$3])dnl
 ])dnl
 dnl
 dnl AC_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE [, ACTION-IF-FALSE])
@@ -515,7 +515,7 @@ fi
 dnl
 AC_DEFUN(AC_WITH,
 [AC_OBSOLETE([$0], [; instead use AC_ARG_WITH])dnl
-AC_ARG_WITH([$1], [--with-$1], [$2], [$3])dnl
+AC_ARG_WITH([$1], [  --with-$1], [$2], [$3])dnl
 ])dnl
 dnl
 dnl AC_CONFIG_HEADER(HEADER-TO-CREATE ...)
@@ -1121,7 +1121,7 @@ dnl              ACTION-IF-NOT-FOUND])
 AC_DEFUN(AC_EGREP_CPP,
 [AC_REQUIRE_CPP()dnl
 cat > conftest.${ac_ext} <<EOF
-#line __LINE__ "configure"
+[#]line __oline__ "configure"
 #include "confdefs.h"
 [$2]
 EOF
@@ -1152,8 +1152,8 @@ dnl             ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])
 AC_DEFUN(AC_TRY_LINK,
 [cat > conftest.${ac_ext} <<EOF
 dnl This sometimes fails to find confdefs.h, for some reason.
-dnl [#]line __LINE__ "[$]0"
-#line __LINE__ "configure"
+dnl [#]line __oline__ "[$]0"
+[#]line __oline__ "configure"
 #include "confdefs.h"
 ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
 extern "C" void exit(int);
@@ -1187,7 +1187,7 @@ $4
 ])
 else
 cat > conftest.${ac_ext} <<EOF
-#line __LINE__ "configure"
+[#]line __oline__ "configure"
 #include "confdefs.h"
 ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
 extern "C" void exit(int);
@@ -1209,7 +1209,7 @@ dnl AC_TRY_CPP(INCLUDES, ACTION-IF-TRUE [, ACTION-IF-FALSE])
 AC_DEFUN(AC_TRY_CPP,
 [AC_REQUIRE_CPP()dnl
 cat > conftest.${ac_ext} <<EOF
-#line __LINE__ "configure"
+[#]line __oline__ "configure"
 #include "confdefs.h"
 [$1]
 EOF