This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: PR 28024
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 14 Jun 2006 07:39:15 -0600
- Subject: Patch: FYI: PR 28024
- Reply-to: tromey at redhat dot com
I'm checking this in on the 4.1 branch and the trunk.
This fixes a portability bug in classpath's configure, reported as PR
28024.
Tom
Index: ChangeLog.gcj
from Tom Tromey <tromey@redhat.com>
PR java/28024:
* aclocal.m4, configure: Rebuilt.
* m4/acinclude.m4 (REGEN_WITH_JAY): Use backquote, not $(...).
* configure.ac (QT_INCLUDE_DIR): Use backquote, not $(...).
Index: m4/acinclude.m4
===================================================================
--- m4/acinclude.m4 (revision 114620)
+++ m4/acinclude.m4 (working copy)
@@ -389,13 +389,13 @@
AC_MSG_ERROR("jay executable not found");
fi
else
- JAY_DIR_PATH=$(dirname "${withval}")
+ JAY_DIR_PATH=`dirname "${withval}"`
JAY="${withval}"
AC_SUBST(JAY)
fi
JAY_SKELETON="${JAY_DIR_PATH}/skeleton"
AC_CHECK_FILE(${JAY_SKELETON}, AC_SUBST(JAY_SKELETON),
- AC_MSG_ERROR("Expected skeleton file in $(dirname ${withval})"))
+ AC_MSG_ERROR("Expected skeleton file in `dirname ${withval}`"))
JAY_FOUND=yes
],
[
Index: configure.ac
===================================================================
--- configure.ac (revision 114620)
+++ configure.ac (working copy)
@@ -374,7 +374,7 @@
if test "x$HAVE_QT4" = "xyes"; then
dnl Check needed because in some cases the QtGui includedir
dnl doesn't contain the subsystem dir.
- QT_INCLUDE_DIR=$($PKG_CONFIG --variable=includedir QtGui)
+ QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir QtGui`
EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt"
AC_CHECK_FILE([$QT_INCLUDE_DIR/QWidget],
AC_MSG_NOTICE([No extra QT_INCLUDE_DIR needed]),