[PATCH RESEND util-macros] XORG_PROG_RAWCPP: use AC_LANG_SOURCE to prevent warnings

Gaetan Nadon memsize at videotron.ca
Sat Jun 4 05:00:32 PDT 2011


The source for the AC_LANG_CONFTEST should be passed to AC_LANG_SOURCE
to satisfy the more stringent testing done by autoconf 2.68.
It is available in autoconf 2.60 where AC_LANG_DEFINES_PROVIDED is not.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---

AC_LANG_SOURCE is used in the xserver configureation, so we know it is available
on all autoconf versions we support, from 2.60 to 2.68.
The VLC media player project has applied the same fix.

 xorg-macros.m4.in |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
index a21cf7e..d2ad154 100644
--- a/xorg-macros.m4.in
+++ b/xorg-macros.m4.in
@@ -64,8 +64,7 @@ AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
 # which is not the best choice for supporting other OS'es, but covers most
 # of the ones we need for now.
 AC_MSG_CHECKING([if $RAWCPP requires -undef])
-AC_LANG_CONFTEST([Does cpp redefine unix ?
-		  AC_LANG_DEFINES_PROVIDED])
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp redefine unix ?]])])
 if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
 	AC_MSG_RESULT([no])
 else
@@ -83,8 +82,7 @@ fi
 rm -f conftest.$ac_ext
 
 AC_MSG_CHECKING([if $RAWCPP requires -traditional])
-AC_LANG_CONFTEST([Does cpp preserve   "whitespace"?
-		  AC_LANG_DEFINES_PROVIDED])
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve   "whitespace"?]])])
 if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve   \"'` -eq 1 ; then
 	AC_MSG_RESULT([no])
 else
-- 
1.7.4.1



More information about the xorg-devel mailing list