(AC_BINSH): New macro.

(AC_INIT, AC_REVISION): Require AC_BINSH first thing.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 684a3f4bd9315df41d87d168ebcd3a7934a5d25c..db5ed2e990985fc377cc751a25a4106b91a9ab75 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -351,8 +351,15 @@ if test -n "$ac_prev"; then
 fi
 ])dnl
 dnl
+dnl Try to have only one #! line, just so it doesn't look funny.
+dnl
+define(AC_BINSH,
+[AC_PROVIDE([AC_BINSH])dnl
+dnl AC_REQUIRE inserts a newline after this.
+#!/bin/sh])dnl
+dnl
 define(AC_INIT,
-[#!/bin/sh
+[AC_REQUIRE([AC_BINSH])dnl
 AC_NOTICE
 AC_PARSEARGS
 AC_PREPARE($1)])dnl
@@ -465,9 +472,8 @@ dnl AC_CONFIG_HEADER(HEADER-TO-CREATE ...)
 define(AC_CONFIG_HEADER, [define(AC_CONFIG_NAMES, $1)])dnl
 dnl
 dnl AC_REVISION(REVISION-INFO)
-define(AC_REVISION, [translit([#!/bin/sh
-# From configure.in $1
-],$")])dnl
+define(AC_REVISION, [AC_REQUIRE([AC_BINSH])dnl
+[# From configure.in] translit([$1],$")])dnl
 dnl
 dnl Subroutines of AC_PREREQ.
 dnl

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 684a3f4bd9315df41d87d168ebcd3a7934a5d25c..db5ed2e990985fc377cc751a25a4106b91a9ab75 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -351,8 +351,15 @@ if test -n "$ac_prev"; then
 fi
 ])dnl
 dnl
+dnl Try to have only one #! line, just so it doesn't look funny.
+dnl
+define(AC_BINSH,
+[AC_PROVIDE([AC_BINSH])dnl
+dnl AC_REQUIRE inserts a newline after this.
+#!/bin/sh])dnl
+dnl
 define(AC_INIT,
-[#!/bin/sh
+[AC_REQUIRE([AC_BINSH])dnl
 AC_NOTICE
 AC_PARSEARGS
 AC_PREPARE($1)])dnl
@@ -465,9 +472,8 @@ dnl AC_CONFIG_HEADER(HEADER-TO-CREATE ...)
 define(AC_CONFIG_HEADER, [define(AC_CONFIG_NAMES, $1)])dnl
 dnl
 dnl AC_REVISION(REVISION-INFO)
-define(AC_REVISION, [translit([#!/bin/sh
-# From configure.in $1
-],$")])dnl
+define(AC_REVISION, [AC_REQUIRE([AC_BINSH])dnl
+[# From configure.in] translit([$1],$")])dnl
 dnl
 dnl Subroutines of AC_PREREQ.
 dnl