[build] Update SOS CFLAGS and add check for GNU Make in configure.ac
2006-05-28 Paul Jakma <paul.jakma@sun.com>
* configure.ac: Update SOS CFLAGS, Xt shouldn't be used and
enable debug options.
Add a check for GNU Make and warn the user if it does not appear
to be the make used.
diff --git a/ChangeLog b/ChangeLog
index 094ee59..f36e31e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-28 Paul Jakma <paul.jakma@sun.com>
+
+ * configure.ac: Update SOS CFLAGS, Xt shouldn't be used and
+ enable debug options.
+ Add a check for GNU Make and warn the user if it does not appear
+ to be the make used.
+
2006-05-10 Paul Jakma <paul.jakma@sun.com>
* configure.ac: Bump to 0.99.4
diff --git a/configure.ac b/configure.ac
index 79b191f..e173fca 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.120 2006/05/10 19:52:36 paul Exp $
+## $Id$
AC_PREREQ(2.53)
AC_INIT(Quagga, 0.99.4, [http://bugzilla.quagga.net])
@@ -122,7 +122,7 @@
AC_MSG_RESULT([gcc default])
;;
"SUNPRO")
- CFLAGS="-xO4 -xspace -xcode=pic32 -xstrconst -Xt -xc99"
+ CFLAGS="-xO4 -v -g -xspace -xcode=pic32 -xstrconst -xc99"
AC_MSG_RESULT([SunPro default])
;;
*)
@@ -141,6 +141,22 @@
AC_CHECK_TOOL(AR, ar)
AC_CHECK_TOOL(RANLIB, ranlib, :)
+dnl ---------------------------
+dnl We, perhaps unfortunately,
+dnl depend on GNU Make specific
+dnl constructs.
+dnl Give the user a warning if
+dnl not GNU Make.
+dnl ---------------------------
+AC_CACHE_CHECK([if ${MAKE-make} is GNU make], [quagga_cv_gnu_make],
+ [quagga_cv_gnu_make=no
+ if ${MAKE-make} --version 2>/dev/null | \
+ grep '^GNU Make ' >/dev/null ; then
+ quagga_cv_gnu_make=yes;
+ fi
+ ]
+)
+
dnl ---------
dnl AIX check
dnl ---------
@@ -1375,5 +1391,11 @@
log file mask : ${enable_logfile_mask}
The above user and group must have read/write access to the state file
-directory and to the config files in the config file directory.
-"
+directory and to the config files in the config file directory."
+
+if test x"$quagga_cv_gnu_make" = x"no"; then echo "
+Warning: The ${MAKE-make} programme detected, either in your path or
+via the MAKE variable, is not GNU Make. GNU make may be installed as
+gmake on some systems. and is required to complete a build of Quagga
+" > /dev/stderr
+fi