From ca1d540a4176eb8d99c0a7d4ebb3106f9fc93606 Mon Sep 17 00:00:00 2001
From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Fri, 22 May 2009 22:18:54 +0300
Subject: [PATCH] configure: Fix "not a valid shell variable" with Autoconf
 2.63

Fix this error:

configure.in:1430: error: AC_SUBST: `[CONFIG_TRE]' is not a valid shell variable name
acinclude.m4:31: EL_LOG_CONFIG is expanded from...
configure.in:1430: the top level
autom4te: /usr/bin/m4 failed with exit status: 1

Reported by witekfl.
---
 config/m4/features.m4 | 4 +++-
 configure.in          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/m4/features.m4 b/config/m4/features.m4
index df87a70a..8fd4f20b 100644
--- a/config/m4/features.m4
+++ b/config/m4/features.m4
@@ -12,6 +12,8 @@ AC_DEFUN([EL_CONFIG], [
 	  AC_DEFINE($1, 1, [Define if you want: $2 support])])
 
 dnl EL_LOG_CONFIG(define, description, value)
+dnl The first parameter (define) will not be expanded by m4,
+dnl and it must be a valid name for a shell variable.
 AC_DEFUN([EL_LOG_CONFIG],
 [
 	about="$2"
@@ -29,7 +31,7 @@ AC_DEFUN([EL_LOG_CONFIG],
 	fi
 
 	if test -z "$value"; then
-		value="[$]$1"
+		value="$[$1]"
 	fi
 
 	echo "$about $dots $value" >> features.log
diff --git a/configure.in b/configure.in
index 46cbb9ad..f67afb7d 100644
--- a/configure.in
+++ b/configure.in
@@ -1441,7 +1441,7 @@ else
 fi
 AC_SUBST(TRE_CFLAGS)
 AC_SUBST(TRE_LIBS)
-EL_LOG_CONFIG([[CONFIG_TRE]], [[Regexp searching]], [[$tre_log]])
+EL_LOG_CONFIG([CONFIG_TRE], [[Regexp searching]], [[$tre_log]])
 
 
 # ===================================================================