Fix Erlang regression, introduced 2006-11-17.

* lib/autoconf/erlang.m4 (AC_LANG(Erlang)): Avoid M4 comment
caused by underquoting.
* NEWS: Mention this fix.
* THANKS: Update.
Reported by BJ Terry.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index f01284df2ada19aee459233e9b194824f896de4f..f0feca6615336d90ee2d6ff18671fe0d2d91607a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-09-16  Eric Blake  <ebb9@byu.net>
+
+       Fix Erlang regression, introduced 2006-11-17.
+       * lib/autoconf/erlang.m4 (AC_LANG(Erlang)): Avoid M4 comment
+       caused by underquoting.
+       * NEWS: Mention this fix.
+       * THANKS: Update.
+       Reported by BJ Terry.
+
 2008-09-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * lib/autoconf/general.m4 (AC_CONFIG_AUX_DIRS): Improve a bit.

diff --git a/NEWS b/NEWS
index 4c997ad25d816eaf2f7b534f117cda3d4fc78ea5..0b027a12fc7654609d2761ebf8a08bea8f688155 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 GNU Autoconf NEWS - User visible changes.
 
+* Major changes in Autoconf 2.64 (????-??-??) [stable]
+  Released by Eric Blake, based on git versions 2.63.*.
+
+** AC_LANG_ERLANG works once again (regression introduced in 2.61a).
+
 * Major changes in Autoconf 2.63 (2008-09-09) [stable]
   Released by Eric Blake, based on git versions 2.62.*.
 

diff --git a/THANKS b/THANKS
index f1e2b0443f0c072063235f5461655c53a66a2968..f39e949740f34c68ba19fc15f4e5a2519d2c0441 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -42,6 +42,7 @@ Ben Pfaff                   pfaffben@debian.org
 Bill Moseley                moseley@hank.org
 Bill Northcott              w.northcott@unsw.edu.au
 Bill Sommerfeld             sommerfeld@apollo.hp.com
+BJ Terry                    bjterry@gmail.com
 Bob Friesenhahn             bfriesen@simple.dallas.tx.us
 Bob Proulx                  bob@proulx.com
 Bob Rossi                   bob_rossi@cox.net

diff --git a/lib/autoconf/erlang.m4 b/lib/autoconf/erlang.m4
index 7c2859cfe2dc1692634087b19aabc0e5c9216a25..9bed0072ccec6e0372769a23c90cea7a0f4c3b4e 100644 (file)
--- a/lib/autoconf/erlang.m4
+++ b/lib/autoconf/erlang.m4
@@ -1,6 +1,6 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Erlang/OTP language support.
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -124,7 +124,7 @@ fi
 m4_define([AC_LANG(Erlang)],
 [ac_ext=erl
 ac_compile='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
-ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&AS_MESSAGE_LOG_FD ; echo "#!/bin/sh" > conftest$ac_exeext ; AS_ECHO(["\"$ERL\" -run conftest start -run init stop -noshell"]) >> conftest$ac_exeext ; chmod +x conftest$ac_exeext'
+ac_link='$ERLC $ERLCFLAGS -b beam conftest.$ac_ext >&AS_MESSAGE_LOG_FD ; echo "[#]!/bin/sh" > conftest$ac_exeext ; AS_ECHO(["\"$ERL\" -run conftest start -run init stop -noshell"]) >> conftest$ac_exeext ; chmod +x conftest$ac_exeext'
 ])