1.1 --- a/common/autoconf/jdk-options.m4 Thu Jan 10 12:20:16 2013 +0100
1.2 +++ b/common/autoconf/jdk-options.m4 Fri Jan 11 10:46:59 2013 +0100
1.3 @@ -247,46 +247,50 @@
1.4 AC_SUBST(BUILD_VARIANT_RELEASE)
1.5 ])
1.6
1.7 -AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
1.8 -[
1.9
1.10 ###############################################################################
1.11 #
1.12 # Should we build only OpenJDK even if closed sources are present?
1.13 #
1.14 -AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
1.15 - [supress building closed source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
1.16 +AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM],
1.17 +[
1.18 + AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
1.19 + [suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
1.20
1.21 -AC_MSG_CHECKING([for presence of closed sources])
1.22 -if test -d "$SRC_ROOT/jdk/src/closed"; then
1.23 + AC_MSG_CHECKING([for presence of closed sources])
1.24 + if test -d "$SRC_ROOT/jdk/src/closed"; then
1.25 CLOSED_SOURCE_PRESENT=yes
1.26 -else
1.27 + else
1.28 CLOSED_SOURCE_PRESENT=no
1.29 -fi
1.30 -AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT])
1.31 + fi
1.32 + AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT])
1.33
1.34 -AC_MSG_CHECKING([if closed source is supressed (openjdk-only)])
1.35 -SUPRESS_CLOSED_SOURCE="$enable_openjdk_only"
1.36 -AC_MSG_RESULT([$SUPRESS_CLOSED_SOURCE])
1.37 + AC_MSG_CHECKING([if closed source is suppressed (openjdk-only)])
1.38 + SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only"
1.39 + AC_MSG_RESULT([$SUPPRESS_CLOSED_SOURCE])
1.40
1.41 -if test "x$CLOSED_SOURCE_PRESENT" = xno; then
1.42 - OPENJDK=true
1.43 - if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then
1.44 - AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense])
1.45 + if test "x$CLOSED_SOURCE_PRESENT" = xno; then
1.46 + OPENJDK=true
1.47 + if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
1.48 + AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense])
1.49 + fi
1.50 + else
1.51 + if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
1.52 + OPENJDK=true
1.53 + else
1.54 + OPENJDK=false
1.55 + fi
1.56 fi
1.57 -else
1.58 - if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then
1.59 - OPENJDK=true
1.60 - else
1.61 - OPENJDK=false
1.62 +
1.63 + if test "x$OPENJDK" = "xtrue"; then
1.64 + SET_OPENJDK="OPENJDK=true"
1.65 fi
1.66 -fi
1.67
1.68 -if test "x$OPENJDK" = "xtrue"; then
1.69 - SET_OPENJDK="OPENJDK=true"
1.70 -fi
1.71 + AC_SUBST(SET_OPENJDK)
1.72 +])
1.73
1.74 -AC_SUBST(SET_OPENJDK)
1.75 +AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
1.76 +[
1.77
1.78 ###############################################################################
1.79 #
