changeset in /hg/icedtea6: 2008-06-24 Lillian Angel <langel at re...
Lillian Angel
langel at redhat.com
Tue Jun 24 07:20:02 PDT 2008
changeset 58f4f74baacc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=58f4f74baacc
description:
2008-06-24 Lillian Angel <langel at redhat.com>
* Makefile.in: Regenerated.
* aclocal.m4: Likewise.
* configure: Likewise.
* configure.ac: Moved FIND_RHINO out of conditional so it is checked
for under all conditions.
* patches/icedtea-fonts.patch: Reverted. Dejavu-lgc-fonts are not
default on F9.
diffstat:
6 files changed, 412 insertions(+), 446 deletions(-)
ChangeLog | 10
Makefile.in | 12
aclocal.m4 | 70 ++--
configure | 660 +++++++++++++++++++------------------------
configure.ac | 2
patches/icedtea-fonts.patch | 104 ++++--
diffs (truncated from 1743 to 500 lines):
diff -r bfe0f7884fa5 -r 58f4f74baacc ChangeLog
--- a/ChangeLog Tue Jun 24 03:23:10 2008 -0400
+++ b/ChangeLog Tue Jun 24 10:19:37 2008 -0400
@@ -1,3 +1,13 @@ 2008-06-24 Gary Benson <gbenson at redhat
+2008-06-24 Lillian Angel <langel at redhat.com>
+
+ * Makefile.in: Regenerated.
+ * aclocal.m4: Likewise.
+ * configure: Likewise.
+ * configure.ac: Moved FIND_RHINO out of conditional so it is checked
+ for under all conditions.
+ * patches/icedtea-fonts.patch: Reverted. Dejavu-lgc-fonts are not
+ default on F9.
+
2008-06-24 Gary Benson <gbenson at redhat.com>
* acinclude.m4
diff -r bfe0f7884fa5 -r 58f4f74baacc Makefile.in
--- a/Makefile.in Tue Jun 24 03:23:10 2008 -0400
+++ b/Makefile.in Tue Jun 24 10:19:37 2008 -0400
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -599,6 +599,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -625,6 +629,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -770,7 +776,7 @@ uninstall-am:
.PHONY: all all-am all-local am--refresh check check-am check-local \
clean clean-generic dist dist-all dist-bzip2 dist-gzip \
- dist-shar dist-tarZ dist-zip distcheck distclean \
+ dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-local distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
diff -r bfe0f7884fa5 -r 58f4f74baacc aclocal.m4
--- a/aclocal.m4 Tue Jun 24 03:23:10 2008 -0400
+++ b/aclocal.m4 Tue Jun 24 10:19:37 2008 -0400
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,10 +11,13 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
#
@@ -84,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
@@ -137,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
@@ -174,7 +175,7 @@ fi[]dnl
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -189,7 +190,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -205,8 +206,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -478,7 +481,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -526,13 +529,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
+# 2005, 2006, 2008 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -637,16 +640,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -935,7 +939,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
diff -r bfe0f7884fa5 -r 58f4f74baacc configure
--- a/configure Tue Jun 24 03:23:10 2008 -0400
+++ b/configure Tue Jun 24 10:19:37 2008 -0400
@@ -7878,6 +7878,12 @@ echo "$as_me: error: \"A xerces2 jar was
fi
+ ac_config_files="$ac_config_files javac"
+
+ ac_config_files="$ac_config_files javap"
+
+fi
+fi
# Check whether --with-rhino-jar was given.
@@ -7920,12 +7926,6 @@ echo "$as_me: error: \"A rhino jar was n
fi
- ac_config_files="$ac_config_files javac"
-
- ac_config_files="$ac_config_files javap"
-
-fi
-fi
{ echo "$as_me:$LINENO: checking openjdk source zip" >&5
echo $ECHO_N "checking openjdk source zip... $ECHO_C" >&6; }
@@ -10321,11 +10321,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=$?
@@ -10335,15 +10334,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=$?
@@ -10353,9 +10350,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10368,9 +10364,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
@@ -10403,11 +10399,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=$?
@@ -10417,15 +10412,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=$?
@@ -10435,9 +10428,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10450,9 +10442,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
@@ -10485,11 +10477,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=$?
@@ -10499,15 +10490,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=$?
@@ -10517,9 +10506,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10532,9 +10520,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
@@ -10567,11 +10555,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=$?
@@ -10581,15 +10568,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=$?
@@ -10599,9 +10584,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10614,9 +10598,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
@@ -10649,11 +10633,10 @@ pkg_failed=no
More information about the distro-pkg-dev
mailing list