Skip to content

R
riscv-gcc-1
Commit ab3fa9d3 by Tom Tromey Committed by Tom Tromey
Options

configure, [...]: Rebuilt. 

	* configure, Makefile.in: Rebuilt.
	* sources.am: Rebuilt.
	* scripts/makemake.tcl (emit_bc_rule): Special-case qt.
	* configure.ac (TOOLKIT): Handle Qt peers properly.

From-SVN: r104706
parent f20731b7
Showing with 86 additions and 12 deletions
libjava/ChangeLog
2005-09-27 Tom Tromey <tromey@redhat.com>
* configure, Makefile.in: Rebuilt.
* sources.am: Rebuilt.
* scripts/makemake.tcl (emit_bc_rule): Special-case qt.
* configure.ac (TOOLKIT): Handle Qt peers properly.
2005-09-23 Tom Tromey <tromey@redhat.com>
Imported Classpath 0.18.
......
libjava/Makefile.in
......@@ -199,8 +199,8 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
javax/swing/text/html/parser.lo javax/swing/text/rtf.lo \
javax/swing/tree.lo javax/swing/undo.lo javax/transaction.lo \
javax/transaction/xa.lo org/ietf/jgss.lo
am__DEPENDENCIES_3 = gnu-java-awt-peer-qt.lo gnu-java-beans.lo \
gnu-xml.lo javax-imageio.lo javax-xml.lo org-w3c.lo org-xml.lo
am__DEPENDENCIES_3 = gnu-java-beans.lo gnu-xml.lo javax-imageio.lo \
javax-xml.lo org-w3c.lo org-xml.lo
am__DEPENDENCIES_4 = $(patsubst classpath/resource/%,%,$(addsuffix \
.lo,$(property_files)))
am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
......@@ -494,6 +494,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
PLATFORM_INNER_NAT_HDRS = @PLATFORM_INNER_NAT_HDRS@
QT_AWT_FALSE = @QT_AWT_FALSE@
QT_AWT_TRUE = @QT_AWT_TRUE@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
......@@ -4699,7 +4701,6 @@ ordinary_header_files = \
$(org_ietf_jgss_header_files)
bc_objects = \
gnu-java-awt-peer-qt.lo \
gnu-java-beans.lo \
gnu-xml.lo \
javax-imageio.lo \
......
libjava/configure
......@@ -310,7 +310,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE GCJH ZIP INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES here LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE QT_AWT_TRUE QT_AWT_FALSE GCJH ZIP INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES here LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
......@@ -4577,6 +4577,7 @@ fi;
peerlibs="`echo ${enable_java_awt} | tr ',' ' '`"
use_xlib_awt=""
use_gtk_awt=""
use_qt_awt=""
# The default toolkit to use is the first one specified.
TOOLKIT=
......@@ -4596,7 +4597,7 @@ for peer in $peerlibs ; do
;;
gtk)
if test "$no_x" = yes; then
echo "*** xlib peers requested but no X library available" 1>&2
echo "*** gtk peers requested but no X library available" 1>&2
exit 1
else
use_gtk_awt=yes
......@@ -4605,9 +4606,22 @@ for peer in $peerlibs ; do
fi
fi
;;
qt)
if test "$no_x" = yes; then
# Perhaps we should admit the possibility of embedded Qt.
echo "*** Qt peers requested but no X library available" 1>&2
exit 1
else
use_qt_awt=yes
if test -z "$TOOLKIT"; then
TOOLKIT=gnu.java.awt.peer.qt.QtToolkit
fi
fi
;;
no)
use_xlib_awt=
use_gtk_awt=
use_qt_awt=
break
;;
*)
......@@ -4637,6 +4651,16 @@ else
fi
if test "$use_gtk_awt" = yes; then
QT_AWT_TRUE=
QT_AWT_FALSE='#'
else
QT_AWT_TRUE='#'
QT_AWT_FALSE=
fi
# Create standard.omit based on decisions we just made.
cp $srcdir/standard.omit.in standard.omit
if test "$use_xlib_awt" != yes; then
......@@ -4646,6 +4670,9 @@ fi
if test "$use_gtk_awt" != yes; then
echo gnu/java/awt/peer/gtk >> standard.omit
fi
if test "$use_qt_awt" != yes; then
echo gnu/java/awt/peer/qt >> standard.omit
fi
if test -z "${with_multisubdir}"; then
builddotdot=.
......@@ -4741,6 +4768,9 @@ ac_configure_args="$ac_configure_args --with-glibj=build"
if test "$use_gtk_awt" != yes; then
ac_configure_args="$ac_configure_args --disable-gtk-peer"
fi
if test "$use_qt_awt" != yes; then
ac_configure_args="$ac_configure_args --disable-qt-peer"
fi
# Only use libltdl for non-newlib builds.
if test "x${with_newlib}" = "x" || test "x${with_newlib}" = "xno"; then
......@@ -5554,7 +5584,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
case $host in
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 5557 "configure"' > conftest.$ac_ext
echo '#line 5587 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
......@@ -6557,7 +6587,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then
:
else
cat > conftest.$ac_ext << EOF
#line 6560 "configure"
#line 6590 "configure"
struct S { ~S(); };
void bar();
void foo()
......@@ -16857,6 +16887,13 @@ echo "$as_me: error: conditional \"GTK_AWT\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${QT_AWT_TRUE}" && test -z "${QT_AWT_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"QT_AWT\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"QT_AWT\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${am__fastdepGCJ_TRUE}" && test -z "${am__fastdepGCJ_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"am__fastdepGCJ\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
......@@ -17623,6 +17660,8 @@ s,@XLIB_AWT_TRUE@,$XLIB_AWT_TRUE,;t t
s,@XLIB_AWT_FALSE@,$XLIB_AWT_FALSE,;t t
s,@GTK_AWT_TRUE@,$GTK_AWT_TRUE,;t t
s,@GTK_AWT_FALSE@,$GTK_AWT_FALSE,;t t
s,@QT_AWT_TRUE@,$QT_AWT_TRUE,;t t
s,@QT_AWT_FALSE@,$QT_AWT_FALSE,;t t
s,@GCJH@,$GCJH,;t t
s,@ZIP@,$ZIP,;t t
s,@INCLTDL@,$INCLTDL,;t t
......
libjava/configure.ac
......@@ -168,6 +168,7 @@ AC_ARG_ENABLE(java-awt,
peerlibs="`echo ${enable_java_awt} | tr ',' ' '`"
use_xlib_awt=""
use_gtk_awt=""
use_qt_awt=""
# The default toolkit to use is the first one specified.
TOOLKIT=
AC_SUBST(TOOLKIT)
......@@ -187,7 +188,7 @@ for peer in $peerlibs ; do
;;
gtk)
if test "$no_x" = yes; then
echo "*** xlib peers requested but no X library available" 1>&2
echo "*** gtk peers requested but no X library available" 1>&2
exit 1
else
use_gtk_awt=yes
......@@ -196,9 +197,22 @@ for peer in $peerlibs ; do
fi
fi
;;
qt)
if test "$no_x" = yes; then
# Perhaps we should admit the possibility of embedded Qt.
echo "*** Qt peers requested but no X library available" 1>&2
exit 1
else
use_qt_awt=yes
if test -z "$TOOLKIT"; then
TOOLKIT=gnu.java.awt.peer.qt.QtToolkit
fi
fi
;;
no)
use_xlib_awt=
use_gtk_awt=
use_qt_awt=
break
;;
*)
......@@ -209,6 +223,7 @@ done
AM_CONDITIONAL(XLIB_AWT, test "$use_xlib_awt" = yes)
AM_CONDITIONAL(GTK_AWT, test "$use_gtk_awt" = yes)
AM_CONDITIONAL(QT_AWT, test "$use_gtk_awt" = yes)
# Create standard.omit based on decisions we just made.
cp $srcdir/standard.omit.in standard.omit
......@@ -219,6 +234,9 @@ fi
if test "$use_gtk_awt" != yes; then
echo gnu/java/awt/peer/gtk >> standard.omit
fi
if test "$use_qt_awt" != yes; then
echo gnu/java/awt/peer/qt >> standard.omit
fi
if test -z "${with_multisubdir}"; then
builddotdot=.
......@@ -315,6 +333,9 @@ ac_configure_args="$ac_configure_args --with-glibj=build"
if test "$use_gtk_awt" != yes; then
ac_configure_args="$ac_configure_args --disable-gtk-peer"
fi
if test "$use_qt_awt" != yes; then
ac_configure_args="$ac_configure_args --disable-qt-peer"
fi
dnl --with-gcj=$GCJ
dnl --with-javah=$GCJH
dnl gjdoc?
......
libjava/gcj/Makefile.in
......@@ -181,6 +181,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
PLATFORM_INNER_NAT_HDRS = @PLATFORM_INNER_NAT_HDRS@
QT_AWT_FALSE = @QT_AWT_FALSE@
QT_AWT_TRUE = @QT_AWT_TRUE@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
......
libjava/include/Makefile.in
......@@ -180,6 +180,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
PLATFORM_INNER_NAT_HDRS = @PLATFORM_INNER_NAT_HDRS@
QT_AWT_FALSE = @QT_AWT_FALSE@
QT_AWT_TRUE = @QT_AWT_TRUE@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
......
libjava/scripts/makemake.tcl
......@@ -220,9 +220,10 @@ proc emit_bc_rule {package} {
puts "\t@rm -f $tname"
puts ""
# We skip this one because it is built into its own library and is
# handled specially in Makefile.am.
if {$loname != "gnu-java-awt-peer-gtk.lo"} {
# We skip these because they are built into their own libraries and
# are handled specially in Makefile.am.
if {$loname != "gnu-java-awt-peer-gtk.lo"
&& $loname != "gnu-java-awt-peer-qt.lo"} {
lappend bc_objects $loname
}
}
......
libjava/sources.am
......@@ -5637,7 +5637,6 @@ ordinary_header_files = \
$(org_ietf_jgss_header_files)
bc_objects = \
gnu-java-awt-peer-qt.lo \
gnu-java-beans.lo \
gnu-xml.lo \
javax-imageio.lo \
......
libjava/testsuite/Makefile.in
......@@ -169,6 +169,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
PLATFORM_INNER_NAT_HDRS = @PLATFORM_INNER_NAT_HDRS@
QT_AWT_FALSE = @QT_AWT_FALSE@
QT_AWT_TRUE = @QT_AWT_TRUE@
RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment