From e33598631f01b60063ae8953dfda7047f3db05ca Mon Sep 17 00:00:00 2001 From: tromey Date: Wed, 14 Jun 2006 13:56:22 +0000 Subject: [PATCH] PR java/28024: * aclocal.m4, configure: Rebuilt. * m4/acinclude.m4 (REGEN_WITH_JAY): Use backquote, not $(...). * configure.ac (QT_INCLUDE_DIR): Use backquote, not $(...). git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114639 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/ChangeLog.gcj | 7 +++++++ libjava/classpath/aclocal.m4 | 23 ++--------------------- libjava/classpath/configure | 18 +++++++++--------- libjava/classpath/configure.ac | 2 +- libjava/classpath/m4/acinclude.m4 | 4 ++-- 5 files changed, 21 insertions(+), 33 deletions(-) diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index 6f0e521..7304d66 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,10 @@ +2006-06-14 Tom Tromey + + PR java/28024: + * aclocal.m4, configure: Rebuilt. + * m4/acinclude.m4 (REGEN_WITH_JAY): Use backquote, not $(...). + * configure.ac (QT_INCLUDE_DIR): Use backquote, not $(...). + 2006-06-09 Tom Tromey PR classpath/23863: diff --git a/libjava/classpath/aclocal.m4 b/libjava/classpath/aclocal.m4 index 1d0405b..c6085b3 100644 --- a/libjava/classpath/aclocal.m4 +++ b/libjava/classpath/aclocal.m4 @@ -468,27 +468,6 @@ AC_DEFUN([AM_PROG_INSTALL_SH], install_sh=${install_sh-"$am_aux_dir/install-sh"} AC_SUBST(install_sh)]) -# Copyright (C) 2003, 2005 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 2 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering @@ -894,6 +873,8 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([../../config/depstand.m4]) +m4_include([../../config/lead-dot.m4]) m4_include([../../libtool.m4]) m4_include([m4/acattribute.m4]) m4_include([m4/accross.m4]) diff --git a/libjava/classpath/configure b/libjava/classpath/configure index adb5cbb..cded549 100755 --- a/libjava/classpath/configure +++ b/libjava/classpath/configure @@ -10007,7 +10007,7 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. + # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -10015,7 +10015,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -10042,7 +10042,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then + if test -r "$ac_dir/X11/Intrinsic.h"; then ac_x_includes=$ac_dir break fi @@ -10063,11 +10063,11 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XrmInitialize () +XtMalloc (0) ; return 0; } @@ -11929,7 +11929,7 @@ echo "${ECHO_T}$QT_LIBS" >&6 fi if test "x$HAVE_QT4" = "xyes"; then - QT_INCLUDE_DIR=$($PKG_CONFIG --variable=includedir QtGui) + QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir QtGui` EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt" as_ac_File=`echo "ac_cv_file_$QT_INCLUDE_DIR/QWidget" | $as_tr_sh` echo "$as_me:$LINENO: checking for $QT_INCLUDE_DIR/QWidget" >&5 @@ -15159,7 +15159,7 @@ echo "$as_me: error: \"jay executable not found\"" >&2;} { (exit 1); exit 1; }; }; fi else - JAY_DIR_PATH=$(dirname "${withval}") + JAY_DIR_PATH=`dirname "${withval}"` JAY="${withval}" fi @@ -15185,8 +15185,8 @@ echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { echo "$as_me:$LINENO: error: \"Expected skeleton file in $(dirname ${withval})\"" >&5 -echo "$as_me: error: \"Expected skeleton file in $(dirname ${withval})\"" >&2;} + { { echo "$as_me:$LINENO: error: \"Expected skeleton file in \`dirname ${withval}\`\"" >&5 +echo "$as_me: error: \"Expected skeleton file in \`dirname ${withval}\`\"" >&2;} { (exit 1); exit 1; }; } fi diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index 65980fd..bd3ba21 100644 --- a/libjava/classpath/configure.ac +++ b/libjava/classpath/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/libjava/classpath/m4/acinclude.m4 b/libjava/classpath/m4/acinclude.m4 index 30ae333..ead0090 100644 --- a/libjava/classpath/m4/acinclude.m4 +++ b/libjava/classpath/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 ], [ -- 2.7.4