changeset in /hg/icedtea: 2008-05-21 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Wed May 21 06:41:30 PDT 2008
changeset aeba6ca27fc7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=aeba6ca27fc7
description:
2008-05-21 Lillian Angel <langel at redhat.com>
* .hgignore: Updated.
* Makefile.am: Updated to build with ecj properly.
* Makefile.in: Regenerated.
* aclocal.m4: Likewise.
* configure: Likewise.
* javac.in: Changed to use 1.6 source.
diffstat:
7 files changed, 405 insertions(+), 523 deletions(-)
.hgignore | 1
ChangeLog | 9
Makefile.am | 47 ---
Makefile.in | 79 ++----
aclocal.m4 | 70 +++--
configure | 720 ++++++++++++++++++++++++++---------------------------------
javac.in | 2
diffs (truncated from 1755 to 500 lines):
diff -r e7d89bb4ea85 -r aeba6ca27fc7 .hgignore
--- a/.hgignore Thu Mar 27 10:41:54 2008 -0400
+++ b/.hgignore Wed May 21 09:41:23 2008 -0400
@@ -16,6 +16,7 @@ IcedTeaPlugin.so
IcedTeaPlugin.so
rt-source-files.txt
hotspot-tools-source-files.txt
+hotspot-tools/
rt/com/sun/jdi/AbsentInformationException.java
rt/com/sun/jdi/Accessible.java
rt/com/sun/jdi/ArrayReference.java
diff -r e7d89bb4ea85 -r aeba6ca27fc7 ChangeLog
--- a/ChangeLog Thu Mar 27 10:41:54 2008 -0400
+++ b/ChangeLog Wed May 21 09:41:23 2008 -0400
@@ -1,3 +1,12 @@ 2008-03-27 Joshua Sumali <jsumali at redh
+2008-05-21 Lillian Angel <langel at redhat.com>
+
+ * .hgignore: Updated.
+ * Makefile.am: Updated to build with ecj properly.
+ * Makefile.in: Regenerated.
+ * aclocal.m4: Likewise.
+ * configure: Likewise.
+ * javac.in: Changed to use 1.6 source.
+
2008-03-27 Joshua Sumali <jsumali at redhat.com>
* Makefile.am: Added icedtea-netx-applet-visibility.patch.
diff -r e7d89bb4ea85 -r aeba6ca27fc7 Makefile.am
--- a/Makefile.am Thu Mar 27 10:41:54 2008 -0400
+++ b/Makefile.am Wed May 21 09:41:23 2008 -0400
@@ -747,17 +747,10 @@ hotspot-tools-source-files.txt: stamps/c
mkdir -p lib/hotspot-tools
stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \
- -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
- @$< ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
- -bootclasspath '' -source 1.6 \
- -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
- @$< ; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
+ -source 1.6 \
+ -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
+ -bootclasspath '' @$<
mkdir -p stamps
touch stamps/hotspot-tools-class-files.stamp
@@ -770,16 +763,9 @@ clean-hotspot-tools:
# tools.jar
bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/hotspot-tools-class-files.stamp
mkdir -p bootstrap/jdk1.7.0/jre/lib/
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAR) cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
- -C lib/hotspot-tools org -C lib/hotspot-tools gnu -C lib/hotspot-tools java \
- -C lib/hotspot-tools javax ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
-C lib/hotspot-tools org -C lib/hotspot-tools gnu -C lib/hotspot-tools java \
- -C lib/hotspot-tools javax ; \
- fi
+ -C lib/hotspot-tools javax
if test -d bootstrap/ecj ; \
then \
mkdir -p bootstrap/ecj/lib/; \
@@ -793,17 +779,10 @@ rt-source-files.txt: stamps/clone.stamp
stamps/rt-class-files.stamp: rt-source-files.txt
mkdir -p lib/rt
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt -bootclasspath '' -source 1.6 \
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
+ -source 1.6 \
-sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
- @$< ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
- -bootclasspath '' -source 1.6 \
- -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
- @$< ; \
- fi
+ -bootclasspath '' @$<
cp -r rt/net/sourceforge/jnlp/resources \
lib/rt/net/sourceforge/jnlp/
mkdir -p stamps
@@ -817,14 +796,8 @@ clean-rt:
# rt-closed.jar.
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp
mkdir -p bootstrap/jdk1.7.0/jre/lib
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
-C lib/rt javax -C lib/rt sun -C lib/rt org -C lib/rt net ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
- -C lib/rt javax -C lib/rt sun -C lib/rt org -C lib/rt net ; \
- fi
if test -d bootstrap/ecj/jre/lib ; \
then \
cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \
diff -r e7d89bb4ea85 -r aeba6ca27fc7 Makefile.in
--- a/Makefile.in Thu Mar 27 10:41:54 2008 -0400
+++ b/Makefile.in Wed May 21 09:41:23 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.
@@ -498,6 +498,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)
@@ -524,6 +528,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*) \
@@ -667,17 +673,17 @@ uninstall-am:
.MAKE: install-am install-strip
.PHONY: all all-am all-local am--refresh check check-am clean \
- clean-generic dist dist-all dist-bzip2 dist-gzip 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 install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am
+ clean-generic dist dist-all dist-bzip2 dist-gzip 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 \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
# Top-Level Targets
@@ -1148,17 +1154,10 @@ hotspot-tools-source-files.txt: stamps/c
mkdir -p lib/hotspot-tools
stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \
- -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
- @$< ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
- -bootclasspath '' -source 1.6 \
- -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
- @$< ; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
+ -source 1.6 \
+ -sourcepath 'rt:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):generated' \
+ -bootclasspath '' @$<
mkdir -p stamps
touch stamps/hotspot-tools-class-files.stamp
@@ -1171,16 +1170,9 @@ clean-hotspot-tools:
# tools.jar
bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/hotspot-tools-class-files.stamp
mkdir -p bootstrap/jdk1.7.0/jre/lib/
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAR) cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
- -C lib/hotspot-tools org -C lib/hotspot-tools gnu -C lib/hotspot-tools java \
- -C lib/hotspot-tools javax ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
-C lib/hotspot-tools org -C lib/hotspot-tools gnu -C lib/hotspot-tools java \
- -C lib/hotspot-tools javax ; \
- fi
+ -C lib/hotspot-tools javax
if test -d bootstrap/ecj ; \
then \
mkdir -p bootstrap/ecj/lib/; \
@@ -1194,17 +1186,10 @@ rt-source-files.txt: stamps/clone.stamp
stamps/rt-class-files.stamp: rt-source-files.txt
mkdir -p lib/rt
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt -bootclasspath '' -source 1.6 \
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
+ -source 1.6 \
-sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
- @$< ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
- -bootclasspath '' -source 1.6 \
- -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
- @$< ; \
- fi
+ -bootclasspath '' @$<
cp -r rt/net/sourceforge/jnlp/resources \
lib/rt/net/sourceforge/jnlp/
mkdir -p stamps
@@ -1218,14 +1203,8 @@ clean-rt:
# rt-closed.jar.
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp
mkdir -p bootstrap/jdk1.7.0/jre/lib
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
-C lib/rt javax -C lib/rt sun -C lib/rt org -C lib/rt net ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
- -C lib/rt javax -C lib/rt sun -C lib/rt org -C lib/rt net ; \
- fi
if test -d bootstrap/ecj/jre/lib ; \
then \
cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \
diff -r e7d89bb4ea85 -r aeba6ca27fc7 aclocal.m4
--- a/aclocal.m4 Thu Mar 27 10:41:54 2008 -0400
+++ b/aclocal.m4 Wed May 21 09:41:23 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 e7d89bb4ea85 -r aeba6ca27fc7 configure
--- a/configure Thu Mar 27 10:41:54 2008 -0400
+++ b/configure Wed May 21 09:41:23 2008 -0400
@@ -8668,11 +8668,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=$?
@@ -8682,15 +8681,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=$?
@@ -8700,9 +8697,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -8715,9 +8711,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
@@ -8750,11 +8746,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=$?
@@ -8764,15 +8759,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"
More information about the distro-pkg-dev
mailing list