diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-06-14 12:35:16 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2006-06-14 12:35:16 +0000 |
| commit | 46a39d3a5ecdadd8952fe620141dde4f90082481 (patch) | |
| tree | 116a4c642abcf0f67858c46891eae08da07eee41 | |
| parent | baa5e0cdbb583d22d8d3faadaffbc50a3c4003e4 (diff) | |
| download | classpath-46a39d3a5ecdadd8952fe620141dde4f90082481.tar.gz | |
PR java/28024:
* m4/acinclude.m4 (REGEN_WITH_JAY): Use backquote, not $(...).
* configure.ac (QT_INCLUDE_DIR): Use backquote, not $(...).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | m4/acinclude.m4 | 4 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2006-06-14 Tom Tromey <tromey@redhat.com> + + PR java/28024: + * m4/acinclude.m4 (REGEN_WITH_JAY): Use backquote, not $(...). + * configure.ac (QT_INCLUDE_DIR): Use backquote, not $(...). + 2006-06-14 Roman Kennke <kennke@aicas.com> * javax/swing/JComponent.java diff --git a/configure.ac b/configure.ac index 65980fdff..bd3ba2199 100644 --- a/configure.ac +++ b/configure.ac @@ -438,7 +438,7 @@ if test "x${COMPILE_JNI}" = xyes; then 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]), diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 30ae333b5..ead0090b4 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -409,13 +409,13 @@ AC_DEFUN([REGEN_WITH_JAY], 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 ], [ |