Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/generated-configure.sh	Wed Jan 16 22:16:51 2013 -0800
     1.2 +++ b/common/autoconf/generated-configure.sh	Fri Jan 18 09:58:23 2013 +0100
     1.3 @@ -2927,6 +2927,32 @@
     1.4  
     1.5  
     1.6  # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
     1.7 +
     1.8 +#
     1.9 +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    1.10 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    1.11 +#
    1.12 +# This code is free software; you can redistribute it and/or modify it
    1.13 +# under the terms of the GNU General Public License version 2 only, as
    1.14 +# published by the Free Software Foundation.  Oracle designates this
    1.15 +# particular file as subject to the "Classpath" exception as provided
    1.16 +# by Oracle in the LICENSE file that accompanied this code.
    1.17 +#
    1.18 +# This code is distributed in the hope that it will be useful, but WITHOUT
    1.19 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    1.20 +# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    1.21 +# version 2 for more details (a copy is included in the LICENSE file that
    1.22 +# accompanied this code).
    1.23 +#
    1.24 +# You should have received a copy of the GNU General Public License version
    1.25 +# 2 along with this work; if not, write to the Free Software Foundation,
    1.26 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1.27 +#
    1.28 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    1.29 +# or visit www.oracle.com if you need additional information or have any
    1.30 +# questions.
    1.31 +#
    1.32 +
    1.33  #
    1.34  # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
    1.35  #
    1.36 @@ -3697,7 +3723,7 @@
    1.37  #CUSTOM_AUTOCONF_INCLUDE
    1.38  
    1.39  # Do not change or remove the following line, it is needed for consistency checks:
    1.40 -DATE_WHEN_GENERATED=1358165331
    1.41 +DATE_WHEN_GENERATED=1358499442
    1.42  
    1.43  ###############################################################################
    1.44  #

     2.1 --- a/common/makefiles/Jprt.gmk	Wed Jan 16 22:16:51 2013 -0800
     2.2 +++ b/common/makefiles/Jprt.gmk	Fri Jan 18 09:58:23 2013 +0100
     2.3 @@ -128,6 +128,9 @@
     2.4    ifdef ALT_SLASH_JAVA
     2.5  	@$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp
     2.6    endif
     2.7 +  ifdef ALT_SPARKLE_FRAMEWORK_DIR
     2.8 +	@$(ECHO) " --with-sparkle-framework=$(call UnixPath,$(ALT_SPARKLE_FRAMEWORK_DIR)) " >> $@.tmp
     2.9 +  endif 
    2.10  endif
    2.11  	@if [ -f $@ ] ; then \
    2.12            if ! $(CMP) $@ $@.tmp > /dev/null ; then \