summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhasso <hasso>2005-04-03 23:46:37 +0000
committerhasso <hasso>2005-04-03 23:46:37 +0000
commit5b0875287206a0ac1ebe1dca1f6235b8f3df1764 (patch)
tree858915835d6b97e8f2a23444713a56e605388027
parentd33e8d7bd348ac6a4ae023ce560b918b7d480fcb (diff)
* configure.ac: Fix AC_LANG_SOURCE usage. It needs double square
brackets around source. Single ones broke square brackets in the code (arrays).
-rw-r--r--ChangeLog6
-rwxr-xr-xconfigure.ac6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f656af92..fd424da7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-04 Hasso Tepper <hasso at quagga.net>
+
+ * configure.ac: Fix AC_LANG_SOURCE usage. It needs double square
+ brackets around source. Single ones broke square brackets in the
+ code (arrays).
+
2005-04-03 Hasso Tepper <hasso at quagga.net>
* configure.ac: Use AC_RUN_IFELSE instead of obsolete AC_TRY_RUN macro
diff --git a/configure.ac b/configure.ac
index 3e7cddf4..eba7d89d 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.97 2005/04/03 13:07:21 hasso Exp $
+## $Id: configure.ac,v 1.98 2005/04/03 23:46:37 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_RUN_IFELSE([
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
#ifdef SUNOS_5
#define _XPG4_2
#define __EXTENSIONS__
@@ -560,7 +560,7 @@ main()
if (CMSG_FIRSTHDR(&msg) != NULL)
exit(0);
exit (1);
-}],[AC_MSG_RESULT(yes - using workaround) AC_DEFINE(HAVE_BROKEN_CMSG_FIRSTHDR,,Broken CMSG_FIRSTHDR)],
+}]])],[AC_MSG_RESULT(yes - using workaround) AC_DEFINE(HAVE_BROKEN_CMSG_FIRSTHDR,,Broken CMSG_FIRSTHDR)],
[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
dnl ------------------------------