common/autoconf/basics.m4

changeset 864
9e177e7fc438
parent 855
ac09e62d5e6b
parent 863
56db38956113
child 874
dfbc93f26f38
child 903
067355edfbf8
equal deleted inserted replaced
856:9d5284dfc00d 864:9e177e7fc438
208 AC_DEFUN([BASIC_DEPRECATED_ARG_WITH], 208 AC_DEFUN([BASIC_DEPRECATED_ARG_WITH],
209 [ 209 [
210 AC_ARG_WITH($1, [AS_HELP_STRING([--with-$1], 210 AC_ARG_WITH($1, [AS_HELP_STRING([--with-$1],
211 [Deprecated. Option is kept for backwards compatibility and is ignored])], 211 [Deprecated. Option is kept for backwards compatibility and is ignored])],
212 [AC_MSG_WARN([Option --with-$1 is deprecated and will be ignored.])]) 212 [AC_MSG_WARN([Option --with-$1 is deprecated and will be ignored.])])
213 ])
214
215 # Register a --enable argument but mark it as deprecated
216 # $1: The name of the with argument to deprecate, not including --enable-
217 # $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -)
218 AC_DEFUN([BASIC_DEPRECATED_ARG_ENABLE],
219 [
220 AC_ARG_ENABLE($1, [AS_HELP_STRING([--enable-$1],
221 [Deprecated. Option is kept for backwards compatibility and is ignored])])
222 if test "x$enable_$2" != x; then
223 AC_MSG_WARN([Option --enable-$1 is deprecated and will be ignored.])
224 fi
213 ]) 225 ])
214 226
215 AC_DEFUN_ONCE([BASIC_INIT], 227 AC_DEFUN_ONCE([BASIC_INIT],
216 [ 228 [
217 # Save the original command line. This is passed to us by the wrapper configure script. 229 # Save the original command line. This is passed to us by the wrapper configure script.
500 MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1` 512 MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
501 IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'` 513 IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
502 if test "x$IS_GNU_MAKE" = x; then 514 if test "x$IS_GNU_MAKE" = x; then
503 AC_MSG_NOTICE([Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring.]) 515 AC_MSG_NOTICE([Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring.])
504 else 516 else
505 IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '3.8[[12346789]]'` 517 IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP '\(3\.8[[12]]\)\|\(4\.\)'`
506 if test "x$IS_MODERN_MAKE" = x; then 518 if test "x$IS_MODERN_MAKE" = x; then
507 AC_MSG_NOTICE([Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring.]) 519 AC_MSG_NOTICE([Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring.])
508 else 520 else
509 if test "x$OPENJDK_BUILD_OS" = "xwindows"; then 521 if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
510 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 522 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then

mercurial