summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhasso <hasso>2005-04-03 13:07:21 +0000
committerhasso <hasso>2005-04-03 13:07:21 +0000
commitd33e8d7bd348ac6a4ae023ce560b918b7d480fcb (patch)
tree80ad5a81f2eaf8f7b6a4310952738fef71e11159
parent08dbfb691d8e03c7200138d55447fc29916e0362 (diff)
* configure.ac: Use AC_RUN_IFELSE instead of obsolete AC_TRY_RUN macro
and define action for cross-compiling. [backport candidate]
-rw-r--r--ChangeLog5
-rwxr-xr-xconfigure.ac6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ddc9b9f..f656af92 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 7c6258a1..3e7cddf4 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 ------------------------------------
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 @@ main()
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