* acgeneral.m4 (_AC_PREPROC_IFELSE, AC_PREPROC_IFELSE): New.

(AC_TRY_CPP): Use AC_PREPROC_IFELSE.
(AC_CHECK_MEMBER, AC_CHECK_DECL, _AC_CHECK_TYPE_NEW): Quote
properly.
* acheaders.m4 (AC_CHECK_HEADER): Quote properly, use
AC_PREPROC_IFELSE.
* acspecific.m4 (_AC_PATH_X_DIRECT): Use AC_PREPROC_IFELSE.

diff --git a/ChangeLog b/ChangeLog
index 443f2c77459e38ad5eb34fea20729632573e70b8..6e3bdf9b553de13dd8c83b5e6e180630803903bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-12-15  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (_AC_PREPROC_IFELSE, AC_PREPROC_IFELSE): New.
+       (AC_TRY_CPP): Use AC_PREPROC_IFELSE.
+       (AC_CHECK_MEMBER, AC_CHECK_DECL, _AC_CHECK_TYPE_NEW): Quote
+       properly.
+       * acheaders.m4 (AC_CHECK_HEADER): Quote properly, use
+       AC_PREPROC_IFELSE.
+       * acspecific.m4 (_AC_PATH_X_DIRECT): Use AC_PREPROC_IFELSE.
+
 2000-12-15  Akim Demaille  <akim@epita.fr>
 
        * m4sugar.m4 (m4_init): Catch `dnl'.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 044a6eb85fd943aff905cba31555bd9fcb9a6c87..0cccd20c2dc1e39a0cce0b3d9bd8c21e5097c151 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2344,8 +2344,8 @@ AC_CACHE_CHECK([for $1], ac_Member,
 m4_patsubst([$1], [\..*]) foo;
 dnl foo.MEMBER;
 foo.m4_patsubst([$1], [^[^.]*\.]);])],
-                AC_VAR_SET(ac_Member, yes),
-                AC_VAR_SET(ac_Member, no))])
+                [AC_VAR_SET(ac_Member, yes)],
+                [AC_VAR_SET(ac_Member, no)])])
 AS_IFELSE([test AC_VAR_GET(ac_Member) = yes],
           [$2], [$3])dnl
 AC_VAR_POPDEF([ac_Member])dnl
@@ -2744,16 +2744,12 @@ fi
 ])# _AC_TRY_CPP
 
 
-# AC_TRY_CPP(INCLUDES, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-# ---------------------------------------------------------
-# AC_TRY_CPP is used to check whether particular header files exist.
-# You can check for one at a time, or more than one if you need several
-# header files to all exist for some purpose.
-#
-# INCLUDES are not defaulted.
-AC_DEFUN([AC_TRY_CPP],
-[AC_LANG_PREPROC_REQUIRE()dnl
-AC_LANG_CONFTEST([AC_LANG_SOURCE([[$1]])])
+# _AC_PREPROC_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+# ----------------------------------------------------------------
+# Try to preprocess PROGRAM.
+# This macro can be used during the selection of a preprocessor.
+AC_DEFUN([_AC_PREPROC_IFELSE],
+[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl
 _AC_TRY_CPP()
 if test -z "$ac_cpp_err"; then
   m4_default([$2], :)
@@ -2763,8 +2759,29 @@ else
   cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
   $3
 fi
-rm -f conftest*
-])# AC_TRY_CPP
+rm -f conftest.err m4_ifval([$1], [conftest.$ac_ext])[]dnl
+])# _AC_PREPROC_IFELSE
+
+
+# AC_PREPROC_IFELSE(PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# --------------------------------------------------------------------
+# Try to preprocess PROGRAM.  Requires that the preprocessor for the
+# current language was checked for, hence do not use this macro in macros
+# looking for a preprocessor.
+AC_DEFUN([AC_PREPROC_IFELSE],
+[AC_LANG_PREPROC_REQUIRE()dnl
+_AC_PREPROC_IFELSE($@)])
+
+
+# AC_TRY_CPP(INCLUDES, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+# ---------------------------------------------------------
+# AC_TRY_CPP is used to check whether particular header files exist.
+# You can check for one at a time, or more than one if you need several
+# header files to all exist for some purpose.
+#
+# INCLUDES are not defaulted and are double quoted.
+AC_DEFUN([AC_TRY_CPP],
+[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[$1]])], [$2], [$3])])
 
 
 # AC_EGREP_CPP(PATTERN, PROGRAM,
@@ -3005,7 +3022,8 @@ AC_CACHE_CHECK([whether $1 is declared], ac_Symbol,
   char *p = (char *) $1;
 #endif
 ])],
-AC_VAR_SET(ac_Symbol, yes), AC_VAR_SET(ac_Symbol, no))])
+                   [AC_VAR_SET(ac_Symbol, yes)],
+                   [AC_VAR_SET(ac_Symbol, no)])])
 AS_IFELSE([test AC_VAR_GET(ac_Symbol) = yes],
           [$2], [$3])dnl
 AC_VAR_POPDEF([ac_Symbol])dnl
@@ -3236,8 +3254,8 @@ AC_CACHE_CHECK([for $1], ac_Type,
   return 0;
 if (sizeof ($1))
   return 0;])],
-                AC_VAR_SET(ac_Type, yes),
-                AC_VAR_SET(ac_Type, no))])
+                   [AC_VAR_SET(ac_Type, yes)],
+                   [AC_VAR_SET(ac_Type, no)])])
 AS_IFELSE([test AC_VAR_GET(ac_Type) = yes],
           [$2], [$3])dnl
 AC_VAR_POPDEF([ac_Type])dnl

diff --git a/acheaders.m4 b/acheaders.m4
index a91109e874ff0f42179d37cdec59d08f5ba83a6b..ae730de51d0c7085e4070b0be453f36a31bbf75a 100644 (file)
--- a/acheaders.m4
+++ b/acheaders.m4
@@ -64,11 +64,12 @@
 # ----------------------------------------------------------------------
 AC_DEFUN([AC_CHECK_HEADER],
 [AC_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])dnl
-AC_ARG_VAR([CPPFLAGS], [C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir>])
+AC_ARG_VAR([CPPFLAGS],
+           [C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir>])
 AC_CACHE_CHECK([for $1], ac_Header,
-[AC_TRY_CPP([#include <$1>
-],
-AC_VAR_SET(ac_Header, yes), AC_VAR_SET(ac_Header, no))])
+               [AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <$1>])],
+                                  [AC_VAR_SET(ac_Header, yes)],
+                                  [AC_VAR_SET(ac_Header, no)])])
 AS_IFELSE([test AC_VAR_GET(ac_Header) = yes],
           [$2], [$3])dnl
 AC_VAR_POPDEF([ac_Header])dnl

diff --git a/acspecific.m4 b/acspecific.m4
index 2899554cd483b365792bfa179852eb11828b3a52..7ec1ef9bcae7e6623764f390f31175022de2e232 100644 (file)
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -909,7 +909,7 @@ ac_x_header_dirs='
 if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
-  AC_TRY_CPP([@%:@include <X11/Intrinsic.h>],
+  AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])],
 [# We can compile using X headers with no special include directory.
 ac_x_includes=],
 [for ac_dir in $ac_x_header_dirs; do

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 044a6eb85fd943aff905cba31555bd9fcb9a6c87..0cccd20c2dc1e39a0cce0b3d9bd8c21e5097c151 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2344,8 +2344,8 @@ AC_CACHE_CHECK([for $1], ac_Member,
 m4_patsubst([$1], [\..*]) foo;
 dnl foo.MEMBER;
 foo.m4_patsubst([$1], [^[^.]*\.]);])],
-                AC_VAR_SET(ac_Member, yes),
-                AC_VAR_SET(ac_Member, no))])
+                [AC_VAR_SET(ac_Member, yes)],
+                [AC_VAR_SET(ac_Member, no)])])
 AS_IFELSE([test AC_VAR_GET(ac_Member) = yes],
           [$2], [$3])dnl
 AC_VAR_POPDEF([ac_Member])dnl
@@ -2744,16 +2744,12 @@ fi
 ])# _AC_TRY_CPP
 
 
-# AC_TRY_CPP(INCLUDES, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
-# ---------------------------------------------------------
-# AC_TRY_CPP is used to check whether particular header files exist.
-# You can check for one at a time, or more than one if you need several
-# header files to all exist for some purpose.
-#
-# INCLUDES are not defaulted.
-AC_DEFUN([AC_TRY_CPP],
-[AC_LANG_PREPROC_REQUIRE()dnl
-AC_LANG_CONFTEST([AC_LANG_SOURCE([[$1]])])
+# _AC_PREPROC_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+# ----------------------------------------------------------------
+# Try to preprocess PROGRAM.
+# This macro can be used during the selection of a preprocessor.
+AC_DEFUN([_AC_PREPROC_IFELSE],
+[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl
 _AC_TRY_CPP()
 if test -z "$ac_cpp_err"; then
   m4_default([$2], :)
@@ -2763,8 +2759,29 @@ else
   cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
   $3
 fi
-rm -f conftest*
-])# AC_TRY_CPP
+rm -f conftest.err m4_ifval([$1], [conftest.$ac_ext])[]dnl
+])# _AC_PREPROC_IFELSE
+
+
+# AC_PREPROC_IFELSE(PROGRAM, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# --------------------------------------------------------------------
+# Try to preprocess PROGRAM.  Requires that the preprocessor for the
+# current language was checked for, hence do not use this macro in macros
+# looking for a preprocessor.
+AC_DEFUN([AC_PREPROC_IFELSE],
+[AC_LANG_PREPROC_REQUIRE()dnl
+_AC_PREPROC_IFELSE($@)])
+
+
+# AC_TRY_CPP(INCLUDES, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+# ---------------------------------------------------------
+# AC_TRY_CPP is used to check whether particular header files exist.
+# You can check for one at a time, or more than one if you need several
+# header files to all exist for some purpose.
+#
+# INCLUDES are not defaulted and are double quoted.
+AC_DEFUN([AC_TRY_CPP],
+[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[$1]])], [$2], [$3])])
 
 
 # AC_EGREP_CPP(PATTERN, PROGRAM,
@@ -3005,7 +3022,8 @@ AC_CACHE_CHECK([whether $1 is declared], ac_Symbol,
   char *p = (char *) $1;
 #endif
 ])],
-AC_VAR_SET(ac_Symbol, yes), AC_VAR_SET(ac_Symbol, no))])
+                   [AC_VAR_SET(ac_Symbol, yes)],
+                   [AC_VAR_SET(ac_Symbol, no)])])
 AS_IFELSE([test AC_VAR_GET(ac_Symbol) = yes],
           [$2], [$3])dnl
 AC_VAR_POPDEF([ac_Symbol])dnl
@@ -3236,8 +3254,8 @@ AC_CACHE_CHECK([for $1], ac_Type,
   return 0;
 if (sizeof ($1))
   return 0;])],
-                AC_VAR_SET(ac_Type, yes),
-                AC_VAR_SET(ac_Type, no))])
+                   [AC_VAR_SET(ac_Type, yes)],
+                   [AC_VAR_SET(ac_Type, no)])])
 AS_IFELSE([test AC_VAR_GET(ac_Type) = yes],
           [$2], [$3])dnl
 AC_VAR_POPDEF([ac_Type])dnl

diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4
index a91109e874ff0f42179d37cdec59d08f5ba83a6b..ae730de51d0c7085e4070b0be453f36a31bbf75a 100644 (file)
--- a/lib/autoconf/headers.m4
+++ b/lib/autoconf/headers.m4
@@ -64,11 +64,12 @@
 # ----------------------------------------------------------------------
 AC_DEFUN([AC_CHECK_HEADER],
 [AC_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])dnl
-AC_ARG_VAR([CPPFLAGS], [C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir>])
+AC_ARG_VAR([CPPFLAGS],
+           [C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir>])
 AC_CACHE_CHECK([for $1], ac_Header,
-[AC_TRY_CPP([#include <$1>
-],
-AC_VAR_SET(ac_Header, yes), AC_VAR_SET(ac_Header, no))])
+               [AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <$1>])],
+                                  [AC_VAR_SET(ac_Header, yes)],
+                                  [AC_VAR_SET(ac_Header, no)])])
 AS_IFELSE([test AC_VAR_GET(ac_Header) = yes],
           [$2], [$3])dnl
 AC_VAR_POPDEF([ac_Header])dnl

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index 2899554cd483b365792bfa179852eb11828b3a52..7ec1ef9bcae7e6623764f390f31175022de2e232 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -909,7 +909,7 @@ ac_x_header_dirs='
 if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
-  AC_TRY_CPP([@%:@include <X11/Intrinsic.h>],
+  AC_PREPROC_IFELSE([AC_LANG_SOURCE([@%:@include <X11/Intrinsic.h>])],
 [# We can compile using X headers with no special include directory.
 ac_x_includes=],
 [for ac_dir in $ac_x_header_dirs; do