changeset in /hg/icedtea6: 2008-06-23 Lillian Angel <langel at re...
Lillian Angel
langel at redhat.com
Mon Jun 23 07:00:43 PDT 2008
changeset dfa695befde7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=dfa695befde7
description:
2008-06-23 Lillian Angel <langel at redhat.com>
* aclocal.m4: Regenerated.
* configure: Regenerated.
diffstat:
3 files changed, 300 insertions(+), 373 deletions(-)
ChangeLog | 5
aclocal.m4 | 22 --
configure | 646 ++++++++++++++++++++++++++----------------------------------
diffs (truncated from 1252 to 500 lines):
diff -r 997b7df73930 -r dfa695befde7 ChangeLog
--- a/ChangeLog Mon Jun 23 11:28:37 2008 +0200
+++ b/ChangeLog Mon Jun 23 10:00:18 2008 -0400
@@ -1,3 +1,8 @@ 2008-06-22 Mark Wielaard <mark at klomp.o
+2008-06-23 Lillian Angel <langel at redhat.com>
+
+ * aclocal.m4: Regenerated.
+ * configure: Regenerated.
+
2008-06-22 Mark Wielaard <mark at klomp.org>
* patches/icedtea-rhino.patch: New patch.
diff -r 997b7df73930 -r dfa695befde7 aclocal.m4
--- a/aclocal.m4 Mon Jun 23 11:28:37 2008 +0200
+++ b/aclocal.m4 Mon Jun 23 10:00:18 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 997b7df73930 -r dfa695befde7 configure
--- a/configure Mon Jun 23 11:28:37 2008 +0200
+++ b/configure Mon Jun 23 10:00:18 2008 -0400
@@ -10277,11 +10277,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=$?
@@ -10291,15 +10290,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=$?
@@ -10309,9 +10306,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10324,9 +10320,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
@@ -10359,11 +10355,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=$?
@@ -10373,15 +10368,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=$?
@@ -10391,9 +10384,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10406,9 +10398,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
@@ -10441,11 +10433,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=$?
@@ -10455,15 +10446,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=$?
@@ -10473,9 +10462,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10488,9 +10476,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
@@ -10523,11 +10511,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=$?
@@ -10537,15 +10524,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=$?
@@ -10555,9 +10540,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10570,9 +10554,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
@@ -10605,11 +10589,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=$?
@@ -10619,15 +10602,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=$?
@@ -10637,9 +10618,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10652,9 +10632,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
@@ -10688,11 +10668,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=$?
@@ -10702,15 +10681,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=$?
@@ -10720,9 +10697,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10735,9 +10711,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
@@ -10771,11 +10747,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=$?
@@ -10785,15 +10760,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
+ 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=$?
@@ -10803,9 +10776,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10818,9 +10790,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XTST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xtst"`
+ XTST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xtst" 2>&1`
else
- XTST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xtst"`
+ XTST_PKG_ERRORS=`$PKG_CONFIG --print-errors "xtst" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$XTST_PKG_ERRORS" >&5
@@ -10853,11 +10825,10 @@ pkg_failed=no
{ echo "$as_me:$LINENO: checking for FREETYPE2" >&5
echo $ECHO_N "checking for FREETYPE2... $ECHO_C" >&6; }
More information about the distro-pkg-dev
mailing list