From 13f4cbaa0690a96d512e89113f2f363a515ee7e8 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Thu, 26 Aug 2004 11:27:32 +0000 Subject: [PATCH] replace AC_TRY_CPP with AC_PREPROC_IFELSE git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14162 ec53bebd-3082-4978-b11e-865c3cabbd6b --- cf/check-netinet-ip-and-tcp.m4 | 8 ++++---- cf/roken.m4 | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cf/check-netinet-ip-and-tcp.m4 b/cf/check-netinet-ip-and-tcp.m4 index 9458ff123..65c5f6450 100644 --- a/cf/check-netinet-ip-and-tcp.m4 +++ b/cf/check-netinet-ip-and-tcp.m4 @@ -13,14 +13,14 @@ for i in netinet/ip.h netinet/tcp.h; do cv=`echo "$i" | sed 'y%./+-%__p_%'` AC_CACHE_CHECK([for $i],ac_cv_header_$cv, -[AC_TRY_CPP([\ +[AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ #ifdef HAVE_STANDARDS_H #include #endif #include <$i> -], -eval "ac_cv_header_$cv=yes", -eval "ac_cv_header_$cv=no")]) +]])], +[eval "ac_cv_header_$cv=yes"], +[eval "ac_cv_header_$cv=no"])]) ac_res=`eval echo \\$ac_cv_header_$cv` if test "$ac_res" = yes; then ac_tr_hdr=HAVE_`echo $i | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` diff --git a/cf/roken.m4 b/cf/roken.m4 index 7c02e3453..d4feddaa2 100644 --- a/cf/roken.m4 +++ b/cf/roken.m4 @@ -32,13 +32,13 @@ AC_MSG_CHECKING(for roken in $i) CPPFLAGS="-I$i/include ${CPPFLAGS}" -AC_TRY_CPP( -[#include +AC_PREPROC_IFELSE([AC_LANG_SOURCE([[ +#include #if ROKEN_VERSION < $1 #error old roken version, should be $1 fail #endif -],[roken_installed=yes; break]) +]])],[roken_installed=yes; break]) AC_MSG_RESULT($roken_installed)