diff options
| author | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-09-29 22:57:31 +0000 |
|---|---|---|
| committer | Alan Coopersmith <Alan.Coopersmith@sun.com> | 2005-09-29 22:57:31 +0000 |
| commit | d690e4a9febd07988d149a967791c5629c17b258 (patch) | |
| tree | 6d035e5a901fb8cc1918efcbbecc554594844710 | |
| parent | f950050734e36192307fcb11c70fbfb25fa03b9c (diff) | |
Add -undef to RAWCPPFLAGS if cpp used for RAWCPP supports it
| -rw-r--r-- | xorg-macros.m4 | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/xorg-macros.m4 b/xorg-macros.m4 index d1bfd09..14207d7 100644 --- a/xorg-macros.m4 +++ b/xorg-macros.m4 @@ -34,20 +34,37 @@ AC_REQUIRE([AC_PROG_CPP]) AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) +# Check for flag to avoid builtin definitions - assumes unix is predefined, +# 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 ?]) +if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then + AC_MSG_RESULT([no]) +else + if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then + RAWCPPFLAGS=-undef + AC_MSG_RESULT([yes]) + else + AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.]) + fi +fi +rm -f conftest.$ac_ext + AC_MSG_CHECKING([if $RAWCPP requires -traditional]) AC_LANG_CONFTEST([Does cpp preserve "whitespace"?]) 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 - RAWCPPFLAGS=-traditional - AC_SUBST(RAWCPPFLAGS) + RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" AC_MSG_RESULT([yes]) else - AC_MSG_ERROR([${CPP} does not preserve whitespace with or without -traditional. I don't know what to do.]) + AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.]) fi fi rm -f conftest.$ac_ext +AC_SUBST(RAWCPPFLAGS) ]) # XORG_PROG_RAWCPP # XORG_MANPAGE_SECTIONS() |