diff options
author | Gerd Moellmann <gerd@gnu.org> | 2001-02-23 13:32:13 +0000 |
---|---|---|
committer | Gerd Moellmann <gerd@gnu.org> | 2001-02-23 13:32:13 +0000 |
commit | d0e9bfd21b2588d9dc36d3fb3fa5e9a38ab6a05e (patch) | |
tree | 605bfe660e9fd7828b7e3e30ec8a94102b377762 | |
parent | 3aa40e0e0256a2ab87d78b34271e0c00ed29e1d9 (diff) | |
download | emacs-d0e9bfd21b2588d9dc36d3fb3fa5e9a38ab6a05e.tar.gz |
*** empty log message ***
-rw-r--r-- | ChangeLog | 6 | ||||
-rwxr-xr-x | configure | 25 |
2 files changed, 29 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index fc1143eb561..3f902e1fd15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-02-23 Kenichi Handa <handa@etl.go.jp> + + * configure.in: Use AC_EGREP_CPP to check if the C preprocessor + converts `..' to `. .'. If it converts, set CPP_NEED_TRADITIONAL + to `yes'. Later in AC_OUTPUT, check this variable. + 2001-02-09 Dave Love <fx@gnu.org> * AUTHORS: Updated. diff --git a/configure b/configure index 09f03f07ec0..091b9e794b3 100755 --- a/configure +++ b/configure @@ -8866,6 +8866,27 @@ test "${prefix}" != NONE && test "${exec_prefix}" != NONE && exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'` +## Check if the C preprocessor will convert `..' to `. .'. If so, set +## CPP_NEED_TRADITIONAL to `yes' so that the code to generate Makefile +## from Makefile.c can correctly provide the arg `-traditional' to the +## C preprocessor. + +cat > conftest.$ac_ext <<EOF +#line 8876 "configure" +#include "confdefs.h" +yes..yes +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "yes..yes" >/dev/null 2>&1; then + rm -rf conftest* + CPP_NEED_TRADITIONAL=no +else + rm -rf conftest* + CPP_NEED_TRADITIONAL=yes +fi +rm -f conftest* + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -9253,7 +9274,7 @@ fi; done EOF cat >> $CONFIG_STATUS <<EOF -GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPPFLAGS="$CPPFLAGS" +GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPP_NEED_TRADITIONAL="$CPP_NEED_TRADITIONAL" CPPFLAGS="$CPPFLAGS" EOF cat >> $CONFIG_STATUS <<\EOF @@ -9284,7 +9305,7 @@ make epaths-force # As of 2000-11-19, newest development versions of GNU cpp preprocess # `..' to `. .' unless invoked with -traditional -if test "x$GCC" = xyes && test "x$NON_GNU_CPP" = x; then +if test "x$GCC" = xyes && test "x$CPP_NEED_TRADITIONAL" = xyes; then CPPFLAGS="$CPPFLAGS -traditional" fi |