*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index fc1143eb56145724d296320000d48405b586eaf6..3f902e1fd1512d55810eaafc6cf07b70ff9643b2 100644 (file)
--- 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 09f03f07ec04b909705ae3dc2b16f4b0fea002ca..091b9e794b301ebaef575531e09972012ea109c3 100755 (executable)
--- 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