Tue, 15 Jan 2013 09:50:47 +0100
Merge
1.1 --- a/common/autoconf/build-aux/autoconf-config.guess Mon Jan 14 15:30:22 2013 +0100 1.2 +++ b/common/autoconf/build-aux/autoconf-config.guess Tue Jan 15 09:50:47 2013 +0100 1.3 @@ -1,4 +1,29 @@ 1.4 #! /bin/sh 1.5 +# 1.6 +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. 1.7 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 +# 1.9 +# This code is free software; you can redistribute it and/or modify it 1.10 +# under the terms of the GNU General Public License version 2 only, as 1.11 +# published by the Free Software Foundation. Oracle designates this 1.12 +# particular file as subject to the "Classpath" exception as provided 1.13 +# by Oracle in the LICENSE file that accompanied this code. 1.14 +# 1.15 +# This code is distributed in the hope that it will be useful, but WITHOUT 1.16 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 1.17 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 1.18 +# version 2 for more details (a copy is included in the LICENSE file that 1.19 +# accompanied this code). 1.20 +# 1.21 +# You should have received a copy of the GNU General Public License version 1.22 +# 2 along with this work; if not, write to the Free Software Foundation, 1.23 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 1.24 +# 1.25 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 1.26 +# or visit www.oracle.com if you need additional information or have any 1.27 +# questions. 1.28 +# 1.29 + 1.30 # Attempt to guess a canonical system name. 1.31 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 1.32 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
2.1 --- a/common/autoconf/build-aux/config.sub Mon Jan 14 15:30:22 2013 +0100 2.2 +++ b/common/autoconf/build-aux/config.sub Tue Jan 15 09:50:47 2013 +0100 2.3 @@ -1,4 +1,30 @@ 2.4 #! /bin/sh 2.5 + 2.6 +# 2.7 +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. 2.8 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.9 +# 2.10 +# This code is free software; you can redistribute it and/or modify it 2.11 +# under the terms of the GNU General Public License version 2 only, as 2.12 +# published by the Free Software Foundation. Oracle designates this 2.13 +# particular file as subject to the "Classpath" exception as provided 2.14 +# by Oracle in the LICENSE file that accompanied this code. 2.15 +# 2.16 +# This code is distributed in the hope that it will be useful, but WITHOUT 2.17 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.18 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 2.19 +# version 2 for more details (a copy is included in the LICENSE file that 2.20 +# accompanied this code). 2.21 +# 2.22 +# You should have received a copy of the GNU General Public License version 2.23 +# 2 along with this work; if not, write to the Free Software Foundation, 2.24 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.25 +# 2.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 2.27 +# or visit www.oracle.com if you need additional information or have any 2.28 +# questions. 2.29 +# 2.30 + 2.31 # Configuration validation subroutine script. 2.32 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2.33 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
3.1 --- a/common/autoconf/build-aux/pkg.m4 Mon Jan 14 15:30:22 2013 +0100 3.2 +++ b/common/autoconf/build-aux/pkg.m4 Tue Jan 15 09:50:47 2013 +0100 3.3 @@ -1,4 +1,30 @@ 3.4 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 3.5 + 3.6 +# 3.7 +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. 3.8 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.9 +# 3.10 +# This code is free software; you can redistribute it and/or modify it 3.11 +# under the terms of the GNU General Public License version 2 only, as 3.12 +# published by the Free Software Foundation. Oracle designates this 3.13 +# particular file as subject to the "Classpath" exception as provided 3.14 +# by Oracle in the LICENSE file that accompanied this code. 3.15 +# 3.16 +# This code is distributed in the hope that it will be useful, but WITHOUT 3.17 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 3.18 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 3.19 +# version 2 for more details (a copy is included in the LICENSE file that 3.20 +# accompanied this code). 3.21 +# 3.22 +# You should have received a copy of the GNU General Public License version 3.23 +# 2 along with this work; if not, write to the Free Software Foundation, 3.24 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 3.25 +# 3.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 3.27 +# or visit www.oracle.com if you need additional information or have any 3.28 +# questions. 3.29 +# 3.30 + 3.31 # 3.32 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 3.33 #