changeset in /hg/icedtea: 2008-06-10 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Sun Jun 22 12:34:50 PDT 2008
changeset c400aa599d8b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c400aa599d8b
description:
2008-06-10 Lillian Angel <langel at redhat.com>
* Makefile.in: Regenerated.
* aclocal.m4: Likewise.
* configure: Likewise.
* generated/sun/misc/Version.java: Likewise.
* generated/sun/tools/jconsole/Version.java: Likewise.
diffstat:
6 files changed, 312 insertions(+), 378 deletions(-)
ChangeLog | 8
Makefile.in | 3
aclocal.m4 | 22
configure | 651 ++++++++++++-----------------
generated/sun/misc/Version.java | 4
generated/sun/tools/jconsole/Version.java | 2
diffs (truncated from 1329 to 500 lines):
diff -r 5e8339d7f686 -r c400aa599d8b ChangeLog
--- a/ChangeLog Tue Jun 10 11:42:05 2008 +0200
+++ b/ChangeLog Tue Jun 10 10:21:11 2008 -0400
@@ -1,3 +1,11 @@ 2008-06-10 Matthias Klose <doko at ubuntu
+2008-06-10 Lillian Angel <langel at redhat.com>
+
+ * Makefile.in: Regenerated.
+ * aclocal.m4: Likewise.
+ * configure: Likewise.
+ * generated/sun/misc/Version.java: Likewise.
+ * generated/sun/tools/jconsole/Version.java: Likewise.
+
2008-06-10 Matthias Klose <doko at ubuntu.com>
* patches/icedtea-no-bcopy.patch: New.
diff -r 5e8339d7f686 -r c400aa599d8b Makefile.in
--- a/Makefile.in Tue Jun 10 11:42:05 2008 +0200
+++ b/Makefile.in Tue Jun 10 10:21:11 2008 -0400
@@ -422,7 +422,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
patches/icedtea-color-createcontext.patch \
patches/icedtea-fonts.patch patches/icedtea-gervill.patch \
patches/icedtea-directaudio-close-trick.patch \
- patches/icedtea-sparc.patch patches/icedtea-sparc64-linux.patch \
+ patches/icedtea-sparc.patch \
+ patches/icedtea-sparc64-linux.patch \
patches/icedtea-sparc-ptracefix.patch \
patches/icedtea-sparc-trapsfix.patch \
patches/icedtea-override-redirect-metacity.patch \
diff -r 5e8339d7f686 -r c400aa599d8b aclocal.m4
--- a/aclocal.m4 Tue Jun 10 11:42:05 2008 +0200
+++ b/aclocal.m4 Tue Jun 10 10:21:11 2008 -0400
@@ -87,16 +87,14 @@ fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- fi
-else
- pkg_failed=untried
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -140,9 +138,9 @@ if test $pkg_failed = yes; then
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
diff -r 5e8339d7f686 -r c400aa599d8b configure
--- a/configure Tue Jun 10 11:42:05 2008 +0200
+++ b/configure Tue Jun 10 10:21:11 2008 -0400
@@ -734,6 +734,7 @@ PARALLEL_JOBS
PARALLEL_JOBS
BUILD_ARCH_DIR
INSTALL_ARCH_DIR
+JRE_ARCH_DIR
JAVA
JAVAC
JAVAH
@@ -5992,6 +5993,7 @@ fi
+
if test "${with_openjdk}" == true
then
JAVA=$SYSTEM_OPENJDK_DIR/bin/java
@@ -10231,11 +10233,10 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for XPROTO" >&5
echo $ECHO_N "checking for XPROTO... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$XPROTO_CFLAGS"; then
- pkg_cv_XPROTO_CFLAGS="$XPROTO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$XPROTO_CFLAGS"; then
+ pkg_cv_XPROTO_CFLAGS="$XPROTO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
($PKG_CONFIG --exists --print-errors "xproto") 2>&5
ac_status=$?
@@ -10245,15 +10246,13 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$XPROTO_LIBS"; then
- pkg_cv_XPROTO_LIBS="$XPROTO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ else
+ pkg_failed=untried
+fi
+if test -n "$XPROTO_LIBS"; then
+ pkg_cv_XPROTO_LIBS="$XPROTO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto\"") >&5
($PKG_CONFIG --exists --print-errors "xproto") 2>&5
ac_status=$?
@@ -10263,9 +10262,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10278,9 +10276,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto"`
+ XPROTO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xproto" 2>&1`
else
- XPROTO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto"`
+ XPROTO_PKG_ERRORS=`$PKG_CONFIG --print-errors "xproto" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$XPROTO_PKG_ERRORS" >&5
@@ -10313,11 +10311,10 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for XT" >&5
echo $ECHO_N "checking for XT... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$XT_CFLAGS"; then
- pkg_cv_XT_CFLAGS="$XT_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$XT_CFLAGS"; then
+ pkg_cv_XT_CFLAGS="$XT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
($PKG_CONFIG --exists --print-errors "xt") 2>&5
ac_status=$?
@@ -10327,15 +10324,13 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$XT_LIBS"; then
- pkg_cv_XT_LIBS="$XT_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ else
+ pkg_failed=untried
+fi
+if test -n "$XT_LIBS"; then
+ pkg_cv_XT_LIBS="$XT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
($PKG_CONFIG --exists --print-errors "xt") 2>&5
ac_status=$?
@@ -10345,9 +10340,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10360,9 +10354,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xt"`
+ XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xt" 2>&1`
else
- XT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xt"`
+ XT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xt" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$XT_PKG_ERRORS" >&5
@@ -10395,11 +10389,10 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for XP" >&5
echo $ECHO_N "checking for XP... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$XP_CFLAGS"; then
- pkg_cv_XP_CFLAGS="$XP_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$XP_CFLAGS"; then
+ pkg_cv_XP_CFLAGS="$XP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xp\"") >&5
($PKG_CONFIG --exists --print-errors "xp") 2>&5
ac_status=$?
@@ -10409,15 +10402,13 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$XP_LIBS"; then
- pkg_cv_XP_LIBS="$XP_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ else
+ pkg_failed=untried
+fi
+if test -n "$XP_LIBS"; then
+ pkg_cv_XP_LIBS="$XP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xp\"") >&5
($PKG_CONFIG --exists --print-errors "xp") 2>&5
ac_status=$?
@@ -10427,9 +10418,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10442,9 +10432,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xp"`
+ XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xp" 2>&1`
else
- XP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xp"`
+ XP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xp" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$XP_PKG_ERRORS" >&5
@@ -10477,11 +10467,10 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for X11" >&5
echo $ECHO_N "checking for X11... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$X11_CFLAGS"; then
- pkg_cv_X11_CFLAGS="$X11_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$X11_CFLAGS"; then
+ pkg_cv_X11_CFLAGS="$X11_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
($PKG_CONFIG --exists --print-errors "x11") 2>&5
ac_status=$?
@@ -10491,15 +10480,13 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$X11_LIBS"; then
- pkg_cv_X11_LIBS="$X11_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ else
+ pkg_failed=untried
+fi
+if test -n "$X11_LIBS"; then
+ pkg_cv_X11_LIBS="$X11_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
($PKG_CONFIG --exists --print-errors "x11") 2>&5
ac_status=$?
@@ -10509,9 +10496,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10524,9 +10510,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"`
+ X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1`
else
- X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"`
+ X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$X11_PKG_ERRORS" >&5
@@ -10559,11 +10545,10 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for XINERAMA" >&5
echo $ECHO_N "checking for XINERAMA... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$XINERAMA_CFLAGS"; then
- pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$XINERAMA_CFLAGS"; then
+ pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xinerama\"") >&5
($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
ac_status=$?
@@ -10573,15 +10558,13 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$XINERAMA_LIBS"; then
- pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ else
+ pkg_failed=untried
+fi
+if test -n "$XINERAMA_LIBS"; then
+ pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xinerama\"") >&5
($PKG_CONFIG --exists --print-errors "xinerama") 2>&5
ac_status=$?
@@ -10591,9 +10574,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10606,9 +10588,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xinerama"`
+ XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xinerama" 2>&1`
else
- XINERAMA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xinerama"`
+ XINERAMA_PKG_ERRORS=`$PKG_CONFIG --print-errors "xinerama" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$XINERAMA_PKG_ERRORS" >&5
@@ -10642,11 +10624,10 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for LIBPNG" >&5
echo $ECHO_N "checking for LIBPNG... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBPNG_CFLAGS"; then
- pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBPNG_CFLAGS"; then
+ pkg_cv_LIBPNG_CFLAGS="$LIBPNG_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5
($PKG_CONFIG --exists --print-errors "libpng") 2>&5
ac_status=$?
@@ -10656,15 +10637,13 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBPNG_LIBS"; then
- pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ else
+ pkg_failed=untried
+fi
+if test -n "$LIBPNG_LIBS"; then
+ pkg_cv_LIBPNG_LIBS="$LIBPNG_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5
($PKG_CONFIG --exists --print-errors "libpng") 2>&5
ac_status=$?
@@ -10674,9 +10653,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10689,9 +10667,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpng"`
+ LIBPNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpng" 2>&1`
else
- LIBPNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng"`
+ LIBPNG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpng" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBPNG_PKG_ERRORS" >&5
@@ -10725,11 +10703,10 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for XTST" >&5
echo $ECHO_N "checking for XTST... $ECHO_C" >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$XTST_CFLAGS"; then
- pkg_cv_XTST_CFLAGS="$XTST_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$XTST_CFLAGS"; then
+ pkg_cv_XTST_CFLAGS="$XTST_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xtst\"") >&5
($PKG_CONFIG --exists --print-errors "xtst") 2>&5
ac_status=$?
@@ -10739,15 +10716,13 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$XTST_LIBS"; then
- pkg_cv_XTST_LIBS="$XTST_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ else
+ pkg_failed=untried
+fi
+if test -n "$XTST_LIBS"; then
+ pkg_cv_XTST_LIBS="$XTST_LIBS"
+ elif test -n "$PKG_CONFIG"; then
More information about the distro-pkg-dev
mailing list