From 24072eaa7fd8b633b2dae6c39e07451ac92e70f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Wed, 14 Apr 2004 12:47:37 +0000
Subject: [PATCH] use AC_RUN_IFELSE so we can handle cross compiling

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13716 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 cf/check-compile-et.m4 | 5 +++--
 cf/check-x.m4          | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cf/check-compile-et.m4 b/cf/check-compile-et.m4
index 3370092d1..cd8be1c27 100644
--- a/cf/check-compile-et.m4
+++ b/cf/check-compile-et.m4
@@ -27,7 +27,7 @@ if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then
     CPPFLAGS="-I/usr/include/et ${CPPFLAGS}"
   fi
   dnl Check that the `prefix' and `index' directives were honored.
-  AC_TRY_RUN([
+  AC_RUN_IFELSE([
 #include <com_err.h>
 #include <string.h>
 #include "conftest_et.h"
@@ -36,7 +36,8 @@ int main(){
 #error compile_et does not handle error_table N M
 #endif
 return (CONFTEST_CODE2 - CONFTEST_CODE1) != 127;}
-  ], [krb_cv_compile_et="yes"],[CPPFLAGS="${save_CPPFLAGS}"])
+  ], [krb_cv_compile_et="yes"],[CPPFLAGS="${save_CPPFLAGS}"],
+  [krb_cv_compile_et="no"] )
 fi
 AC_MSG_RESULT(${krb_cv_compile_et})
 if test "${krb_cv_compile_et}" = "yes"; then
diff --git a/cf/check-x.m4 b/cf/check-x.m4
index 383bf2c1e..873bd5120 100644
--- a/cf/check-x.m4
+++ b/cf/check-x.m4
@@ -32,7 +32,7 @@ if test "$no_x" != yes; then
 			done
 		fi
 		LIBS="$ac_save_libs $foo $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-		AC_TRY_RUN([
+		AC_RUN_IFELSE([
 		#include <X11/Xlib.h>
 		foo()
 		{
@@ -42,7 +42,8 @@ if test "$no_x" != yes; then
 		{
 		return 0;
 		}
-		], krb_cv_sys_x_libs_rpath="$rflag"; krb_cv_sys_x_libs="$foo"; break,:)
+		],krb_cv_sys_x_libs_rpath="$rflag"; krb_cv_sys_x_libs="$foo"; break,:,
+		krb_cv_sys_x_libs_rpath="" ; krb_cv_sys_x_libs="" ; break)
 	done
 	LIBS="$ac_save_libs"
 	CFLAGS="$ac_save_cflags"