summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2014-03-27 12:45:43 +0100
committerHans de Goede <hdegoede@redhat.com>2014-03-27 13:46:22 +0100
commit0677da7ed48f74a54f9bfd12afea7f0d578d7d38 (patch)
treec7444caa7ccd07d26fd3b34836eb40cd0606d842
parent6768f12b4db660bb691337c6d238a32aae0475ff (diff)
XORG_PROG_RAWCPP: Add TRADITIONALCPPFLAGS
In some cases we may want to have -traditional for proper whitespace preserving without -undef, as we actually want the system definitions to be in place so we can #ifdef on them. IE in xinit various .cpp files contain things like #ifdef __APPLE__ and #ifdef __linux__ So this patch adds a TRADITIONALCPPFLAGS variable which contains just -traditional where applicable without the other RAWCPPFLAGS for unsetting the system definitions. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--xorg-macros.m4.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
index 1680f32..f160a40 100644
--- a/xorg-macros.m4.in
+++ b/xorg-macros.m4.in
@@ -87,6 +87,7 @@ if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
AC_MSG_RESULT([no])
else
if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
+ TRADITIONALCPPFLAGS="-traditional"
RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
AC_MSG_RESULT([yes])
else
@@ -95,6 +96,7 @@ else
fi
rm -f conftest.$ac_ext
AC_SUBST(RAWCPPFLAGS)
+AC_SUBST(TRADITIONALCPPFLAGS)
]) # XORG_PROG_RAWCPP
# XORG_MANPAGE_SECTIONS()