diff --git a/ChangeLog b/ChangeLog
index 3ddc9b9..f656af9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-03 Hasso Tepper <hasso at quagga.net>
+
+	* configure.ac: Use AC_RUN_IFELSE instead of obsolete AC_TRY_RUN macro
+	  and define action for cross-compiling.
+
 2005-04-02 Hasso Tepper <hasso at quagga.net>
 
 	* configure.ac: Add --enable-isis-topology to enable isisd topology
diff --git a/configure.ac b/configure.ac
index 7c6258a..3e7cddf 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
 ##  Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
 ##
-## $Id: configure.ac,v 1.96 2005/04/02 19:03:39 hasso Exp $
+## $Id: configure.ac,v 1.97 2005/04/03 13:07:21 hasso Exp $
 AC_PREREQ(2.53)
 
 AC_INIT(Quagga, 0.99.0, [http://bugzilla.quagga.net])
@@ -540,7 +540,7 @@
 dnl check for broken CMSG_FIRSTHDR macro
 dnl ------------------------------------
 AC_MSG_CHECKING(for broken CMSG_FIRSTHDR)
-AC_TRY_RUN([
+AC_RUN_IFELSE([
 #ifdef SUNOS_5
 #define _XPG4_2
 #define __EXTENSIONS__
@@ -561,7 +561,7 @@
     exit(0);
   exit (1);
 }],[AC_MSG_RESULT(yes - using workaround) AC_DEFINE(HAVE_BROKEN_CMSG_FIRSTHDR,,Broken CMSG_FIRSTHDR)],
-[AC_MSG_RESULT(no)])
+[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
 
 dnl ------------------------------
 dnl check kernel route read method