1.1 --- a/common/autoconf/basics.m4 Tue Oct 22 13:56:11 2013 -0700
1.2 +++ b/common/autoconf/basics.m4 Tue Oct 22 14:53:08 2013 -0700
1.3 @@ -212,6 +212,18 @@
1.4 [AC_MSG_WARN([Option --with-$1 is deprecated and will be ignored.])])
1.5 ])
1.6
1.7 +# Register a --enable argument but mark it as deprecated
1.8 +# $1: The name of the with argument to deprecate, not including --enable-
1.9 +# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -)
1.10 +AC_DEFUN([BASIC_DEPRECATED_ARG_ENABLE],
1.11 +[
1.12 + AC_ARG_ENABLE($1, [AS_HELP_STRING([--enable-$1],
1.13 + [Deprecated. Option is kept for backwards compatibility and is ignored])])
1.14 + if test "x$enable_$2" != x; then
1.15 + AC_MSG_WARN([Option --enable-$1 is deprecated and will be ignored.])
1.16 + fi
1.17 +])
1.18 +
1.19 AC_DEFUN_ONCE([BASIC_INIT],
1.20 [
1.21 # Save the original command line. This is passed to us by the wrapper configure script.
1.22 @@ -502,7 +514,7 @@
1.23 if test "x$IS_GNU_MAKE" = x; then
1.24 AC_MSG_NOTICE([Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring.])
1.25 else
1.26 - IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[[12346789]]'`
1.27 + IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[[12]]\)\|\(4\.\)'`
1.28 if test "x$IS_MODERN_MAKE" = x; then
1.29 AC_MSG_NOTICE([Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring.])
1.30 else
