Mercurial > hg > openjdk > jigsaw
changeset 632:5a5e97f9ac0a
8006520: build-infra: Fix sparkle-framework configure parameter
Reviewed-by: tbell, ohair
author | erikj |
---|---|
date | Fri, 18 Jan 2013 09:58:23 +0100 |
parents | dc84b505b408 |
children | edad83acbd46 |
files | common/autoconf/generated-configure.sh common/makefiles/Jprt.gmk |
diffstat | 2 files changed, 30 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Wed Jan 16 22:16:51 2013 -0800 +++ b/common/autoconf/generated-configure.sh Fri Jan 18 09:58:23 2013 +0100 @@ -2927,6 +2927,32 @@ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- + +# +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + # # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. # @@ -3697,7 +3723,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1358165331 +DATE_WHEN_GENERATED=1358499442 ############################################################################### #
--- a/common/makefiles/Jprt.gmk Wed Jan 16 22:16:51 2013 -0800 +++ b/common/makefiles/Jprt.gmk Fri Jan 18 09:58:23 2013 +0100 @@ -128,6 +128,9 @@ ifdef ALT_SLASH_JAVA @$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp endif + ifdef ALT_SPARKLE_FRAMEWORK_DIR + @$(ECHO) " --with-sparkle-framework=$(call UnixPath,$(ALT_SPARKLE_FRAMEWORK_DIR)) " >> $@.tmp + endif endif @if [ -f $@ ] ; then \ if ! $(CMP) $@ $@.tmp > /dev/null ; then \