mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-15 14:49:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR java/28024 (libjava build failure on Solaris 2.8 (sun4u))

Browse Source 
PR java/28024:
	* aclocal.m4, configure: Rebuilt.
	* m4/acinclude.m4 (REGEN_WITH_JAY): Use backquote, not $(...).
	* configure.ac (QT_INCLUDE_DIR): Use backquote, not $(...).

From-SVN: r114639
This commit is contained in:
Tom Tromey 2006-06-14 13:56:22 +00:00 committed by Tom Tromey
parent ba1304a3dc
commit 34e598d832
5 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/classpath/ChangeLog.gcj
View File

@ -1,3 +1,10 @@
2006-06-14 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 $(...).
2006-06-09 Tom Tromey <tromey@redhat.com>
PR classpath/23863:

23
libjava/classpath/aclocal.m4 vendored
View File

@ -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])

18
libjava/classpath/configure vendored
View File

@ -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 <X11/Xlib.h>
#include <X11/Intrinsic.h>
_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 <X11/Xlib.h>
#include <X11/Intrinsic.h>
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

2
libjava/classpath/configure.ac
View File

@ -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]),

4
libjava/classpath/m4/acinclude.m4
View File

@ -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
],
[