I'm checking this in.
PR 28024 points out a place where we have unportable sh code in
configure. I fixed the other instance I found as well.
Tom
Index: ChangeLog
from Tom Tromey <[EMAIL PROTECTED]>
PR java/28024:
* m4/acinclude.m4 (REGEN_WITH_JAY): Use backquote, not $(...).
* configure.ac (QT_INCLUDE_DIR): Use backquote, not $(...).
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.160
diff -u -r1.160 configure.ac
--- configure.ac 7 Jun 2006 15:09:39 -0000 1.160
+++ configure.ac 14 Jun 2006 12:33:11 -0000
@@ -438,7 +438,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]),
Index: m4/acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.11
diff -u -r1.11 acinclude.m4
--- m4/acinclude.m4 27 Mar 2006 17:47:29 -0000 1.11
+++ m4/acinclude.m4 14 Jun 2006 12:33:13 -0000
@@ -409,13 +409,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
],
[
