changeset in /hg/icedtea: Fix regressions from IcedTea6 merge.
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Thu May 29 14:13:54 PDT 2008
changeset 9b36b3114eec in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9b36b3114eec
description:
Fix regressions from IcedTea6 merge.
diffstat:
6 files changed, 175 insertions(+), 92 deletions(-)
ChangeLog | 11 +
Makefile.am | 13 +
Makefile.in | 15 +-
configure | 204 +++++++++++++++++++----------
configure.ac | 22 +--
generated/sun/tools/jconsole/Version.java | 2
diffs (490 lines):
diff -r 0e9e31da45ab -r 9b36b3114eec ChangeLog
--- a/ChangeLog Mon May 26 19:36:53 2008 +0100
+++ b/ChangeLog Mon May 26 20:28:23 2008 +0100
@@ -1,3 +1,14 @@ 2008-05-26 Andrew John Hughes <gnu_and
+2008-05-26 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ Make plugin install optional again.
+ * b/Makefile.in,
+ * b/configure: Regenerated.
+ * b/configure.ac:
+ Fix regressions due to merge.
+ * b/generated/sun/tools/jconsole/Version.java:
+ Regenerated.
+
2008-05-26 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/icedtea-ecj.patch:
diff -r 0e9e31da45ab -r 9b36b3114eec Makefile.am
--- a/Makefile.am Mon May 26 19:36:53 2008 +0100
+++ b/Makefile.am Mon May 26 20:28:23 2008 +0100
@@ -952,11 +952,14 @@ extra-lib/about.jar: stamps/extra-class-
# gcjwebplugin.so.
gcjwebplugin.so: gcjwebplugin.cc
- $(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \
- $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \
- $(GTK_CFLAGS) $(GTK_LIBS) \
- -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
- -fpic -shared -o $@ $<
+ if test "$(ENABLE_PLUGIN)" == "yes" ; \
+ then \
+ $(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \
+ $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \
+ $(GTK_CFLAGS) $(GTK_LIBS) \
+ -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
+ -fpic -shared -o $@ $< ; \
+ fi
clean-gcjwebplugin:
rm -f gcjwebplugin.so
diff -r 0e9e31da45ab -r 9b36b3114eec Makefile.in
--- a/Makefile.in Mon May 26 19:36:53 2008 +0100
+++ b/Makefile.in Mon May 26 20:28:23 2008 +0100
@@ -115,6 +115,7 @@ ECJ = @ECJ@
ECJ = @ECJ@
ECJ_JAR = @ECJ_JAR@
EGREP = @EGREP@
+ENABLE_PLUGIN = @ENABLE_PLUGIN@
EXEEXT = @EXEEXT@
FASTJAR = @FASTJAR@
FILE = @FILE@
@@ -150,6 +151,7 @@ MAKE = @MAKE@
MAKE = @MAKE@
MAKEINFO = @MAKEINFO@
MD5SUM = @MD5SUM@
+MERCURIAL = @MERCURIAL@
MKDIR_P = @MKDIR_P@
MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
MOZILLA_LIBS = @MOZILLA_LIBS@
@@ -1391,11 +1393,14 @@ extra-lib/about.jar: stamps/extra-class-
# gcjwebplugin.so.
gcjwebplugin.so: gcjwebplugin.cc
- $(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \
- $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \
- $(GTK_CFLAGS) $(GTK_LIBS) \
- -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
- -fpic -shared -o $@ $<
+ if test "$(ENABLE_PLUGIN)" == "yes" ; \
+ then \
+ $(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \
+ $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \
+ $(GTK_CFLAGS) $(GTK_LIBS) \
+ -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
+ -fpic -shared -o $@ $< ; \
+ fi
clean-gcjwebplugin:
rm -f gcjwebplugin.so
diff -r 0e9e31da45ab -r 9b36b3114eec configure
--- a/configure Mon May 26 19:36:53 2008 +0100
+++ b/configure Mon May 26 20:28:23 2008 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for icedtea6 1.2.
+# Generated by GNU Autoconf 2.61 for icedtea 1.6.
#
# Report bugs to <fitzsim at redhat.com>.
#
@@ -572,10 +572,10 @@ SHELL=${CONFIG_SHELL-/bin/sh}
SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
-PACKAGE_NAME='icedtea6'
-PACKAGE_TARNAME='icedtea6'
-PACKAGE_VERSION='1.2'
-PACKAGE_STRING='icedtea6 1.2'
+PACKAGE_NAME='icedtea'
+PACKAGE_TARNAME='icedtea'
+PACKAGE_VERSION='1.6'
+PACKAGE_STRING='icedtea 1.6'
PACKAGE_BUGREPORT='fitzsim at redhat.com'
ac_default_prefix=bootstrap
@@ -724,10 +724,7 @@ SYSTEM_OPENJDK_DIR
SYSTEM_OPENJDK_DIR
SYSTEM_ICEDTEA_DIR
SYSTEM_ANT_DIR
-ENABLE_PLUGIN_TRUE
-ENABLE_PLUGIN_FALSE
-ENABLE_LIVECONNECT_TRUE
-ENABLE_LIVECONNECT_FALSE
+ENABLE_PLUGIN
ENABLE_DOCS_TRUE
ENABLE_DOCS_FALSE
WITH_ICEDTEA_TRUE
@@ -776,6 +773,7 @@ NETX_PLUGIN_FALSE
NETX_PLUGIN_FALSE
CORE_BUILD_TRUE
CORE_BUILD_FALSE
+MERCURIAL
PKG_CONFIG
XPROTO_CFLAGS
XPROTO_LIBS
@@ -1347,7 +1345,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures icedtea6 1.2 to adapt to many kinds of systems.
+\`configure' configures icedtea 1.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1395,7 +1393,7 @@ Fine tuning of the installation director
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/icedtea6]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/icedtea]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1417,7 +1415,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of icedtea6 1.2:";;
+ short | recursive ) echo "Configuration of icedtea 1.6:";;
esac
cat <<\_ACEOF
@@ -1427,7 +1425,6 @@ Optional Features:
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--disable-gcjwebplugin Disable compilation of browser plugin
- --enable-liveconnect Enable experimental LiveConnect plugin
--disable-docs Disable generation of documentation
--disable-optimizations build with -O0 -g [default=no]
--enable-zero use zero-assembler port on non-zero platforms
@@ -1576,7 +1573,7 @@ test -n "$ac_init_help" && exit $ac_stat
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-icedtea6 configure 1.2
+icedtea configure 1.6
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1590,7 +1587,7 @@ This file contains any messages produced
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by icedtea6 $as_me 1.2, which was
+It was created by icedtea $as_me 1.6, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2279,8 +2276,8 @@ fi
# Define the identity of the package.
- PACKAGE='icedtea6'
- VERSION='1.2'
+ PACKAGE='icedtea'
+ VERSION='1.6'
cat >>confdefs.h <<_ACEOF
@@ -5872,34 +5869,11 @@ fi
# Check whether --enable-gcjwebplugin was given.
if test "${enable_gcjwebplugin+set}" = set; then
- enableval=$enable_gcjwebplugin; enable_plugin="$val"
-else
- enable_plugin="yes"
-fi
-
- if test "x${enable_plugin}" = "xyes"; then
- ENABLE_PLUGIN_TRUE=
- ENABLE_PLUGIN_FALSE='#'
-else
- ENABLE_PLUGIN_TRUE='#'
- ENABLE_PLUGIN_FALSE=
-fi
-
-
-# Check whether --enable-liveconnect was given.
-if test "${enable_liveconnect+set}" = set; then
- enableval=$enable_liveconnect; enable_liveconnect="yes"
-else
- enable_liveconnect="no"
-fi
-
- if test "x${enable_liveconnect}" = "xyes"; then
- ENABLE_LIVECONNECT_TRUE=
- ENABLE_LIVECONNECT_FALSE='#'
-else
- ENABLE_LIVECONNECT_TRUE='#'
- ENABLE_LIVECONNECT_FALSE=
-fi
+ enableval=$enable_gcjwebplugin; ENABLE_PLUGIN="$val"
+else
+ ENABLE_PLUGIN='yes'
+fi
+
# Check whether --enable-docs was given.
@@ -9472,6 +9446,118 @@ fi
fi
+if test "$ALT_OPENJDK_SRC_ZIP" = "not specified"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}hg", so it can be a program name with args.
+set dummy ${ac_tool_prefix}hg; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_MERCURIAL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $MERCURIAL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MERCURIAL="$MERCURIAL" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MERCURIAL="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+MERCURIAL=$ac_cv_path_MERCURIAL
+if test -n "$MERCURIAL"; then
+ { echo "$as_me:$LINENO: result: $MERCURIAL" >&5
+echo "${ECHO_T}$MERCURIAL" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_MERCURIAL"; then
+ ac_pt_MERCURIAL=$MERCURIAL
+ # Extract the first word of "hg", so it can be a program name with args.
+set dummy hg; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_ac_pt_MERCURIAL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ac_pt_MERCURIAL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_MERCURIAL="$ac_pt_MERCURIAL" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_MERCURIAL="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_MERCURIAL=$ac_cv_path_ac_pt_MERCURIAL
+if test -n "$ac_pt_MERCURIAL"; then
+ { echo "$as_me:$LINENO: result: $ac_pt_MERCURIAL" >&5
+echo "${ECHO_T}$ac_pt_MERCURIAL" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_pt_MERCURIAL" = x; then
+ MERCURIAL=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ MERCURIAL=$ac_pt_MERCURIAL
+ fi
+else
+ MERCURIAL="$ac_cv_path_MERCURIAL"
+fi
+
+ if test x"$MERCURIAL" = x ; then
+ { { echo "$as_me:$LINENO: error: hg program not found in PATH" >&5
+echo "$as_me: error: hg program not found in PATH" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+
+fi
+
for ac_header in cups/cups.h cups/ppd.h
@@ -11761,8 +11847,6 @@ fi
fi
-
-
if test "x${ZERO_BUILD_TRUE}" = x; then
@@ -12221,20 +12305,6 @@ Usually this means the macro was only in
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${ENABLE_PLUGIN_TRUE}" && test -z "${ENABLE_PLUGIN_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_PLUGIN\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"ENABLE_PLUGIN\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "${ENABLE_LIVECONNECT_TRUE}" && test -z "${ENABLE_LIVECONNECT_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_LIVECONNECT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"ENABLE_LIVECONNECT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
if test -z "${ENABLE_DOCS_TRUE}" && test -z "${ENABLE_DOCS_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"ENABLE_DOCS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -12654,7 +12724,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by icedtea6 $as_me 1.2, which was
+This file was extended by icedtea $as_me 1.6, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12701,7 +12771,7 @@ _ACEOF
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-icedtea6 config.status 1.2
+icedtea config.status 1.6
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -13024,10 +13094,7 @@ SYSTEM_OPENJDK_DIR!$SYSTEM_OPENJDK_DIR$a
SYSTEM_OPENJDK_DIR!$SYSTEM_OPENJDK_DIR$ac_delim
SYSTEM_ICEDTEA_DIR!$SYSTEM_ICEDTEA_DIR$ac_delim
SYSTEM_ANT_DIR!$SYSTEM_ANT_DIR$ac_delim
-ENABLE_PLUGIN_TRUE!$ENABLE_PLUGIN_TRUE$ac_delim
-ENABLE_PLUGIN_FALSE!$ENABLE_PLUGIN_FALSE$ac_delim
-ENABLE_LIVECONNECT_TRUE!$ENABLE_LIVECONNECT_TRUE$ac_delim
-ENABLE_LIVECONNECT_FALSE!$ENABLE_LIVECONNECT_FALSE$ac_delim
+ENABLE_PLUGIN!$ENABLE_PLUGIN$ac_delim
ENABLE_DOCS_TRUE!$ENABLE_DOCS_TRUE$ac_delim
ENABLE_DOCS_FALSE!$ENABLE_DOCS_FALSE$ac_delim
WITH_ICEDTEA_TRUE!$WITH_ICEDTEA_TRUE$ac_delim
@@ -13076,6 +13143,7 @@ NETX_PLUGIN_FALSE!$NETX_PLUGIN_FALSE$ac_
NETX_PLUGIN_FALSE!$NETX_PLUGIN_FALSE$ac_delim
CORE_BUILD_TRUE!$CORE_BUILD_TRUE$ac_delim
CORE_BUILD_FALSE!$CORE_BUILD_FALSE$ac_delim
+MERCURIAL!$MERCURIAL$ac_delim
PKG_CONFIG!$PKG_CONFIG$ac_delim
XPROTO_CFLAGS!$XPROTO_CFLAGS$ac_delim
XPROTO_LIBS!$XPROTO_LIBS$ac_delim
@@ -13107,7 +13175,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 93; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r 0e9e31da45ab -r 9b36b3114eec configure.ac
--- a/configure.ac Mon May 26 19:36:53 2008 +0100
+++ b/configure.ac Mon May 26 20:28:23 2008 +0100
@@ -1,5 +1,5 @@ AC_PREREQ([2.61])
AC_PREREQ([2.61])
-AC_INIT([icedtea6], [1.2], [fitzsim at redhat.com])
+AC_INIT([icedtea], [1.6], [fitzsim at redhat.com])
AM_INIT_AUTOMAKE([tar-pax])
AC_CONFIG_FILES([Makefile])
AC_CANONICAL_HOST
@@ -99,16 +99,10 @@ AC_SUBST(SYSTEM_ANT_DIR)
AC_SUBST(SYSTEM_ANT_DIR)
AC_ARG_ENABLE([gcjwebplugin],
- [AS_HELP_STRING([--disable-gcjwebplugin],
+ [AS_HELP_STRING([--disable-gcjwebplugin],
[Disable compilation of browser plugin])],
- [enable_plugin="$val"], [enable_plugin="yes"])
-AM_CONDITIONAL(ENABLE_PLUGIN, test "x${enable_plugin}" = "xyes")
-
-AC_ARG_ENABLE([liveconnect],
- [AS_HELP_STRING([--enable-liveconnect],
- [Enable experimental LiveConnect plugin])],
- [enable_liveconnect="yes"], [enable_liveconnect="no"])
-AM_CONDITIONAL(ENABLE_LIVECONNECT, test "x${enable_liveconnect}" = "xyes")
+ [ENABLE_PLUGIN="$val"], [ENABLE_PLUGIN='yes'])
+AC_SUBST(ENABLE_PLUGIN)
AC_ARG_ENABLE([docs],
[AS_HELP_STRING([--disable-docs],
@@ -216,7 +210,11 @@ ENABLE_NETX_PLUGIN
ENABLE_NETX_PLUGIN
SET_CORE_BUILD
-dnl pkgconfig cannot be used to finid these headers and libraries.
+if test "$ALT_OPENJDK_SRC_ZIP" = "not specified"; then
+ FIND_TOOL([MERCURIAL],[hg])
+fi
+
+dnl pkgconfig cannot be used to find these headers and libraries.
AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
,[AC_MSG_ERROR("CUPS headers were not found -
try installing cups-devel.")])
@@ -375,8 +373,6 @@ AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
fi
-AC_SUBST(LIBFFI_CFLAGS)
-AC_SUBST(LIBFFI_LIBS)
if test "x${ZERO_BUILD_TRUE}" = x; then
dnl Check for libffi headers and libraries.
diff -r 0e9e31da45ab -r 9b36b3114eec generated/sun/tools/jconsole/Version.java
--- a/generated/sun/tools/jconsole/Version.java Mon May 26 19:36:53 2008 +0100
+++ b/generated/sun/tools/jconsole/Version.java Mon May 26 20:28:23 2008 +0100
@@ -29,7 +29,7 @@ import java.io.PrintStream;
public class Version {
private static final String jconsole_version =
- "1.6.0-b09";
+ "1.7.0-b26";
public static void print(PrintStream ps) {
printFullVersion(ps);
More information about the distro-pkg-dev
mailing list