Skip to content

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

configure, [...]: Rebuilt. 

	* configure, Makefile.in: Rebuilt.
	* Makefile.am (bin_SCRIPTS): Never install scripts/jar.
	* configure.ac (BASH_JAR): Removed conditional.
	(JAR): Prefer the jar found by AC_CHECK_PROGS.

From-SVN: r121301
parent 263e3c33
Showing with 39 additions and 63 deletions
libjava/ChangeLog
2007-01-29 Tom Tromey <tromey@redhat.com> 2007-01-29 Tom Tromey <tromey@redhat.com>
* configure, Makefile.in: Rebuilt.
* Makefile.am (bin_SCRIPTS): Never install scripts/jar.
* configure.ac (BASH_JAR): Removed conditional.
(JAR): Prefer the jar found by AC_CHECK_PROGS.
2007-01-29 Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt. * Makefile.in: Rebuilt.
* Makefile.am (interpret.lo): New target. Add -fwrap to * Makefile.am (interpret.lo): New target. Add -fwrap to
AM_CXXFLAGS. AM_CXXFLAGS.
......
libjava/Makefile.am
...@@ -95,10 +95,6 @@ endif ...@@ -95,10 +95,6 @@ endif
## Compilers and compilation flags. ## Compilers and compilation flags.
## ##
if BASH_JAR
bin_SCRIPTS += scripts/jar
endif
## The compiler with whatever flags we want for both -c and -C ## The compiler with whatever flags we want for both -c and -C
## compiles. ## compiles.
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
......
libjava/Makefile.in
...@@ -53,16 +53,15 @@ target_triplet = @target@ ...@@ -53,16 +53,15 @@ target_triplet = @target@
@NATIVE_TRUE@ grmid$(EXEEXT) gserialver$(EXEEXT) \ @NATIVE_TRUE@ grmid$(EXEEXT) gserialver$(EXEEXT) \
@NATIVE_TRUE@ gtnameserv$(EXEEXT) @NATIVE_TRUE@ gtnameserv$(EXEEXT)
@BUILD_ECJ1_TRUE@libexecsub_PROGRAMS = ecjx$(EXEEXT) @BUILD_ECJ1_TRUE@libexecsub_PROGRAMS = ecjx$(EXEEXT)
@BASH_JAR_TRUE@am__append_5 = scripts/jar @USING_GCC_TRUE@am__append_5 = $(WARNINGS)
@USING_GCC_TRUE@am__append_6 = $(WARNINGS) @USING_BOEHMGC_TRUE@am__append_6 = boehm.cc
@USING_BOEHMGC_TRUE@am__append_7 = boehm.cc @USING_NOGC_TRUE@am__append_7 = nogc.cc
@USING_NOGC_TRUE@am__append_8 = nogc.cc @USING_POSIX_PLATFORM_TRUE@am__append_8 = posix.cc
@USING_POSIX_PLATFORM_TRUE@am__append_9 = posix.cc @USING_WIN32_PLATFORM_TRUE@am__append_9 = win32.cc
@USING_WIN32_PLATFORM_TRUE@am__append_10 = win32.cc @USING_DARWIN_CRT_TRUE@am__append_10 = darwin.cc
@USING_DARWIN_CRT_TRUE@am__append_11 = darwin.cc @USING_POSIX_THREADS_TRUE@am__append_11 = posix-threads.cc
@USING_POSIX_THREADS_TRUE@am__append_12 = posix-threads.cc @USING_WIN32_THREADS_TRUE@am__append_12 = win32-threads.cc
@USING_WIN32_THREADS_TRUE@am__append_13 = win32-threads.cc @USING_NO_THREADS_TRUE@am__append_13 = no-threads.cc
@USING_NO_THREADS_TRUE@am__append_14 = no-threads.cc
DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
$(srcdir)/../config.guess $(srcdir)/../config.sub \ $(srcdir)/../config.guess $(srcdir)/../config.sub \
$(srcdir)/../depcomp $(srcdir)/../install-sh \ $(srcdir)/../depcomp $(srcdir)/../install-sh \
...@@ -74,8 +73,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \ ...@@ -74,8 +73,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
$(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS $(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS
@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@noinst_PROGRAMS = \ @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@noinst_PROGRAMS = \
@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ gen-from-JIS$(EXEEXT) @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ gen-from-JIS$(EXEEXT)
@NATIVE_TRUE@@USE_LIBGCJ_BC_TRUE@am__append_15 = libgcj_bc.la @NATIVE_TRUE@@USE_LIBGCJ_BC_TRUE@am__append_14 = libgcj_bc.la
@XLIB_AWT_TRUE@am__append_16 = $(xlib_nat_headers) @XLIB_AWT_TRUE@am__append_15 = $(xlib_nat_headers)
subdir = . subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
...@@ -545,8 +544,6 @@ AUTOHEADER = @AUTOHEADER@ ...@@ -545,8 +544,6 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BACKTRACESPEC = @BACKTRACESPEC@ BACKTRACESPEC = @BACKTRACESPEC@
BASH_JAR_FALSE = @BASH_JAR_FALSE@
BASH_JAR_TRUE = @BASH_JAR_TRUE@
BUILD_ECJ1_FALSE = @BUILD_ECJ1_FALSE@ BUILD_ECJ1_FALSE = @BUILD_ECJ1_FALSE@
BUILD_ECJ1_TRUE = @BUILD_ECJ1_TRUE@ BUILD_ECJ1_TRUE = @BUILD_ECJ1_TRUE@
CC = @CC@ CC = @CC@
...@@ -807,7 +804,7 @@ jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \ ...@@ -807,7 +804,7 @@ jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
db_name = classmap.db db_name = classmap.db
db_pathtail = gcj-$(gcc_version)/$(db_name) db_pathtail = gcj-$(gcc_version)/$(db_name)
@NATIVE_TRUE@dbexec_DATA = $(db_name) @NATIVE_TRUE@dbexec_DATA = $(db_name)
bin_SCRIPTS = addr2name.awk $(am__append_5) bin_SCRIPTS = addr2name.awk
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \ GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \
$(LDFLAGS) -o $@ $(LDFLAGS) -o $@
...@@ -844,7 +841,7 @@ AM_GCJFLAGS = \ ...@@ -844,7 +841,7 @@ AM_GCJFLAGS = \
--encoding=UTF-8 \ --encoding=UTF-8 \
-Wno-deprecated -fbootstrap-classes -Wno-deprecated -fbootstrap-classes
AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_6) AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_5)
PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long
JCFLAGS = -g JCFLAGS = -g
JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS) JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
...@@ -865,9 +862,9 @@ libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \ ...@@ -865,9 +862,9 @@ libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
libgcj_la_SOURCES = prims.cc jni.cc jvmti.cc exception.cc \ libgcj_la_SOURCES = prims.cc jni.cc jvmti.cc exception.cc \
stacktrace.cc link.cc defineclass.cc interpret.cc verify.cc \ stacktrace.cc link.cc defineclass.cc interpret.cc verify.cc \
$(nat_source_files) $(am__append_7) $(am__append_8) \ $(nat_source_files) $(am__append_6) $(am__append_7) \
$(am__append_9) $(am__append_10) $(am__append_11) \ $(am__append_8) $(am__append_9) $(am__append_10) \
$(am__append_12) $(am__append_13) $(am__append_14) $(am__append_11) $(am__append_12) $(am__append_13)
nat_files = $(nat_source_files:.cc=.lo) nat_files = $(nat_source_files:.cc=.lo)
xlib_nat_files = $(xlib_nat_source_files:.cc=.lo) xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
...@@ -7802,7 +7799,7 @@ ECJX_BASE_FLAGS = -findirect-dispatch \ ...@@ -7802,7 +7799,7 @@ ECJX_BASE_FLAGS = -findirect-dispatch \
@NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la @NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la
@NATIVE_FALSE@ecjx_DEPENDENCIES = @NATIVE_FALSE@ecjx_DEPENDENCIES =
@NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec \ @NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec \
@NATIVE_TRUE@ $(am__append_15) @NATIVE_TRUE@ $(am__append_14)
gappletviewer_SOURCES = gappletviewer_SOURCES =
gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \ gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
...@@ -7993,7 +7990,7 @@ gnu/gcj/xlib/natXImage.cc \ ...@@ -7993,7 +7990,7 @@ gnu/gcj/xlib/natXImage.cc \
gnu/gcj/xlib/natXUnmapEvent.cc gnu/gcj/xlib/natXUnmapEvent.cc
sourcesdir = $(jardir) sourcesdir = $(jardir)
headers_to_make = $(nat_headers) $(am__append_16) headers_to_make = $(nat_headers) $(am__append_15)
# Work around what appears to be a GNU make bug handling MAKEFLAGS # Work around what appears to be a GNU make bug handling MAKEFLAGS
# values defined in terms of make variables, as is the case for CC and # values defined in terms of make variables, as is the case for CC and
......
libjava/configure
...@@ -310,7 +310,7 @@ ac_includes_default="\ ...@@ -310,7 +310,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #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_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE 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 LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP BASH_JAR_TRUE BASH_JAR_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM 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 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 THREADSTARTFILESPEC 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 USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir dbexecdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC 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_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE 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 LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM 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 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 THREADSTARTFILESPEC 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 USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir dbexecdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
...@@ -4198,25 +4198,16 @@ else ...@@ -4198,25 +4198,16 @@ else
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
# Prefer the jar we found, but fall back to our jar script.
if test "$JAR" = no; then if test "$JAR" = no; then
BASH_JAR_TRUE= if test "$ZIP" = no; then
BASH_JAR_FALSE='#'
else
BASH_JAR_TRUE='#'
BASH_JAR_FALSE=
fi
if test "$ZIP" = no; then
if test "$JAR" = no; then
{ { echo "$as_me:$LINENO: error: cannot find neither zip nor jar, cannot continue" >&5 { { echo "$as_me:$LINENO: error: cannot find neither zip nor jar, cannot continue" >&5
echo "$as_me: error: cannot find neither zip nor jar, cannot continue" >&2;} echo "$as_me: error: cannot find neither zip nor jar, cannot continue" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
else
# InfoZIP available, use the 'guaranteed' Bourne-shell JAR to build libjava
JAR=`pwd`/scripts/jar
fi fi
else
# InfoZIP available, use the 'guaranteed' Bourne-shell JAR to build libjava
JAR=`pwd`/scripts/jar
fi fi
# Find a good install program. We prefer a C program (faster), # Find a good install program. We prefer a C program (faster),
...@@ -6021,7 +6012,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" ...@@ -6021,7 +6012,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
case $host in case $host in
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 6024 "configure"' > conftest.$ac_ext echo '#line 6015 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
...@@ -7063,7 +7054,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then ...@@ -7063,7 +7054,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then
: :
else else
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 7066 "configure" #line 7057 "configure"
struct S { ~S(); }; struct S { ~S(); };
void bar(); void bar();
void foo() void foo()
...@@ -17128,13 +17119,6 @@ echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. ...@@ -17128,13 +17119,6 @@ echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;} Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
if test -z "${BASH_JAR_TRUE}" && test -z "${BASH_JAR_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"BASH_JAR\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"BASH_JAR\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." >&5 Usually this means the macro was only invoked conditionally." >&5
...@@ -17943,8 +17927,6 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t ...@@ -17943,8 +17927,6 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
s,@JAR@,$JAR,;t t s,@JAR@,$JAR,;t t
s,@ZIP@,$ZIP,;t t s,@ZIP@,$ZIP,;t t
s,@UNZIP@,$UNZIP,;t t s,@UNZIP@,$UNZIP,;t t
s,@BASH_JAR_TRUE@,$BASH_JAR_TRUE,;t t
s,@BASH_JAR_FALSE@,$BASH_JAR_FALSE,;t t
s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
s,@MAINT@,$MAINT,;t t s,@MAINT@,$MAINT,;t t
......
libjava/configure.ac
...@@ -117,14 +117,14 @@ AC_PROG_AWK ...@@ -117,14 +117,14 @@ AC_PROG_AWK
AC_CHECK_PROGS([JAR], [jar fastjar gjar], no) AC_CHECK_PROGS([JAR], [jar fastjar gjar], no)
AC_PATH_PROG([ZIP], [zip], no) AC_PATH_PROG([ZIP], [zip], no)
AC_PATH_PROG([UNZIP], [unzip], unzip) AC_PATH_PROG([UNZIP], [unzip], unzip)
AM_CONDITIONAL(BASH_JAR, test "$JAR" = no) # Prefer the jar we found, but fall back to our jar script.
if test "$ZIP" = no; then if test "$JAR" = no; then
if test "$JAR" = no; then if test "$ZIP" = no; then
AC_MSG_ERROR([cannot find neither zip nor jar, cannot continue]) AC_MSG_ERROR([cannot find neither zip nor jar, cannot continue])
else
# InfoZIP available, use the 'guaranteed' Bourne-shell JAR to build libjava
JAR=`pwd`/scripts/jar
fi fi
else
# InfoZIP available, use the 'guaranteed' Bourne-shell JAR to build libjava
JAR=`pwd`/scripts/jar
fi fi
AC_PROG_INSTALL AC_PROG_INSTALL
......
libjava/gcj/Makefile.in
...@@ -91,8 +91,6 @@ AUTOHEADER = @AUTOHEADER@ ...@@ -91,8 +91,6 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BACKTRACESPEC = @BACKTRACESPEC@ BACKTRACESPEC = @BACKTRACESPEC@
BASH_JAR_FALSE = @BASH_JAR_FALSE@
BASH_JAR_TRUE = @BASH_JAR_TRUE@
BUILD_ECJ1_FALSE = @BUILD_ECJ1_FALSE@ BUILD_ECJ1_FALSE = @BUILD_ECJ1_FALSE@
BUILD_ECJ1_TRUE = @BUILD_ECJ1_TRUE@ BUILD_ECJ1_TRUE = @BUILD_ECJ1_TRUE@
CC = @CC@ CC = @CC@
......
libjava/include/Makefile.in
...@@ -90,8 +90,6 @@ AUTOHEADER = @AUTOHEADER@ ...@@ -90,8 +90,6 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BACKTRACESPEC = @BACKTRACESPEC@ BACKTRACESPEC = @BACKTRACESPEC@
BASH_JAR_FALSE = @BASH_JAR_FALSE@
BASH_JAR_TRUE = @BASH_JAR_TRUE@
BUILD_ECJ1_FALSE = @BUILD_ECJ1_FALSE@ BUILD_ECJ1_FALSE = @BUILD_ECJ1_FALSE@
BUILD_ECJ1_TRUE = @BUILD_ECJ1_TRUE@ BUILD_ECJ1_TRUE = @BUILD_ECJ1_TRUE@
CC = @CC@ CC = @CC@
......
libjava/testsuite/Makefile.in
...@@ -79,8 +79,6 @@ AUTOHEADER = @AUTOHEADER@ ...@@ -79,8 +79,6 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BACKTRACESPEC = @BACKTRACESPEC@ BACKTRACESPEC = @BACKTRACESPEC@
BASH_JAR_FALSE = @BASH_JAR_FALSE@
BASH_JAR_TRUE = @BASH_JAR_TRUE@
BUILD_ECJ1_FALSE = @BUILD_ECJ1_FALSE@ BUILD_ECJ1_FALSE = @BUILD_ECJ1_FALSE@
BUILD_ECJ1_TRUE = @BUILD_ECJ1_TRUE@ BUILD_ECJ1_TRUE = @BUILD_ECJ1_TRUE@
CC = @CC@ CC = @CC@
......
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