[PATCH] aclocal.m4: fix AC_LANG_SOURCE warnings

[Jon Ringle]

Fix the following warnings:

$ ./autogen.sh
configure.ac:375: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in 
body
../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
aclocal.m4:355: grub_CHECK_ENABLE_EXECUTE_STACK is expanded from...
configure.ac:375: the top level
configure.ac:378: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in 
body
../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
aclocal.m4:435: grub_CHECK_PIE is expanded from...
configure.ac:378: the top level
configure.ac:386: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in 
body
../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
aclocal.m4:382: grub_CHECK_STACK_PROTECTOR is expanded from...
configure.ac:386: the top level
configure.ac:392: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in 
body
../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
aclocal.m4:401: grub_CHECK_STACK_ARG_PROBE is expanded from...
configure.ac:392: the top level
configure.ac:375: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in 
body
../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
aclocal.m4:355: grub_CHECK_ENABLE_EXECUTE_STACK is expanded from...
configure.ac:375: the top level
configure.ac:378: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in 
body
../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
aclocal.m4:435: grub_CHECK_PIE is expanded from...
configure.ac:378: the top level
configure.ac:386: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in 
body
../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
aclocal.m4:382: grub_CHECK_STACK_PROTECTOR is expanded from...
configure.ac:386: the top level
configure.ac:392: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in 
body
../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
aclocal.m4:401: grub_CHECK_STACK_ARG_PROBE is expanded from...
configure.ac:392: the top level

Signed-off-by: Jon Ringle <address@hidden>
---
 aclocal.m4 |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 6f9baf1..0860be7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -354,7 +354,7 @@ fi
 dnl Check if the C compiler generates calls to `__enable_execute_stack()'.
 AC_DEFUN(grub_CHECK_ENABLE_EXECUTE_STACK,[
 AC_MSG_CHECKING([whether `$CC' generates calls to `__enable_execute_stack()'])
-AC_LANG_CONFTEST([[
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[
 void f (int (*p) (void));
 void g (int i)
 {
@@ -362,6 +362,7 @@ void g (int i)
   f (nestedfunc);
 }
 ]])
+])
 if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -S conftest.c]) && test -s conftest.s; 
then
   true
 else
@@ -384,7 +385,7 @@ AC_DEFUN(grub_CHECK_STACK_PROTECTOR,[
 ssp_possible=yes]
 AC_MSG_CHECKING([whether `$CC' accepts `-fstack-protector'])
 # Is this a reliable test case?
-AC_LANG_CONFTEST([[void foo (void) { volatile char a[8]; a[3]; }]])
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[void foo (void) { volatile char a[8]; a[3]; 
}]])])
 [# `$CC -c -o ...' might not be portable.  But, oh, well...  Is calling
 # `ac_compile' like this correct, after all?
 if eval "$ac_compile -S -fstack-protector -o conftest.s" 2> /dev/null; then]
@@ -402,7 +403,7 @@ AC_DEFUN(grub_CHECK_STACK_ARG_PROBE,[
 [# Smashing stack arg probe.
 sap_possible=yes]
 AC_MSG_CHECKING([whether `$CC' accepts `-mstack-arg-probe'])
-AC_LANG_CONFTEST([[void foo (void) { volatile char a[8]; a[3]; }]])
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[void foo (void) { volatile char a[8]; a[3]; 
}]])])
 [if eval "$ac_compile -S -mstack-arg-probe -o conftest.s" 2> /dev/null; then]
   AC_MSG_RESULT([yes])
   [# Should we clear up other files as well, having called `AC_LANG_CONFTEST'?
@@ -437,7 +438,7 @@ AC_DEFUN(grub_CHECK_PIE,[
 pie_possible=yes]
 AC_MSG_CHECKING([whether `$CC' has `-fPIE' as default])
 # Is this a reliable test case?
-AC_LANG_CONFTEST([[
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[
 #ifdef __PIE__
 int main() {
        return 0;
@@ -446,6 +447,7 @@ int main() {
 #error NO __PIE__ DEFINED
 #endif
 ]])
+])
 
 [# `$CC -c -o ...' might not be portable.  But, oh, well...  Is calling
 # `ac_compile' like this correct, after all?
-- 
1.7.5.4