diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-11-12 20:55:13 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-11-12 20:55:13 +0000 |
| commit | 3cc72d2604eea4a90ce5e33765769cef55b3c48c (patch) | |
| tree | 6785b58cfdd6121c5789e7ff48659fa27fa86f0c /libjava | |
| parent | 0c4abe5bf270c0a67b78818b69d273beb532ad26 (diff) | |
| download | gcc-3cc72d2604eea4a90ce5e33765769cef55b3c48c.tar.gz | |
PR libgcj/33764
libjava/
* configure.ac (INSTALL_BINARIES): New AM_CONDITIONAL.
* Makefile.am: If not INSTALL_BINARIES, use noinst_PROGRAMS
instead of bin_PROGRAMS for binaries.
* configure: Regenerated.
* Makefile.in: Regenerated.
libjava/classpath/
* configure.ac (INSTALL_BINARIES): New AM_CONDITIONAL.
* tools/Makefile.am: If not INSTALL_BINARIES, use noinst_PROGRAMS
instead of bin_PROGRAMS for binaries.
* configure: Regenerated.
* tools/Makefile.in: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@141801 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
46 files changed, 356 insertions, 129 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 806467ea643..5c95cdcb350 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2008-11-12 Jakub Jelinek <jakub@redhat.com> + + PR libgcj/33764 + * configure.ac (INSTALL_BINARIES): New AM_CONDITIONAL. + * Makefile.am: If not INSTALL_BINARIES, use noinst_PROGRAMS + instead of bin_PROGRAMS for binaries. + * configure: Regenerated. + * Makefile.in: Regenerated. + 2008-11-04 David Edelsohn <edelsohn@gnu.org> * configure.ac: Fix typo. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 0132db37d49..e3ed9b9b24a 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -79,11 +79,18 @@ db_pathtail = $(gcjsubdir)/$(db_name) ## For now, only on native systems. FIXME. if NATIVE -bin_PROGRAMS = jv-convert gij grmic grmiregistry gcj-dbtool \ +bin_programs = jv-convert gij grmic grmiregistry gcj-dbtool \ gappletviewer gjarsigner gkeytool gjar gcjh gjavah gnative2ascii \ gorbd grmid gserialver gtnameserv gc-analyze if CREATE_GJDOC -bin_PROGRAMS += gjdoc +bin_programs += gjdoc +endif + +noinst_PROGRAMS = +if INSTALL_BINARIES +bin_PROGRAMS = $(bin_programs) +else +noinst_PROGRAMS += $(bin_programs) endif ## It is convenient to actually build and install the default database @@ -734,7 +741,7 @@ write-entries-to-file-check: ## systems. if NATIVE if MAINTAINER_MODE -noinst_PROGRAMS = gen-from-JIS +noinst_PROGRAMS += gen-from-JIS gen_from_JIS_SOURCES = \ gnu/gcj/convert/gen-from-JIS.c \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 8678e49e169..0a248409649 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -44,29 +44,23 @@ target_triplet = @target@ @USE_LIBGCJ_BC_TRUE@am__append_2 = libgcj_bc.la @XLIB_AWT_TRUE@am__append_3 = lib-gnu-awt-xlib.la @INSTALL_ECJ_JAR_TRUE@am__append_4 = $(ECJ_BUILD_JAR) -@NATIVE_TRUE@bin_PROGRAMS = jv-convert$(EXEEXT) gij$(EXEEXT) \ -@NATIVE_TRUE@ grmic$(EXEEXT) grmiregistry$(EXEEXT) \ -@NATIVE_TRUE@ gcj-dbtool$(EXEEXT) gappletviewer$(EXEEXT) \ -@NATIVE_TRUE@ gjarsigner$(EXEEXT) gkeytool$(EXEEXT) \ -@NATIVE_TRUE@ gjar$(EXEEXT) gcjh$(EXEEXT) gjavah$(EXEEXT) \ -@NATIVE_TRUE@ gnative2ascii$(EXEEXT) gorbd$(EXEEXT) \ -@NATIVE_TRUE@ grmid$(EXEEXT) gserialver$(EXEEXT) \ -@NATIVE_TRUE@ gtnameserv$(EXEEXT) gc-analyze$(EXEEXT) \ -@NATIVE_TRUE@ $(am__EXEEXT_1) @CREATE_GJDOC_TRUE@@NATIVE_TRUE@am__append_5 = gjdoc -@INSTALL_AOT_RPM_TRUE@am__append_6 = contrib/aot-compile-rpm +@NATIVE_TRUE@noinst_PROGRAMS = $(am__EXEEXT_3) $(am__EXEEXT_4) +@INSTALL_BINARIES_TRUE@@NATIVE_TRUE@bin_PROGRAMS = $(am__EXEEXT_2) +@INSTALL_BINARIES_FALSE@@NATIVE_TRUE@am__append_6 = $(bin_programs) +@INSTALL_AOT_RPM_TRUE@am__append_7 = contrib/aot-compile-rpm @BUILD_ECJ1_TRUE@libexecsub_PROGRAMS = ecjx$(EXEEXT) -@ANONVERSCRIPT_TRUE@am__append_7 = -Wl,--version-script=$(srcdir)/libgcj.ver -@USING_GCC_TRUE@am__append_8 = $(WARNINGS) -@USING_BOEHMGC_TRUE@am__append_9 = boehm.cc -@USING_NOGC_TRUE@am__append_10 = nogc.cc -@USING_POSIX_PLATFORM_TRUE@am__append_11 = posix.cc -@USING_WIN32_PLATFORM_TRUE@am__append_12 = win32.cc -@USING_DARWIN_CRT_TRUE@am__append_13 = darwin.cc -@USING_POSIX_THREADS_TRUE@am__append_14 = posix-threads.cc -@USING_WIN32_THREADS_TRUE@am__append_15 = win32-threads.cc -@USING_NO_THREADS_TRUE@am__append_16 = no-threads.cc -@ANONVERSCRIPT_TRUE@am__append_17 = $(srcdir)/libgcj.ver +@ANONVERSCRIPT_TRUE@am__append_8 = -Wl,--version-script=$(srcdir)/libgcj.ver +@USING_GCC_TRUE@am__append_9 = $(WARNINGS) +@USING_BOEHMGC_TRUE@am__append_10 = boehm.cc +@USING_NOGC_TRUE@am__append_11 = nogc.cc +@USING_POSIX_PLATFORM_TRUE@am__append_12 = posix.cc +@USING_WIN32_PLATFORM_TRUE@am__append_13 = win32.cc +@USING_DARWIN_CRT_TRUE@am__append_14 = darwin.cc +@USING_POSIX_THREADS_TRUE@am__append_15 = posix-threads.cc +@USING_WIN32_THREADS_TRUE@am__append_16 = win32-threads.cc +@USING_NO_THREADS_TRUE@am__append_17 = no-threads.cc +@ANONVERSCRIPT_TRUE@am__append_18 = $(srcdir)/libgcj.ver DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \ $(srcdir)/../config.guess $(srcdir)/../config.sub \ $(srcdir)/../depcomp $(srcdir)/../install-sh \ @@ -80,10 +74,9 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \ $(top_srcdir)/contrib/aotcompile.py.in \ $(top_srcdir)/contrib/rebuild-gcj-db.in \ $(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS -@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@noinst_PROGRAMS = \ -@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ gen-from-JIS$(EXEEXT) -@NATIVE_TRUE@@USE_LIBGCJ_BC_TRUE@am__append_18 = libgcj_bc.la -@XLIB_AWT_TRUE@am__append_19 = $(xlib_nat_headers) +@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am__append_19 = gen-from-JIS +@NATIVE_TRUE@@USE_LIBGCJ_BC_TRUE@am__append_20 = libgcj_bc.la +@XLIB_AWT_TRUE@am__append_21 = $(xlib_nat_headers) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/libltdl/acinclude.m4 \ @@ -459,8 +452,20 @@ libgij_la_OBJECTS = $(am_libgij_la_OBJECTS) am_libjvm_la_OBJECTS = jni-libjvm.lo libjvm_la_OBJECTS = $(am_libjvm_la_OBJECTS) @CREATE_GJDOC_TRUE@@NATIVE_TRUE@am__EXEEXT_1 = gjdoc$(EXEEXT) +@NATIVE_TRUE@am__EXEEXT_2 = jv-convert$(EXEEXT) gij$(EXEEXT) \ +@NATIVE_TRUE@ grmic$(EXEEXT) grmiregistry$(EXEEXT) \ +@NATIVE_TRUE@ gcj-dbtool$(EXEEXT) gappletviewer$(EXEEXT) \ +@NATIVE_TRUE@ gjarsigner$(EXEEXT) gkeytool$(EXEEXT) \ +@NATIVE_TRUE@ gjar$(EXEEXT) gcjh$(EXEEXT) gjavah$(EXEEXT) \ +@NATIVE_TRUE@ gnative2ascii$(EXEEXT) gorbd$(EXEEXT) \ +@NATIVE_TRUE@ grmid$(EXEEXT) gserialver$(EXEEXT) \ +@NATIVE_TRUE@ gtnameserv$(EXEEXT) gc-analyze$(EXEEXT) \ +@NATIVE_TRUE@ $(am__EXEEXT_1) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) libexecsubPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +@INSTALL_BINARIES_FALSE@@NATIVE_TRUE@am__EXEEXT_3 = $(am__EXEEXT_2) +@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am__EXEEXT_4 = \ +@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ gen-from-JIS$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(libexecsub_PROGRAMS) $(noinst_PROGRAMS) am_ecjx_OBJECTS = ecjx_OBJECTS = $(am_ecjx_OBJECTS) @@ -654,6 +659,8 @@ IEEESPEC = @IEEESPEC@ INCLTDL = @INCLTDL@ INSTALL_AOT_RPM_FALSE = @INSTALL_AOT_RPM_FALSE@ INSTALL_AOT_RPM_TRUE = @INSTALL_AOT_RPM_TRUE@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_ECJ_JAR_FALSE = @INSTALL_ECJ_JAR_FALSE@ INSTALL_ECJ_JAR_TRUE = @INSTALL_ECJ_JAR_TRUE@ @@ -829,7 +836,7 @@ dbexecdir = @dbexecdir@ exec_prefix = @exec_prefix@ extra_gij_ldflags = @extra_gij_ldflags@ extra_ldflags = @extra_ldflags@ -extra_ldflags_libjava = @extra_ldflags_libjava@ $(am__append_7) +extra_ldflags_libjava = @extra_ldflags_libjava@ $(am__append_8) gcc_suffix = @gcc_suffix@ gcjsubdir = @gcjsubdir@ gxx_include_dir = @gxx_include_dir@ @@ -915,9 +922,13 @@ jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \ @JAVA_HOME_SET_TRUE@BOOT_CLASS_PATH_DIR = $(JAVA_HOME)/lib/rt.jar db_name = classmap.db db_pathtail = $(gcjsubdir)/$(db_name) +@NATIVE_TRUE@bin_programs = jv-convert gij grmic grmiregistry \ +@NATIVE_TRUE@ gcj-dbtool gappletviewer gjarsigner gkeytool gjar \ +@NATIVE_TRUE@ gcjh gjavah gnative2ascii gorbd grmid gserialver \ +@NATIVE_TRUE@ gtnameserv gc-analyze $(am__append_5) @NATIVE_TRUE@dbexec_DATA = $(db_name) bin_SCRIPTS = addr2name.awk contrib/rebuild-gcj-db contrib/aot-compile \ - $(am__append_6) + $(am__append_7) GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \ $(LDFLAGS) -o $@ @@ -955,7 +966,7 @@ AM_GCJFLAGS = \ --encoding=UTF-8 \ -Wno-deprecated -fbootstrap-classes -AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_8) +AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_9) @SUPPRESS_LIBGCJ_BC_FALSE@LIBGCJ_BC_FLAGS = -findirect-dispatch -fno-indirect-classes @SUPPRESS_LIBGCJ_BC_TRUE@LIBGCJ_BC_FLAGS = @BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE@LIBGCJ_REDUCED_REFLECTION_FLAGS = @@ -982,9 +993,9 @@ libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \ @INTERPRETER_TRUE@libgcj_interpret_source_files = jvmti.cc interpret.cc libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.cc \ defineclass.cc verify.cc $(libgcj_interpret_source_files) \ - $(nat_source_files) $(am__append_9) $(am__append_10) \ - $(am__append_11) $(am__append_12) $(am__append_13) \ - $(am__append_14) $(am__append_15) $(am__append_16) + $(nat_source_files) $(am__append_10) $(am__append_11) \ + $(am__append_12) $(am__append_13) $(am__append_14) \ + $(am__append_15) $(am__append_16) $(am__append_17) nat_files = $(nat_source_files:.cc=.lo) xlib_nat_files = $(xlib_nat_source_files:.cc=.lo) @@ -1008,7 +1019,7 @@ libgcj_la_LIBADD = \ libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar java/lang/Object.lo \ java/lang/Class.lo java/process-$(PLATFORM).lo \ $(all_packages_source_files:.list=.lo) $(LIBLTDL) \ - $(libgcj_la_LIBADD) $(am__append_17) + $(libgcj_la_LIBADD) $(am__append_18) libgcj_la_LINK = $(LIBLINK) EXTRA_libgcj_la_SOURCES = java/lang/Object.java libgcj_tools_la_SOURCES = classpath/tools/tools.zip @@ -8345,7 +8356,7 @@ ECJX_BASE_FLAGS = -findirect-dispatch \ @NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la @NATIVE_FALSE@ecjx_DEPENDENCIES = @NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec \ -@NATIVE_TRUE@ $(am__append_18) +@NATIVE_TRUE@ $(am__append_20) gappletviewer_SOURCES = gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \ -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) @@ -8561,7 +8572,7 @@ gnu/gcj/xlib/natXImage.cc \ gnu/gcj/xlib/natXUnmapEvent.cc sourcesdir = $(jardir) -headers_to_make = $(nat_headers) $(am__append_19) +headers_to_make = $(nat_headers) $(am__append_21) # 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 diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index bf8bf238d3b..122a900ccbe 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,12 @@ +2008-11-12 Jakub Jelinek <jakub@redhat.com> + + PR libgcj/33764 + * configure.ac (INSTALL_BINARIES): New AM_CONDITIONAL. + * tools/Makefile.am: If not INSTALL_BINARIES, use noinst_PROGRAMS + instead of bin_PROGRAMS for binaries. + * configure: Regenerated. + * tools/Makefile.in: Regenerated. + 2008-10-23 Jakub Jelinek <jakub@redhat.com> PR java/37893 diff --git a/libjava/classpath/Makefile.in b/libjava/classpath/Makefile.in index 068771a85a2..dcc346b7743 100644 --- a/libjava/classpath/Makefile.in +++ b/libjava/classpath/Makefile.in @@ -230,6 +230,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/configure b/libjava/classpath/configure index fbd88cdc278..3e5b5e70744 100755 --- a/libjava/classpath/configure +++ b/libjava/classpath/configure @@ -461,7 +461,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 host host_cpu host_vendor host_os target target_cpu target_vendor target_os JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE GENINSRC_TRUE GENINSRC_FALSE multi_basedir LIBVERSION CLASSPATH_MODULE CLASSPATH_CONVENIENCE 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 CREATE_COLLECTIONS_TRUE CREATE_COLLECTIONS_FALSE CREATE_JNI_LIBRARIES_TRUE CREATE_JNI_LIBRARIES_FALSE CREATE_CORE_JNI_LIBRARIES_TRUE CREATE_CORE_JNI_LIBRARIES_FALSE CREATE_GCONF_PEER_LIBRARIES_TRUE CREATE_GCONF_PEER_LIBRARIES_FALSE CREATE_GSTREAMER_PEER_LIBRARIES_TRUE CREATE_GSTREAMER_PEER_LIBRARIES_FALSE default_toolkit CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP CREATE_ALSA_LIBRARIES_TRUE CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE CREATE_GTK_PEER_LIBRARIES_FALSE CREATE_QT_PEER_LIBRARIES_TRUE CREATE_QT_PEER_LIBRARIES_FALSE CREATE_PLUGIN_TRUE CREATE_PLUGIN_FALSE CREATE_GJDOC_TRUE CREATE_GJDOC_FALSE toolexeclibdir nativeexeclibdir glibjdir CREATE_JNI_HEADERS_TRUE CREATE_JNI_HEADERS_FALSE CREATE_GJDOC_PARSER_TRUE CREATE_GJDOC_PARSER_FALSE CREATE_WRAPPERS_TRUE CREATE_WRAPPERS_FALSE LN_S LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM OBJDUMP ac_ct_OBJDUMP AR ac_ct_AR RANLIB ac_ct_RANLIB lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP PERL COLLECTIONS_PREFIX LIBMAGIC LIBICONV LTLIBICONV WARNING_CFLAGS EXTRA_CFLAGS STRICT_WARNING_CFLAGS ERROR_CFLAGS PKG_CONFIG XML_CFLAGS XML_LIBS XSLT_CFLAGS XSLT_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CFLAGS GTK_LIBS FREETYPE2_CFLAGS FREETYPE2_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS CAIRO_CFLAGS CAIRO_LIBS XTEST_LIBS GCONF_CFLAGS GCONF_LIBS GDK_CFLAGS GDK_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS GSTREAMER_BASE_CFLAGS GSTREAMER_BASE_LIBS GSTREAMER_PLUGINS_BASE_CFLAGS GSTREAMER_PLUGINS_BASE_LIBS GST_PLUGIN_LDFLAGS GSTREAMER_FILE_READER GSTREAMER_MIXER_PROVIDER QT_CFLAGS QT_LIBS MOC MOZILLA_CFLAGS MOZILLA_LIBS GLIB_CFLAGS GLIB_LIBS PLUGIN_DIR GMP_CFLAGS GMP_LIBS USER_JAVAH CLASSPATH_INCLUDES vm_classes MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBDEBUG INIT_LOAD_LIBRARY ECJ_JAR JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION REMOVE MKDIR CP DATE FIND ZIP JAR WITH_JAR_TRUE WITH_JAR_FALSE INSTALL_GLIBJ_ZIP_TRUE INSTALL_GLIBJ_ZIP_FALSE INSTALL_CLASS_FILES_TRUE INSTALL_CLASS_FILES_FALSE BUILD_CLASS_FILES_TRUE BUILD_CLASS_FILES_FALSE EXAMPLESDIR TOOLSDIR GJDOC CREATE_API_DOCS_TRUE CREATE_API_DOCS_FALSE JAY JAY_SKELETON REGEN_PARSERS_TRUE REGEN_PARSERS_FALSE USE_PREBUILT_GLIBJ_ZIP_TRUE USE_PREBUILT_GLIBJ_ZIP_FALSE PATH_TO_GLIBJ_ZIP JAVA uudecode JAVAC JAVAC_IS_GCJ GCJ_JAVAC_TRUE GCJ_JAVAC_FALSE ANTLR_JAR ANTLR ac_ct_ANTLR JAVAC_MEM_OPT USE_ESCHER_TRUE USE_ESCHER_FALSE PATH_TO_ESCHER ENABLE_LOCAL_SOCKETS_TRUE ENABLE_LOCAL_SOCKETS_FALSE DEFAULT_PREFS_PEER WANT_NATIVE_BIG_INTEGER CREATE_GMPBI_LIBRARY_TRUE CREATE_GMPBI_LIBRARY_FALSE 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 host host_cpu host_vendor host_os target target_cpu target_vendor target_os JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE GENINSRC_TRUE GENINSRC_FALSE multi_basedir INSTALL_BINARIES_TRUE INSTALL_BINARIES_FALSE LIBVERSION CLASSPATH_MODULE CLASSPATH_CONVENIENCE 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 CREATE_COLLECTIONS_TRUE CREATE_COLLECTIONS_FALSE CREATE_JNI_LIBRARIES_TRUE CREATE_JNI_LIBRARIES_FALSE CREATE_CORE_JNI_LIBRARIES_TRUE CREATE_CORE_JNI_LIBRARIES_FALSE CREATE_GCONF_PEER_LIBRARIES_TRUE CREATE_GCONF_PEER_LIBRARIES_FALSE CREATE_GSTREAMER_PEER_LIBRARIES_TRUE CREATE_GSTREAMER_PEER_LIBRARIES_FALSE default_toolkit CREATE_XMLJ_LIBRARY_TRUE CREATE_XMLJ_LIBRARY_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP CREATE_ALSA_LIBRARIES_TRUE CREATE_ALSA_LIBRARIES_FALSE CREATE_DSSI_LIBRARIES_TRUE CREATE_DSSI_LIBRARIES_FALSE CREATE_GTK_PEER_LIBRARIES_TRUE CREATE_GTK_PEER_LIBRARIES_FALSE CREATE_QT_PEER_LIBRARIES_TRUE CREATE_QT_PEER_LIBRARIES_FALSE CREATE_PLUGIN_TRUE CREATE_PLUGIN_FALSE CREATE_GJDOC_TRUE CREATE_GJDOC_FALSE toolexeclibdir nativeexeclibdir glibjdir CREATE_JNI_HEADERS_TRUE CREATE_JNI_HEADERS_FALSE CREATE_GJDOC_PARSER_TRUE CREATE_GJDOC_PARSER_FALSE CREATE_WRAPPERS_TRUE CREATE_WRAPPERS_FALSE LN_S LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM OBJDUMP ac_ct_OBJDUMP AR ac_ct_AR RANLIB ac_ct_RANLIB lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP PERL COLLECTIONS_PREFIX LIBMAGIC LIBICONV LTLIBICONV WARNING_CFLAGS EXTRA_CFLAGS STRICT_WARNING_CFLAGS ERROR_CFLAGS PKG_CONFIG XML_CFLAGS XML_LIBS XSLT_CFLAGS XSLT_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CFLAGS GTK_LIBS FREETYPE2_CFLAGS FREETYPE2_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS CAIRO_CFLAGS CAIRO_LIBS XTEST_LIBS GCONF_CFLAGS GCONF_LIBS GDK_CFLAGS GDK_LIBS GSTREAMER_CFLAGS GSTREAMER_LIBS GSTREAMER_BASE_CFLAGS GSTREAMER_BASE_LIBS GSTREAMER_PLUGINS_BASE_CFLAGS GSTREAMER_PLUGINS_BASE_LIBS GST_PLUGIN_LDFLAGS GSTREAMER_FILE_READER GSTREAMER_MIXER_PROVIDER QT_CFLAGS QT_LIBS MOC MOZILLA_CFLAGS MOZILLA_LIBS GLIB_CFLAGS GLIB_LIBS PLUGIN_DIR GMP_CFLAGS GMP_LIBS USER_JAVAH CLASSPATH_INCLUDES vm_classes MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBDEBUG INIT_LOAD_LIBRARY ECJ_JAR JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION REMOVE MKDIR CP DATE FIND ZIP JAR WITH_JAR_TRUE WITH_JAR_FALSE INSTALL_GLIBJ_ZIP_TRUE INSTALL_GLIBJ_ZIP_FALSE INSTALL_CLASS_FILES_TRUE INSTALL_CLASS_FILES_FALSE BUILD_CLASS_FILES_TRUE BUILD_CLASS_FILES_FALSE EXAMPLESDIR TOOLSDIR GJDOC CREATE_API_DOCS_TRUE CREATE_API_DOCS_FALSE JAY JAY_SKELETON REGEN_PARSERS_TRUE REGEN_PARSERS_FALSE USE_PREBUILT_GLIBJ_ZIP_TRUE USE_PREBUILT_GLIBJ_ZIP_FALSE PATH_TO_GLIBJ_ZIP JAVA uudecode JAVAC JAVAC_IS_GCJ GCJ_JAVAC_TRUE GCJ_JAVAC_FALSE ANTLR_JAR ANTLR ac_ct_ANTLR JAVAC_MEM_OPT USE_ESCHER_TRUE USE_ESCHER_FALSE PATH_TO_ESCHER ENABLE_LOCAL_SOCKETS_TRUE ENABLE_LOCAL_SOCKETS_FALSE DEFAULT_PREFS_PEER WANT_NATIVE_BIG_INTEGER CREATE_GMPBI_LIBRARY_TRUE CREATE_GMPBI_LIBRARY_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' ac_pwd=`pwd` @@ -1792,6 +1792,17 @@ fi ac_config_commands="$ac_config_commands default-1" + + +if test -z "${with_multisubdir}"; then + INSTALL_BINARIES_TRUE= + INSTALL_BINARIES_FALSE='#' +else + INSTALL_BINARIES_TRUE='#' + INSTALL_BINARIES_FALSE= +fi + + if expr ${target_cpu} : '.*86' > /dev/null; then target_cpu=x86; fi LIBVERSION="0:0:0" @@ -5742,13 +5753,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5745: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5756: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5748: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5759: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5751: output\"" >&5) + (eval echo "\"\$as_me:5762: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6894,7 +6905,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6897 "configure"' > conftest.$ac_ext + echo '#line 6908 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8180,11 +8191,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8183: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8194: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8187: \$? = $ac_status" >&5 + echo "$as_me:8198: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8519,11 +8530,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8522: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8533: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8526: \$? = $ac_status" >&5 + echo "$as_me:8537: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8624,11 +8635,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8627: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8638: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8631: \$? = $ac_status" >&5 + echo "$as_me:8642: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8679,11 +8690,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8682: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8693: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8686: \$? = $ac_status" >&5 + echo "$as_me:8697: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11531,7 +11542,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11534 "configure" +#line 11545 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11627,7 +11638,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11630 "configure" +#line 11641 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16058,11 +16069,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16061: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16072: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16065: \$? = $ac_status" >&5 + echo "$as_me:16076: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16157,11 +16168,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16160: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16171: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16164: \$? = $ac_status" >&5 + echo "$as_me:16175: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16209,11 +16220,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16212: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16223: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16216: \$? = $ac_status" >&5 + echo "$as_me:16227: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -29131,7 +29142,7 @@ EOF if uudecode$EXEEXT Test.uue; then ac_cv_prog_uudecode_base64=yes else - echo "configure: 29134: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 29145: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -29278,7 +29289,7 @@ else JAVA_TEST=Object.java CLASS_TEST=Object.class cat << \EOF > $JAVA_TEST -/* #line 29281 "configure" */ +/* #line 29292 "configure" */ package java.lang; public class Object @@ -29327,7 +29338,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 29330 "configure" */ +/* [#]line 29341 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -29647,7 +29658,7 @@ else JAVA_TEST=Object.java CLASS_TEST=Object.class cat << \EOF > $JAVA_TEST -/* #line 29650 "configure" */ +/* #line 29661 "configure" */ package java.lang; public class Object @@ -29688,7 +29699,7 @@ fi JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST - /* #line 29691 "configure" */ + /* #line 29702 "configure" */ public class Test { public static void main(String args) @@ -30223,6 +30234,13 @@ echo "$as_me: error: conditional \"GENINSRC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${INSTALL_BINARIES_TRUE}" && test -z "${INSTALL_BINARIES_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"INSTALL_BINARIES\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"INSTALL_BINARIES\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${CREATE_COLLECTIONS_TRUE}" && test -z "${CREATE_COLLECTIONS_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"CREATE_COLLECTIONS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -31465,6 +31483,8 @@ s,@JAVA_MAINTAINER_MODE_FALSE@,$JAVA_MAINTAINER_MODE_FALSE,;t t s,@GENINSRC_TRUE@,$GENINSRC_TRUE,;t t s,@GENINSRC_FALSE@,$GENINSRC_FALSE,;t t s,@multi_basedir@,$multi_basedir,;t t +s,@INSTALL_BINARIES_TRUE@,$INSTALL_BINARIES_TRUE,;t t +s,@INSTALL_BINARIES_FALSE@,$INSTALL_BINARIES_FALSE,;t t s,@LIBVERSION@,$LIBVERSION,;t t s,@CLASSPATH_MODULE@,$CLASSPATH_MODULE,;t t s,@CLASSPATH_CONVENIENCE@,$CLASSPATH_CONVENIENCE,;t t diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index 9ff6e03e22f..b3187cca7e7 100644 --- a/libjava/classpath/configure.ac +++ b/libjava/classpath/configure.ac @@ -46,6 +46,8 @@ dnl END GCJ LOCAL # Find the rest of the source tree framework. AM_ENABLE_MULTILIB(, ../..) +AM_CONDITIONAL(INSTALL_BINARIES, test -z "${with_multisubdir}") + dnl ----------------------------------------------------------- dnl Fold all IA-32 CPU architectures into "x86" dnl ----------------------------------------------------------- diff --git a/libjava/classpath/doc/Makefile.in b/libjava/classpath/doc/Makefile.in index e2bfd66d2a7..1344025f555 100644 --- a/libjava/classpath/doc/Makefile.in +++ b/libjava/classpath/doc/Makefile.in @@ -207,6 +207,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/doc/api/Makefile.in b/libjava/classpath/doc/api/Makefile.in index 2256739d193..78770f67cfe 100644 --- a/libjava/classpath/doc/api/Makefile.in +++ b/libjava/classpath/doc/api/Makefile.in @@ -184,6 +184,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/examples/Makefile.in b/libjava/classpath/examples/Makefile.in index 3adbdaa84aa..c81f2820644 100644 --- a/libjava/classpath/examples/Makefile.in +++ b/libjava/classpath/examples/Makefile.in @@ -193,6 +193,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/external/Makefile.in b/libjava/classpath/external/Makefile.in index 0f122f76b5c..6f85bb29795 100644 --- a/libjava/classpath/external/Makefile.in +++ b/libjava/classpath/external/Makefile.in @@ -191,6 +191,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/external/jsr166/Makefile.in b/libjava/classpath/external/jsr166/Makefile.in index 4be9f2e2e49..1bccd4cdca7 100644 --- a/libjava/classpath/external/jsr166/Makefile.in +++ b/libjava/classpath/external/jsr166/Makefile.in @@ -182,6 +182,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/external/relaxngDatatype/Makefile.in b/libjava/classpath/external/relaxngDatatype/Makefile.in index 5d59fdabe28..69cb6926421 100644 --- a/libjava/classpath/external/relaxngDatatype/Makefile.in +++ b/libjava/classpath/external/relaxngDatatype/Makefile.in @@ -182,6 +182,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/external/sax/Makefile.in b/libjava/classpath/external/sax/Makefile.in index 1f20b35bb2f..314142a706a 100644 --- a/libjava/classpath/external/sax/Makefile.in +++ b/libjava/classpath/external/sax/Makefile.in @@ -182,6 +182,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/external/w3c_dom/Makefile.in b/libjava/classpath/external/w3c_dom/Makefile.in index 2079c48ac29..71c0807e9e7 100644 --- a/libjava/classpath/external/w3c_dom/Makefile.in +++ b/libjava/classpath/external/w3c_dom/Makefile.in @@ -182,6 +182,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/include/Makefile.in b/libjava/classpath/include/Makefile.in index 7caa9c8d3c2..40872ee6af0 100644 --- a/libjava/classpath/include/Makefile.in +++ b/libjava/classpath/include/Makefile.in @@ -183,6 +183,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/lib/Makefile.in b/libjava/classpath/lib/Makefile.in index f3d508389d8..8c8f29805f1 100644 --- a/libjava/classpath/lib/Makefile.in +++ b/libjava/classpath/lib/Makefile.in @@ -187,6 +187,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/Makefile.in b/libjava/classpath/native/Makefile.in index ea9806ef842..8d22204f7f3 100644 --- a/libjava/classpath/native/Makefile.in +++ b/libjava/classpath/native/Makefile.in @@ -190,6 +190,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/fdlibm/Makefile.in b/libjava/classpath/native/fdlibm/Makefile.in index 1fad8ebb536..691da27b387 100644 --- a/libjava/classpath/native/fdlibm/Makefile.in +++ b/libjava/classpath/native/fdlibm/Makefile.in @@ -209,6 +209,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jawt/Makefile.in b/libjava/classpath/native/jawt/Makefile.in index 705405ddb71..c20a940a755 100644 --- a/libjava/classpath/native/jawt/Makefile.in +++ b/libjava/classpath/native/jawt/Makefile.in @@ -209,6 +209,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/Makefile.in b/libjava/classpath/native/jni/Makefile.in index 3d373775bf6..bf2608fc35a 100644 --- a/libjava/classpath/native/jni/Makefile.in +++ b/libjava/classpath/native/jni/Makefile.in @@ -190,6 +190,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/classpath/Makefile.in b/libjava/classpath/native/jni/classpath/Makefile.in index a2a5b0a136e..017edd8aee1 100644 --- a/libjava/classpath/native/jni/classpath/Makefile.in +++ b/libjava/classpath/native/jni/classpath/Makefile.in @@ -200,6 +200,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/gconf-peer/Makefile.in b/libjava/classpath/native/jni/gconf-peer/Makefile.in index d3163e7628a..3f77b6ae3c9 100644 --- a/libjava/classpath/native/jni/gconf-peer/Makefile.in +++ b/libjava/classpath/native/jni/gconf-peer/Makefile.in @@ -209,6 +209,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/gstreamer-peer/Makefile.in b/libjava/classpath/native/jni/gstreamer-peer/Makefile.in index 3a576a208c8..0719b3a982f 100644 --- a/libjava/classpath/native/jni/gstreamer-peer/Makefile.in +++ b/libjava/classpath/native/jni/gstreamer-peer/Makefile.in @@ -211,6 +211,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/gtk-peer/Makefile.in b/libjava/classpath/native/jni/gtk-peer/Makefile.in index 1941b4e0d5b..d277f150ff8 100644 --- a/libjava/classpath/native/jni/gtk-peer/Makefile.in +++ b/libjava/classpath/native/jni/gtk-peer/Makefile.in @@ -247,6 +247,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/java-io/Makefile.in b/libjava/classpath/native/jni/java-io/Makefile.in index 8423de836bb..a7398bcebe3 100644 --- a/libjava/classpath/native/jni/java-io/Makefile.in +++ b/libjava/classpath/native/jni/java-io/Makefile.in @@ -211,6 +211,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/java-lang/Makefile.in b/libjava/classpath/native/jni/java-lang/Makefile.in index e07e20682d4..cbf37b7b322 100644 --- a/libjava/classpath/native/jni/java-lang/Makefile.in +++ b/libjava/classpath/native/jni/java-lang/Makefile.in @@ -225,6 +225,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/java-math/Makefile.in b/libjava/classpath/native/jni/java-math/Makefile.in index 832739b287e..710ea1046fe 100644 --- a/libjava/classpath/native/jni/java-math/Makefile.in +++ b/libjava/classpath/native/jni/java-math/Makefile.in @@ -209,6 +209,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/java-net/Makefile.in b/libjava/classpath/native/jni/java-net/Makefile.in index 69390bc4a0a..f40a7f00634 100644 --- a/libjava/classpath/native/jni/java-net/Makefile.in +++ b/libjava/classpath/native/jni/java-net/Makefile.in @@ -221,6 +221,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/java-nio/Makefile.in b/libjava/classpath/native/jni/java-nio/Makefile.in index 150b968c827..242d9230248 100644 --- a/libjava/classpath/native/jni/java-nio/Makefile.in +++ b/libjava/classpath/native/jni/java-nio/Makefile.in @@ -219,6 +219,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/java-util/Makefile.in b/libjava/classpath/native/jni/java-util/Makefile.in index d84792419ae..0c397fef654 100644 --- a/libjava/classpath/native/jni/java-util/Makefile.in +++ b/libjava/classpath/native/jni/java-util/Makefile.in @@ -208,6 +208,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/midi-alsa/Makefile.in b/libjava/classpath/native/jni/midi-alsa/Makefile.in index c9e96f17874..2d09a679211 100644 --- a/libjava/classpath/native/jni/midi-alsa/Makefile.in +++ b/libjava/classpath/native/jni/midi-alsa/Makefile.in @@ -211,6 +211,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/midi-dssi/Makefile.in b/libjava/classpath/native/jni/midi-dssi/Makefile.in index 764f38e9bd0..25f9c9e23ff 100644 --- a/libjava/classpath/native/jni/midi-dssi/Makefile.in +++ b/libjava/classpath/native/jni/midi-dssi/Makefile.in @@ -211,6 +211,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/native-lib/Makefile.in b/libjava/classpath/native/jni/native-lib/Makefile.in index d1bde494c9f..d56d058af08 100644 --- a/libjava/classpath/native/jni/native-lib/Makefile.in +++ b/libjava/classpath/native/jni/native-lib/Makefile.in @@ -200,6 +200,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/qt-peer/Makefile.in b/libjava/classpath/native/jni/qt-peer/Makefile.in index 1c1b8d0647b..36c0bf141cb 100644 --- a/libjava/classpath/native/jni/qt-peer/Makefile.in +++ b/libjava/classpath/native/jni/qt-peer/Makefile.in @@ -226,6 +226,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/jni/xmlj/Makefile.in b/libjava/classpath/native/jni/xmlj/Makefile.in index a5b48e1374e..351536a067f 100644 --- a/libjava/classpath/native/jni/xmlj/Makefile.in +++ b/libjava/classpath/native/jni/xmlj/Makefile.in @@ -210,6 +210,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/native/plugin/Makefile.in b/libjava/classpath/native/plugin/Makefile.in index d779b74b5eb..8f07d0e64ca 100644 --- a/libjava/classpath/native/plugin/Makefile.in +++ b/libjava/classpath/native/plugin/Makefile.in @@ -208,6 +208,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/resource/Makefile.in b/libjava/classpath/resource/Makefile.in index 71e9303bbae..2618f2797df 100644 --- a/libjava/classpath/resource/Makefile.in +++ b/libjava/classpath/resource/Makefile.in @@ -193,6 +193,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/scripts/Makefile.in b/libjava/classpath/scripts/Makefile.in index dd934679512..f343150e621 100644 --- a/libjava/classpath/scripts/Makefile.in +++ b/libjava/classpath/scripts/Makefile.in @@ -183,6 +183,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am index 2815b7997fb..dfaaf024d3b 100755 --- a/libjava/classpath/tools/Makefile.am +++ b/libjava/classpath/tools/Makefile.am @@ -25,11 +25,16 @@ endif if CREATE_WRAPPERS bin_SCRIPTS = -bin_PROGRAMS = gappletviewer gjarsigner gkeytool \ +bin_programs = gappletviewer gjarsigner gkeytool \ gjar gnative2ascii gserialver gjavah grmiregistry \ gtnameserv gorbd grmid grmic if CREATE_GJDOC -bin_PROGRAMS += gjdoc +bin_programs += gjdoc +endif +if INSTALL_BINARIES +bin_PROGRAMS = $(bin_programs) +else +noinst_PROGRAMS = $(bin_programs) endif AM_CPPFLAGS = -Wall \ diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in index 6b72c02da58..665381d103e 100644 --- a/libjava/classpath/tools/Makefile.in +++ b/libjava/classpath/tools/Makefile.in @@ -39,15 +39,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@CREATE_WRAPPERS_TRUE@bin_PROGRAMS = gappletviewer$(EXEEXT) \ -@CREATE_WRAPPERS_TRUE@ gjarsigner$(EXEEXT) gkeytool$(EXEEXT) \ -@CREATE_WRAPPERS_TRUE@ gjar$(EXEEXT) gnative2ascii$(EXEEXT) \ -@CREATE_WRAPPERS_TRUE@ gserialver$(EXEEXT) gjavah$(EXEEXT) \ -@CREATE_WRAPPERS_TRUE@ grmiregistry$(EXEEXT) \ -@CREATE_WRAPPERS_TRUE@ gtnameserv$(EXEEXT) gorbd$(EXEEXT) \ -@CREATE_WRAPPERS_TRUE@ grmid$(EXEEXT) grmic$(EXEEXT) \ -@CREATE_WRAPPERS_TRUE@ $(am__EXEEXT_1) @CREATE_GJDOC_TRUE@@CREATE_WRAPPERS_TRUE@am__append_1 = gjdoc +@CREATE_WRAPPERS_TRUE@@INSTALL_BINARIES_TRUE@bin_PROGRAMS = \ +@CREATE_WRAPPERS_TRUE@@INSTALL_BINARIES_TRUE@ $(am__EXEEXT_2) +@CREATE_WRAPPERS_TRUE@@INSTALL_BINARIES_FALSE@noinst_PROGRAMS = \ +@CREATE_WRAPPERS_TRUE@@INSTALL_BINARIES_FALSE@ $(am__EXEEXT_2) @CREATE_GJDOC_TRUE@@CREATE_WRAPPERS_FALSE@am__append_2 = gjdoc subdir = tools DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ @@ -91,9 +87,17 @@ CONFIG_CLEAN_FILES = gappletviewer gjarsigner gkeytool gjar \ grmic gjavah gjdoc @CREATE_GJDOC_TRUE@@CREATE_WRAPPERS_TRUE@am__EXEEXT_1 = \ @CREATE_GJDOC_TRUE@@CREATE_WRAPPERS_TRUE@ gjdoc$(EXEEXT) +@CREATE_WRAPPERS_TRUE@am__EXEEXT_2 = gappletviewer$(EXEEXT) \ +@CREATE_WRAPPERS_TRUE@ gjarsigner$(EXEEXT) gkeytool$(EXEEXT) \ +@CREATE_WRAPPERS_TRUE@ gjar$(EXEEXT) gnative2ascii$(EXEEXT) \ +@CREATE_WRAPPERS_TRUE@ gserialver$(EXEEXT) gjavah$(EXEEXT) \ +@CREATE_WRAPPERS_TRUE@ grmiregistry$(EXEEXT) \ +@CREATE_WRAPPERS_TRUE@ gtnameserv$(EXEEXT) gorbd$(EXEEXT) \ +@CREATE_WRAPPERS_TRUE@ grmid$(EXEEXT) grmic$(EXEEXT) \ +@CREATE_WRAPPERS_TRUE@ $(am__EXEEXT_1) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) +PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am__gappletviewer_SOURCES_DIST = toolwrapper.c @CREATE_WRAPPERS_TRUE@am_gappletviewer_OBJECTS = \ @CREATE_WRAPPERS_TRUE@ gappletviewer-toolwrapper.$(OBJEXT) @@ -294,6 +298,8 @@ GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_CLASS_FILES_FALSE = @INSTALL_CLASS_FILES_FALSE@ INSTALL_CLASS_FILES_TRUE = @INSTALL_CLASS_FILES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ @@ -456,6 +462,10 @@ GLIBJ_CLASSPATH = .:$(srcdir)/asm:$(ANTLR_CLASSPATH) # Setup the compiler to use the GNU Classpath library we just built. @GCJ_JAVAC_TRUE@JCOMPILER = $(JAVAC) $(JAVACFLAGS) -fsource=1.5 -ftarget=1.5 --encoding=UTF-8 --bootclasspath=$(GLIBJ_BOOTCLASSPATH) --classpath=$(GLIBJ_CLASSPATH) @CREATE_WRAPPERS_TRUE@bin_SCRIPTS = +@CREATE_WRAPPERS_TRUE@bin_programs = gappletviewer gjarsigner gkeytool \ +@CREATE_WRAPPERS_TRUE@ gjar gnative2ascii gserialver gjavah \ +@CREATE_WRAPPERS_TRUE@ grmiregistry gtnameserv gorbd grmid \ +@CREATE_WRAPPERS_TRUE@ grmic $(am__append_1) @CREATE_WRAPPERS_TRUE@AM_CPPFLAGS = -Wall \ @CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \ @CREATE_WRAPPERS_TRUE@ -DLIBJVM="\"$(libdir)/libjvm\"" \ @@ -806,6 +816,13 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS) else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ done; \ done; rm -f c$${pid}_.???; exit $$bad + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done @CREATE_WRAPPERS_TRUE@gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES) @CREATE_WRAPPERS_TRUE@ @rm -f gappletviewer$(EXEEXT) @CREATE_WRAPPERS_TRUE@ $(LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS) @@ -1216,7 +1233,7 @@ maintainer-clean-generic: clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \ - mostlyclean-am + clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -1266,8 +1283,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool clean-local ctags dist-hook \ - distclean distclean-compile distclean-generic \ + clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ + ctags dist-hook distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ install-binSCRIPTS install-data install-data-am install-exec \ diff --git a/libjava/configure b/libjava/configure index 1152584d5a9..6492b59597b 100755 --- a/libjava/configure +++ b/libjava/configure @@ -459,7 +459,7 @@ ac_includes_default="\ #endif" ac_subdirs_all="$ac_subdirs_all classpath libltdl" -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 ANTLR_JAR CREATE_GJDOC_TRUE CREATE_GJDOC_FALSE 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 SED EGREP FGREP GREP DUMPBIN ac_ct_DUMPBIN NM OBJDUMP ac_ct_OBJDUMP lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CPP CPPFLAGS CXXCPP 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 SUPPRESS_LIBGCJ_BC_TRUE SUPPRESS_LIBGCJ_BC_FALSE BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM 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 ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava extra_gij_ldflags extra_ldflags LIBSTDCXXSPEC LIBGCJTESTSPEC 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 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 GCJVERSION dbexecdir gcjsubdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here python_mod_dir python_mod_dir_expanded MAKE INSTALL_AOT_RPM_TRUE INSTALL_AOT_RPM_FALSE CREATE_JAVA_HOME_TRUE CREATE_JAVA_HOME_FALSE gcc_suffix JAVA_VERSION BUILD_VERSION JVM_ROOT_DIR JVM_JAR_ROOT_DIR JVM_JAR_DIR JRE_DIR SDK_DIR JRE_LNK SDK_LNK SDK_BIN_DIR SDK_LIB_DIR SDK_INCLUDE_DIR JRE_BIN_DIR JRE_LIB_DIR GCJ_BIN_DIR CPU OS LIBDIR 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 ANTLR_JAR CREATE_GJDOC_TRUE CREATE_GJDOC_FALSE 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 SED EGREP FGREP GREP DUMPBIN ac_ct_DUMPBIN NM OBJDUMP ac_ct_OBJDUMP lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CPP CPPFLAGS CXXCPP 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 SUPPRESS_LIBGCJ_BC_TRUE SUPPRESS_LIBGCJ_BC_FALSE BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM 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 ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava extra_gij_ldflags extra_ldflags LIBSTDCXXSPEC LIBGCJTESTSPEC 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 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 INSTALL_BINARIES_TRUE INSTALL_BINARIES_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gcjsubdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here python_mod_dir python_mod_dir_expanded MAKE INSTALL_AOT_RPM_TRUE INSTALL_AOT_RPM_FALSE CREATE_JAVA_HOME_TRUE CREATE_JAVA_HOME_FALSE gcc_suffix JAVA_VERSION BUILD_VERSION JVM_ROOT_DIR JVM_JAR_ROOT_DIR JVM_JAR_DIR JRE_DIR SDK_DIR JRE_LNK SDK_LNK SDK_BIN_DIR SDK_LIB_DIR SDK_INCLUDE_DIR JRE_BIN_DIR JRE_LIB_DIR GCJ_BIN_DIR CPU OS LIBDIR LIBOBJS LTLIBOBJS' ac_subst_files='' ac_pwd=`pwd` @@ -1082,7 +1082,6 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld default=no --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --without-libiconv-prefix don't search for libiconv in includedir and libdir - --with-system-libunwind use installed libunwind --with-python-dir the location to install Python modules. This path should NOT include the prefix. --with-gcc-suffix the GCC tool suffix (defaults to empty string) @@ -6003,13 +6002,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6006: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6005: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6009: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6008: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6012: output\"" >&5) + (eval echo "\"\$as_me:6011: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7156,7 +7155,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7159 "configure"' > conftest.$ac_ext + echo '#line 7158 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9539,11 +9538,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9542: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9541: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9546: \$? = $ac_status" >&5 + echo "$as_me:9545: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9878,11 +9877,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9881: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9880: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9885: \$? = $ac_status" >&5 + echo "$as_me:9884: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9983,11 +9982,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9986: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9985: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9990: \$? = $ac_status" >&5 + echo "$as_me:9989: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10038,11 +10037,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10041: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10040: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10045: \$? = $ac_status" >&5 + echo "$as_me:10044: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12890,7 +12889,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12893 "configure" +#line 12892 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12986,7 +12985,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12989 "configure" +#line 12988 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15012,11 +15011,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15015: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15014: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15019: \$? = $ac_status" >&5 + echo "$as_me:15018: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15111,11 +15110,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15114: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15113: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15118: \$? = $ac_status" >&5 + echo "$as_me:15117: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15163,11 +15162,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15166: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15165: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15170: \$? = $ac_status" >&5 + echo "$as_me:15169: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16565,11 +16564,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16568: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16567: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16572: \$? = $ac_status" >&5 + echo "$as_me:16571: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16898,11 +16897,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16901: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16900: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16905: \$? = $ac_status" >&5 + echo "$as_me:16904: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16997,11 +16996,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17000: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16999: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17004: \$? = $ac_status" >&5 + echo "$as_me:17003: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17049,11 +17048,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17052: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17051: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17056: \$? = $ac_status" >&5 + echo "$as_me:17055: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18739,7 +18738,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : else cat > conftest.$ac_ext << EOF -#line 18742 "configure" +#line 18741 "configure" struct S { ~S(); }; void bar(); void foo() @@ -26392,6 +26391,16 @@ fi +if test -z "${with_multisubdir}"; then + INSTALL_BINARIES_TRUE= + INSTALL_BINARIES_FALSE='#' +else + INSTALL_BINARIES_TRUE='#' + INSTALL_BINARIES_FALSE= +fi + + + # Process the option "--enable-version-specific-runtime-libs" # Calculate toolexeclibdir case ${version_specific_libs} in @@ -27847,35 +27856,91 @@ _ACEOF # For _Unwind_GetIPInfo. -# Check whether --with-system-libunwind or --without-system-libunwind was given. -if test "${with_system_libunwind+set}" = set; then - withval="$with_system_libunwind" -fi; - # If system-libunwind was not specifically set, pick a default setting. - if test x$with_system_libunwind = x; then - case ${target} in - ia64-*-hpux*) with_system_libunwind=yes ;; - *) with_system_libunwind=no ;; - esac - fi - # Based on system-libunwind and target, do we have ipinfo? - if test x$with_system_libunwind = xyes; then - case ${target} in - ia64-*-*) have_unwind_getipinfo=no ;; - *) have_unwind_getipinfo=yes ;; - esac - else - have_unwind_getipinfo=yes - fi + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -fno-exceptions" + echo "$as_me:$LINENO: checking for _Unwind_GetIPInfo" >&5 +echo $ECHO_N "checking for _Unwind_GetIPInfo... $ECHO_C" >&6 + if test "${gcc_cv_getipinfo+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + if test x$gcc_no_link = xyes; then + { { echo "$as_me:$LINENO: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&5 +echo "$as_me: error: Link tests are not allowed after GCC_NO_EXECUTABLES." >&2;} + { (exit 1); exit 1; }; } +fi +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +extern "C" { extern void _Unwind_GetIPInfo(); } +int +main () +{ +_Unwind_GetIPInfo(); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gcc_cv_getipinfo=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +gcc_cv_getipinfo=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi - if test x$have_unwind_getipinfo = xyes; then + if test $gcc_cv_getipinfo = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_GETIPINFO 1 _ACEOF fi + echo "$as_me:$LINENO: result: $gcc_cv_getipinfo" >&5 +echo "${ECHO_T}$gcc_cv_getipinfo" >&6 + CXXFLAGS="$ac_save_CXXFLAGS" + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + # See if linker supports anonymous version scripts. @@ -28567,6 +28632,13 @@ echo "$as_me: error: conditional \"NEEDS_DATA_START\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${INSTALL_BINARIES_TRUE}" && test -z "${INSTALL_BINARIES_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"INSTALL_BINARIES\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"INSTALL_BINARIES\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${ANONVERSCRIPT_TRUE}" && test -z "${ANONVERSCRIPT_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"ANONVERSCRIPT\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -29822,6 +29894,8 @@ s,@ENABLE_SHARED_TRUE@,$ENABLE_SHARED_TRUE,;t t s,@ENABLE_SHARED_FALSE@,$ENABLE_SHARED_FALSE,;t t s,@NEEDS_DATA_START_TRUE@,$NEEDS_DATA_START_TRUE,;t t s,@NEEDS_DATA_START_FALSE@,$NEEDS_DATA_START_FALSE,;t t +s,@INSTALL_BINARIES_TRUE@,$INSTALL_BINARIES_TRUE,;t t +s,@INSTALL_BINARIES_FALSE@,$INSTALL_BINARIES_FALSE,;t t s,@GCC_UNWIND_INCLUDE@,$GCC_UNWIND_INCLUDE,;t t s,@toolexecdir@,$toolexecdir,;t t s,@toolexecmainlibdir@,$toolexecmainlibdir,;t t diff --git a/libjava/configure.ac b/libjava/configure.ac index 749e593d265..ade98b9c976 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1429,6 +1429,7 @@ AC_SUBST(IEEESPEC) AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes) AM_CONDITIONAL(ENABLE_SHARED, test "$enable_shared" = yes) AM_CONDITIONAL(NEEDS_DATA_START, test "$NEEDS_DATA_START" = yes && test "$NATIVE" = yes) +AM_CONDITIONAL(INSTALL_BINARIES, test -z "${with_multisubdir}") AC_SUBST(GCC_UNWIND_INCLUDE) # Process the option "--enable-version-specific-runtime-libs" diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index 7e9aba80150..e31f3f1d6e3 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -160,6 +160,8 @@ IEEESPEC = @IEEESPEC@ INCLTDL = @INCLTDL@ INSTALL_AOT_RPM_FALSE = @INSTALL_AOT_RPM_FALSE@ INSTALL_AOT_RPM_TRUE = @INSTALL_AOT_RPM_TRUE@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_ECJ_JAR_FALSE = @INSTALL_ECJ_JAR_FALSE@ INSTALL_ECJ_JAR_TRUE = @INSTALL_ECJ_JAR_TRUE@ diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index b415ffd0460..1b94fcfc571 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -159,6 +159,8 @@ IEEESPEC = @IEEESPEC@ INCLTDL = @INCLTDL@ INSTALL_AOT_RPM_FALSE = @INSTALL_AOT_RPM_FALSE@ INSTALL_AOT_RPM_TRUE = @INSTALL_AOT_RPM_TRUE@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_ECJ_JAR_FALSE = @INSTALL_ECJ_JAR_FALSE@ INSTALL_ECJ_JAR_TRUE = @INSTALL_ECJ_JAR_TRUE@ diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index 08fe4b159e7..4c3e86c03e1 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -148,6 +148,8 @@ IEEESPEC = @IEEESPEC@ INCLTDL = @INCLTDL@ INSTALL_AOT_RPM_FALSE = @INSTALL_AOT_RPM_FALSE@ INSTALL_AOT_RPM_TRUE = @INSTALL_AOT_RPM_TRUE@ +INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@ +INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_ECJ_JAR_FALSE = @INSTALL_ECJ_JAR_FALSE@ INSTALL_ECJ_JAR_TRUE = @INSTALL_ECJ_JAR_TRUE@ |