changeset in /hg/icedtea6: 2008-05-20 Lillian Angel <langel at re...
Lillian Angel
langel at redhat.com
Tue May 20 08:15:44 PDT 2008
changeset 47be7e06b551 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=47be7e06b551
description:
2008-05-20 Lillian Angel <langel at redhat.com>
* Makefile.am: Updated JAVAC calls so ecj wrapper script is used.
* Makefile.in: Regenerated.
* aclocal.m4: Likewise.
* configure: Likewise.
* javac.in: Updated to use source 1.6 instead of 1.5.
diffstat:
6 files changed, 340 insertions(+), 490 deletions(-)
ChangeLog | 8
Makefile.am | 76 +-----
Makefile.in | 76 +-----
aclocal.m4 | 22 --
configure | 646 ++++++++++++++++++++++++++---------------------------------
javac.in | 2
diffs (truncated from 1506 to 500 lines):
diff -r f42fc832db86 -r 47be7e06b551 ChangeLog
--- a/ChangeLog Mon May 19 10:33:03 2008 +0200
+++ b/ChangeLog Tue May 20 11:15:37 2008 -0400
@@ -1,3 +1,11 @@ 2008-05-19 Mark Wielaard <mark at klomp.o
+2008-05-20 Lillian Angel <langel at redhat.com>
+
+ * Makefile.am: Updated JAVAC calls so ecj wrapper script is used.
+ * Makefile.in: Regenerated.
+ * aclocal.m4: Likewise.
+ * configure: Likewise.
+ * javac.in: Updated to use source 1.6 instead of 1.5.
+
2008-05-19 Mark Wielaard <mark at klomp.org>
* test/jtreg/com/sun/javatest/lib/*.java: Added.
diff -r f42fc832db86 -r 47be7e06b551 Makefile.am
--- a/Makefile.am Mon May 19 10:33:03 2008 +0200
+++ b/Makefile.am Tue May 20 11:15:37 2008 -0400
@@ -793,17 +793,10 @@ hotspot-tools-source-files.txt: stamps/e
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
@@ -816,16 +809,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 java \
- -C lib/hotspot-tools javax ; \
- else \
- $(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 java \
- -C lib/hotspot-tools javax ; \
- fi
+ $(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 java \
+ -C lib/hotspot-tools javax
if test -d bootstrap/ecj ; \
then \
mkdir -p bootstrap/ecj/lib/; \
@@ -839,17 +825,10 @@ rt-source-files.txt: stamps/extract.stam
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 \
- -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
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
+ -source 1.6 \
+ -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+ -bootclasspath '' @$<
cp -r rt/net/sourceforge/jnlp/resources \
lib/rt/net/sourceforge/jnlp/
mkdir -p stamps
@@ -863,14 +842,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 java \
- -C lib/rt javax -C lib/rt sun -C lib/rt net; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
- -C lib/rt javax -C lib/rt net -C lib/rt sun; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
+ -C lib/rt javax -C lib/rt net -C lib/rt sun
if test -d bootstrap/ecj/jre/lib ; \
then \
cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \
@@ -883,17 +856,10 @@ stamps/extra-class-files.stamp: extra-so
stamps/extra-class-files.stamp: extra-source-files.txt \
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
mkdir -p extra-lib
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib -bootclasspath '' -source 1.6 \
- -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- @extra-source-files.txt ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
- -bootclasspath '' -source 1.6 \
- -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- @extra-source-files.txt ; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
+ -source 1.6 \
+ -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+ -bootclasspath '' extra-source-files.txt
cp -r extra/net/sourceforge/jnlp/about/resources \
extra-lib/net/sourceforge/jnlp/about
mkdir -p stamps
@@ -905,13 +871,7 @@ clean-extra:
rm -f extra-source-files.txt
extra-lib/about.jar: stamps/extra-class-files.stamp
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAR) cf $@ -C extra-lib net ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \
- fi
-
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net
# gcjwebplugin.so.
gcjwebplugin.so: gcjwebplugin.cc
if test "$(ENABLE_PLUGIN)" == "yes" ; \
diff -r f42fc832db86 -r 47be7e06b551 Makefile.in
--- a/Makefile.in Mon May 19 10:33:03 2008 +0200
+++ b/Makefile.in Tue May 20 11:15:37 2008 -0400
@@ -1229,17 +1229,10 @@ hotspot-tools-source-files.txt: stamps/e
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
@@ -1252,16 +1245,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 java \
- -C lib/hotspot-tools javax ; \
- else \
- $(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 java \
- -C lib/hotspot-tools javax ; \
- fi
+ $(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 java \
+ -C lib/hotspot-tools javax
if test -d bootstrap/ecj ; \
then \
mkdir -p bootstrap/ecj/lib/; \
@@ -1275,17 +1261,10 @@ rt-source-files.txt: stamps/extract.stam
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 \
- -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
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
+ -source 1.6 \
+ -sourcepath rt:$(OPENJDK_SOURCEPATH_DIRS):generated \
+ -bootclasspath '' @$<
cp -r rt/net/sourceforge/jnlp/resources \
lib/rt/net/sourceforge/jnlp/
mkdir -p stamps
@@ -1299,14 +1278,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 java \
- -C lib/rt javax -C lib/rt sun -C lib/rt net; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
- -C lib/rt javax -C lib/rt net -C lib/rt sun; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
+ -C lib/rt javax -C lib/rt net -C lib/rt sun
if test -d bootstrap/ecj/jre/lib ; \
then \
cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \
@@ -1319,17 +1292,10 @@ stamps/extra-class-files.stamp: extra-so
stamps/extra-class-files.stamp: extra-source-files.txt \
bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
mkdir -p extra-lib
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib -bootclasspath '' -source 1.6 \
- -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- @extra-source-files.txt ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
- -bootclasspath '' -source 1.6 \
- -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
- @extra-source-files.txt ; \
- fi
+ $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
+ -source 1.6 \
+ -sourcepath extra -cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
+ -bootclasspath '' extra-source-files.txt
cp -r extra/net/sourceforge/jnlp/about/resources \
extra-lib/net/sourceforge/jnlp/about
mkdir -p stamps
@@ -1341,13 +1307,7 @@ clean-extra:
rm -f extra-source-files.txt
extra-lib/about.jar: stamps/extra-class-files.stamp
- if ! test -f stamps/icedtea-ecj.stamp ; \
- then \
- $(JAR) cf $@ -C extra-lib net ; \
- else \
- $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \
- fi
-
+ $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net
# gcjwebplugin.so.
gcjwebplugin.so: gcjwebplugin.cc
if test "$(ENABLE_PLUGIN)" == "yes" ; \
diff -r f42fc832db86 -r 47be7e06b551 aclocal.m4
--- a/aclocal.m4 Mon May 19 10:33:03 2008 +0200
+++ b/aclocal.m4 Tue May 20 11:15:37 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 f42fc832db86 -r 47be7e06b551 configure
--- a/configure Mon May 19 10:33:03 2008 +0200
+++ b/configure Tue May 20 11:15:37 2008 -0400
@@ -10222,11 +10222,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=$?
@@ -10236,15 +10235,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=$?
@@ -10254,9 +10251,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10269,9 +10265,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
@@ -10304,11 +10300,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=$?
@@ -10318,15 +10313,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=$?
@@ -10336,9 +10329,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10351,9 +10343,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
@@ -10386,11 +10378,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=$?
@@ -10400,15 +10391,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=$?
@@ -10418,9 +10407,8 @@ else
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -10433,9 +10421,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
@@ -10468,11 +10456,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"
More information about the distro-pkg-dev
mailing list