diff options
| author | Gerd Moellmann | 2001-02-23 13:32:13 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-02-23 13:32:13 +0000 |
| commit | d0e9bfd21b2588d9dc36d3fb3fa5e9a38ab6a05e (patch) | |
| tree | 605bfe660e9fd7828b7e3e30ec8a94102b377762 | |
| parent | 3aa40e0e0256a2ab87d78b34271e0c00ed29e1d9 (diff) | |
| download | emacs-d0e9bfd21b2588d9dc36d3fb3fa5e9a38ab6a05e.tar.gz emacs-d0e9bfd21b2588d9dc36d3fb3fa5e9a38ab6a05e.zip | |
*** empty log message ***
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | configure | 25 |
2 files changed, 29 insertions, 2 deletions
| @@ -1,3 +1,9 @@ | |||
| 1 | 2001-02-23 Kenichi Handa <handa@etl.go.jp> | ||
| 2 | |||
| 3 | * configure.in: Use AC_EGREP_CPP to check if the C preprocessor | ||
| 4 | converts `..' to `. .'. If it converts, set CPP_NEED_TRADITIONAL | ||
| 5 | to `yes'. Later in AC_OUTPUT, check this variable. | ||
| 6 | |||
| 1 | 2001-02-09 Dave Love <fx@gnu.org> | 7 | 2001-02-09 Dave Love <fx@gnu.org> |
| 2 | 8 | ||
| 3 | * AUTHORS: Updated. | 9 | * AUTHORS: Updated. |
| @@ -8866,6 +8866,27 @@ test "${prefix}" != NONE && | |||
| 8866 | test "${exec_prefix}" != NONE && | 8866 | test "${exec_prefix}" != NONE && |
| 8867 | exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'` | 8867 | exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'` |
| 8868 | 8868 | ||
| 8869 | ## Check if the C preprocessor will convert `..' to `. .'. If so, set | ||
| 8870 | ## CPP_NEED_TRADITIONAL to `yes' so that the code to generate Makefile | ||
| 8871 | ## from Makefile.c can correctly provide the arg `-traditional' to the | ||
| 8872 | ## C preprocessor. | ||
| 8873 | |||
| 8874 | cat > conftest.$ac_ext <<EOF | ||
| 8875 | #line 8876 "configure" | ||
| 8876 | #include "confdefs.h" | ||
| 8877 | yes..yes | ||
| 8878 | EOF | ||
| 8879 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
| 8880 | egrep "yes..yes" >/dev/null 2>&1; then | ||
| 8881 | rm -rf conftest* | ||
| 8882 | CPP_NEED_TRADITIONAL=no | ||
| 8883 | else | ||
| 8884 | rm -rf conftest* | ||
| 8885 | CPP_NEED_TRADITIONAL=yes | ||
| 8886 | fi | ||
| 8887 | rm -f conftest* | ||
| 8888 | |||
| 8889 | |||
| 8869 | trap '' 1 2 15 | 8890 | trap '' 1 2 15 |
| 8870 | cat > confcache <<\EOF | 8891 | cat > confcache <<\EOF |
| 8871 | # This file is a shell script that caches the results of configure | 8892 | # This file is a shell script that caches the results of configure |
| @@ -9253,7 +9274,7 @@ fi; done | |||
| 9253 | 9274 | ||
| 9254 | EOF | 9275 | EOF |
| 9255 | cat >> $CONFIG_STATUS <<EOF | 9276 | cat >> $CONFIG_STATUS <<EOF |
| 9256 | GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPPFLAGS="$CPPFLAGS" | 9277 | GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPP_NEED_TRADITIONAL="$CPP_NEED_TRADITIONAL" CPPFLAGS="$CPPFLAGS" |
| 9257 | EOF | 9278 | EOF |
| 9258 | cat >> $CONFIG_STATUS <<\EOF | 9279 | cat >> $CONFIG_STATUS <<\EOF |
| 9259 | 9280 | ||
| @@ -9284,7 +9305,7 @@ make epaths-force | |||
| 9284 | # As of 2000-11-19, newest development versions of GNU cpp preprocess | 9305 | # As of 2000-11-19, newest development versions of GNU cpp preprocess |
| 9285 | # `..' to `. .' unless invoked with -traditional | 9306 | # `..' to `. .' unless invoked with -traditional |
| 9286 | 9307 | ||
| 9287 | if test "x$GCC" = xyes && test "x$NON_GNU_CPP" = x; then | 9308 | if test "x$GCC" = xyes && test "x$CPP_NEED_TRADITIONAL" = xyes; then |
| 9288 | CPPFLAGS="$CPPFLAGS -traditional" | 9309 | CPPFLAGS="$CPPFLAGS -traditional" |
| 9289 | fi | 9310 | fi |
| 9290 | 9311 | ||