re PR libgcj/7305 (Install path for libgcj header files)
PR libgcj/7305 * configure.ac: Use TL_AC_GXX_INCLUDE_DIR. * Makefile.am (install-data-local): Install headers into $(gxx_include_dir) rather than $(includedir). (AM_MAKEFLAGS): Pass down gxx_include_dir. * gcj/Makefile.am (gcjdir): Set to $(gxx_include_dir)/gcj. * include/Makefile.am (tool_include__HEADERS): Define this... (include_HEADERS): ...instead of this. * configure, aclocal.m4, Makefile.in, gcj/Makefile.in: Regenerate. * include/Makefile.in, testsuite/Makefile.in: Regenerate. From-SVN: r91682
This commit is contained in:
Richard Sandiford
Richard Sandiford
parent
f4ed7d2144
commit
dafb7f3f52
@ -1,3 +1,16 @@
|
||||
2004-12-03 Richard Sandiford <rsandifo@redhat.com>
|
||||
|
||||
PR libgcj/7305
|
||||
* configure.ac: Use TL_AC_GXX_INCLUDE_DIR.
|
||||
* Makefile.am (install-data-local): Install headers into
|
||||
$(gxx_include_dir) rather than $(includedir).
|
||||
(AM_MAKEFLAGS): Pass down gxx_include_dir.
|
||||
* gcj/Makefile.am (gcjdir): Set to $(gxx_include_dir)/gcj.
|
||||
* include/Makefile.am (tool_include__HEADERS): Define this...
|
||||
(include_HEADERS): ...instead of this.
|
||||
* configure, aclocal.m4, Makefile.in, gcj/Makefile.in: Regenerate.
|
||||
* include/Makefile.in, testsuite/Makefile.in: Regenerate.
|
||||
|
||||
2004-12-02 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
For PR java/16675:
|
||||
|
||||
@ -872,10 +872,10 @@ install-data-local:
|
||||
@: $(call write_entries_to_file,$(nat_headers_install) $(extra_headers),tmp-ilist)
|
||||
@cat tmp-ilist | while read f; do \
|
||||
d="`echo $$f | sed -e 's,/[^/]*$$,,'`"; \
|
||||
$(mkinstalldirs) $(DESTDIR)$(includedir)/$$d; \
|
||||
$(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/$$d; \
|
||||
if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/$$f"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/$$f; \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gxx_include_dir)/$$f"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(gxx_include_dir)/$$f; \
|
||||
done
|
||||
-@rm -f tmp-ilist
|
||||
## FIXME: the obvious approach using lib_DATA doesn't work with
|
||||
@ -887,16 +887,16 @@ install-data-local:
|
||||
done
|
||||
$(INSTALL_DATA) $(srcdir)/java/util/logging/logging.properties $(DESTDIR)$(propdir)/logging.properties
|
||||
## Install inner class headers.
|
||||
$(INSTALL_DATA) 'java/io/ObjectOutputStream$$PutField.h' $(DESTDIR)$(includedir)/java/io/
|
||||
$(INSTALL_DATA) 'java/io/ObjectInputStream$$GetField.h' $(DESTDIR)$(includedir)/java/io/
|
||||
$(INSTALL_DATA) 'java/nio/channels/Pipe$$SinkChannel.h' $(DESTDIR)$(includedir)/java/nio/channels/
|
||||
$(INSTALL_DATA) 'java/nio/channels/Pipe$$SourceChannel.h' $(DESTDIR)$(includedir)/java/nio/channels/
|
||||
$(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyData.h' $(DESTDIR)$(includedir)/java/lang/reflect/
|
||||
$(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyType.h' $(DESTDIR)$(includedir)/java/lang/reflect/
|
||||
$(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketInputStream.h' $(DESTDIR)$(includedir)/gnu/java/net/
|
||||
$(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketOutputStream.h' $(DESTDIR)$(includedir)/gnu/java/net/
|
||||
$(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SinkChannelImpl.h' $(DESTDIR)$(includedir)/gnu/java/nio/
|
||||
$(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SourceChannelImpl.h' $(DESTDIR)$(includedir)/gnu/java/nio/
|
||||
$(INSTALL_DATA) 'java/io/ObjectOutputStream$$PutField.h' $(DESTDIR)$(gxx_include_dir)/java/io/
|
||||
$(INSTALL_DATA) 'java/io/ObjectInputStream$$GetField.h' $(DESTDIR)$(gxx_include_dir)/java/io/
|
||||
$(INSTALL_DATA) 'java/nio/channels/Pipe$$SinkChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/
|
||||
$(INSTALL_DATA) 'java/nio/channels/Pipe$$SourceChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/
|
||||
$(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyData.h' $(DESTDIR)$(gxx_include_dir)/java/lang/reflect/
|
||||
$(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyType.h' $(DESTDIR)$(gxx_include_dir)/java/lang/reflect/
|
||||
$(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketInputStream.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/net/
|
||||
$(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketOutputStream.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/net/
|
||||
$(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SinkChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/
|
||||
$(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SourceChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/
|
||||
## Don't install java/nio/DirectByteBufferImpl$$ReadWrite.h here. It's for internal use only.
|
||||
|
||||
|
||||
@ -3604,6 +3604,7 @@ AM_MAKEFLAGS = \
|
||||
"infodir=$(infodir)" \
|
||||
"libdir=$(libdir)" \
|
||||
"prefix=$(prefix)" \
|
||||
"gxx_include_dir=$(gxx_include_dir)" \
|
||||
"AR=$(AR)" \
|
||||
"AS=$(AS)" \
|
||||
"LD=$(LD)" \
|
||||
|
||||
@ -62,6 +62,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
|
||||
$(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/gcc-version.m4 \
|
||||
$(top_srcdir)/../config/gxx-include-dir.m4 \
|
||||
$(top_srcdir)/../config/iconv.m4 \
|
||||
$(top_srcdir)/../config/lcmessage.m4 \
|
||||
$(top_srcdir)/../config/lib-ld.m4 \
|
||||
@ -4479,6 +4480,7 @@ exec_prefix = @exec_prefix@
|
||||
gcc_version = @gcc_version@
|
||||
gcc_version_full = @gcc_version_full@
|
||||
gcc_version_trigger = @gcc_version_trigger@
|
||||
gxx_include_dir = @gxx_include_dir@
|
||||
here = @here@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
@ -4491,6 +4493,7 @@ install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
libgcj_basedir = @libgcj_basedir@
|
||||
libstdcxx_incdir = @libstdcxx_incdir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
@ -7371,6 +7374,7 @@ AM_MAKEFLAGS = \
|
||||
"infodir=$(infodir)" \
|
||||
"libdir=$(libdir)" \
|
||||
"prefix=$(prefix)" \
|
||||
"gxx_include_dir=$(gxx_include_dir)" \
|
||||
"AR=$(AR)" \
|
||||
"AS=$(AS)" \
|
||||
"LD=$(LD)" \
|
||||
@ -24341,10 +24345,10 @@ install-data-local:
|
||||
@: $(call write_entries_to_file,$(nat_headers_install) $(extra_headers),tmp-ilist)
|
||||
@cat tmp-ilist | while read f; do \
|
||||
d="`echo $$f | sed -e 's,/[^/]*$$,,'`"; \
|
||||
$(mkinstalldirs) $(DESTDIR)$(includedir)/$$d; \
|
||||
$(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/$$d; \
|
||||
if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/$$f"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(includedir)/$$f; \
|
||||
echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gxx_include_dir)/$$f"; \
|
||||
$(INSTALL_DATA) $$p $(DESTDIR)$(gxx_include_dir)/$$f; \
|
||||
done
|
||||
-@rm -f tmp-ilist
|
||||
$(mkinstalldirs) $(DESTDIR)$(secdir)
|
||||
@ -24353,16 +24357,16 @@ install-data-local:
|
||||
$(INSTALL_DATA) $(srcdir)/java/security/$$f $(DESTDIR)$(secdir)/$$f; \
|
||||
done
|
||||
$(INSTALL_DATA) $(srcdir)/java/util/logging/logging.properties $(DESTDIR)$(propdir)/logging.properties
|
||||
$(INSTALL_DATA) 'java/io/ObjectOutputStream$$PutField.h' $(DESTDIR)$(includedir)/java/io/
|
||||
$(INSTALL_DATA) 'java/io/ObjectInputStream$$GetField.h' $(DESTDIR)$(includedir)/java/io/
|
||||
$(INSTALL_DATA) 'java/nio/channels/Pipe$$SinkChannel.h' $(DESTDIR)$(includedir)/java/nio/channels/
|
||||
$(INSTALL_DATA) 'java/nio/channels/Pipe$$SourceChannel.h' $(DESTDIR)$(includedir)/java/nio/channels/
|
||||
$(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyData.h' $(DESTDIR)$(includedir)/java/lang/reflect/
|
||||
$(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyType.h' $(DESTDIR)$(includedir)/java/lang/reflect/
|
||||
$(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketInputStream.h' $(DESTDIR)$(includedir)/gnu/java/net/
|
||||
$(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketOutputStream.h' $(DESTDIR)$(includedir)/gnu/java/net/
|
||||
$(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SinkChannelImpl.h' $(DESTDIR)$(includedir)/gnu/java/nio/
|
||||
$(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SourceChannelImpl.h' $(DESTDIR)$(includedir)/gnu/java/nio/
|
||||
$(INSTALL_DATA) 'java/io/ObjectOutputStream$$PutField.h' $(DESTDIR)$(gxx_include_dir)/java/io/
|
||||
$(INSTALL_DATA) 'java/io/ObjectInputStream$$GetField.h' $(DESTDIR)$(gxx_include_dir)/java/io/
|
||||
$(INSTALL_DATA) 'java/nio/channels/Pipe$$SinkChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/
|
||||
$(INSTALL_DATA) 'java/nio/channels/Pipe$$SourceChannel.h' $(DESTDIR)$(gxx_include_dir)/java/nio/channels/
|
||||
$(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyData.h' $(DESTDIR)$(gxx_include_dir)/java/lang/reflect/
|
||||
$(INSTALL_DATA) 'java/lang/reflect/Proxy$$ProxyType.h' $(DESTDIR)$(gxx_include_dir)/java/lang/reflect/
|
||||
$(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketInputStream.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/net/
|
||||
$(INSTALL_DATA) 'gnu/java/net/PlainSocketImpl$$SocketOutputStream.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/net/
|
||||
$(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SinkChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/
|
||||
$(INSTALL_DATA) 'gnu/java/nio/PipeImpl$$SourceChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/
|
||||
|
||||
maintainer-check: libgcj.la
|
||||
$(NM) .libs/libgcj.a | grep ' T ' \
|
||||
|
||||
1
libjava/aclocal.m4
vendored
1
libjava/aclocal.m4
vendored
@ -1131,6 +1131,7 @@ AC_SUBST([am__untar])
|
||||
m4_include([../config/accross.m4])
|
||||
m4_include([../config/acx.m4])
|
||||
m4_include([../config/gcc-version.m4])
|
||||
m4_include([../config/gxx-include-dir.m4])
|
||||
m4_include([../config/iconv.m4])
|
||||
m4_include([../config/lcmessage.m4])
|
||||
m4_include([../config/lib-ld.m4])
|
||||
|
||||
24
libjava/configure
vendored
24
libjava/configure
vendored
@ -310,7 +310,7 @@ ac_includes_default="\
|
||||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcj_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs COMPPATH TESTSUBDIR_TRUE TESTSUBDIR_FALSE ONESTEP_TRUE ONESTEP_FALSE LIBGCJDEBUG INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_ECOS_PLATFORM_TRUE USING_ECOS_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE gcc_version_trigger gcc_version_full gcc_version tool_include_dir LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE GCJH ZIP CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION ALLOCA PERL BACKTRACESPEC SYSDEP_SOURCES here LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libgcj_basedir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs COMPPATH TESTSUBDIR_TRUE TESTSUBDIR_FALSE ONESTEP_TRUE ONESTEP_FALSE LIBGCJDEBUG INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_ECOS_PLATFORM_TRUE USING_ECOS_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE gcc_version_trigger gcc_version_full gcc_version tool_include_dir LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE GCJH ZIP CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL BACKTRACESPEC SYSDEP_SOURCES here LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@ -14278,6 +14278,26 @@ cat >>confdefs.h <<_ACEOF
|
||||
_ACEOF
|
||||
|
||||
|
||||
|
||||
case "${with_gxx_include_dir}" in
|
||||
yes)
|
||||
{ { echo "$as_me:$LINENO: error: --with-gxx-include-dir=[dir] requires a directory" >&5
|
||||
echo "$as_me: error: --with-gxx-include-dir=[dir] requires a directory" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
;;
|
||||
no | "")
|
||||
case "${enable_version_specific_runtime_libs}" in
|
||||
yes) gxx_include_dir='${libsubdir}/include/c++' ;;
|
||||
*)
|
||||
libstdcxx_incdir=c++/${gcc_version}
|
||||
gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
|
||||
esac ;;
|
||||
*) gxx_include_dir=${with_gxx_include_dir} ;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
|
||||
# We check for sys/filio.h because Solaris 2.5 defines FIONREAD there.
|
||||
# On that system, sys/ioctl.h will not include sys/filio.h unless
|
||||
# BSD_COMP is defined; just including sys/filio.h is simpler.
|
||||
@ -17309,6 +17329,8 @@ s,@toolexecdir@,$toolexecdir,;t t
|
||||
s,@toolexecmainlibdir@,$toolexecmainlibdir,;t t
|
||||
s,@toolexeclibdir@,$toolexeclibdir,;t t
|
||||
s,@GCJVERSION@,$GCJVERSION,;t t
|
||||
s,@gxx_include_dir@,$gxx_include_dir,;t t
|
||||
s,@libstdcxx_incdir@,$libstdcxx_incdir,;t t
|
||||
s,@ALLOCA@,$ALLOCA,;t t
|
||||
s,@PERL@,$PERL,;t t
|
||||
s,@BACKTRACESPEC@,$BACKTRACESPEC,;t t
|
||||
|
||||
@ -1202,6 +1202,8 @@ GCJVERSION=$gcjversion
|
||||
AC_SUBST(GCJVERSION)
|
||||
AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID])
|
||||
|
||||
TL_AC_GXX_INCLUDE_DIR
|
||||
|
||||
# We check for sys/filio.h because Solaris 2.5 defines FIONREAD there.
|
||||
# On that system, sys/ioctl.h will not include sys/filio.h unless
|
||||
# BSD_COMP is defined; just including sys/filio.h is simpler.
|
||||
|
||||
@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign
|
||||
# autoconf2.13's target_alias
|
||||
target_noncanonical = @target_noncanonical@
|
||||
|
||||
gcjdir = $(includedir)/gcj
|
||||
gcjdir = $(gxx_include_dir)/gcj
|
||||
gcj_HEADERS = array.h cni.h field.h javaprims.h method.h
|
||||
|
||||
toolgcjdir = @tool_include_dir@/gcj
|
||||
|
||||
@ -45,6 +45,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
|
||||
$(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/gcc-version.m4 \
|
||||
$(top_srcdir)/../config/gxx-include-dir.m4 \
|
||||
$(top_srcdir)/../config/iconv.m4 \
|
||||
$(top_srcdir)/../config/lcmessage.m4 \
|
||||
$(top_srcdir)/../config/lib-ld.m4 \
|
||||
@ -258,6 +259,7 @@ exec_prefix = @exec_prefix@
|
||||
gcc_version = @gcc_version@
|
||||
gcc_version_full = @gcc_version_full@
|
||||
gcc_version_trigger = @gcc_version_trigger@
|
||||
gxx_include_dir = @gxx_include_dir@
|
||||
here = @here@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
@ -270,6 +272,7 @@ install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
libgcj_basedir = @libgcj_basedir@
|
||||
libstdcxx_incdir = @libstdcxx_incdir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
@ -294,7 +297,7 @@ toolexecdir = @toolexecdir@
|
||||
toolexeclibdir = @toolexeclibdir@
|
||||
toolexecmainlibdir = @toolexecmainlibdir@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
gcjdir = $(includedir)/gcj
|
||||
gcjdir = $(gxx_include_dir)/gcj
|
||||
gcj_HEADERS = array.h cni.h field.h javaprims.h method.h
|
||||
toolgcjdir = @tool_include_dir@/gcj
|
||||
toolgcj_HEADERS = libgcj-config.h
|
||||
|
||||
@ -5,4 +5,4 @@ AUTOMAKE_OPTIONS = foreign
|
||||
# autoconf2.13's target_alias
|
||||
target_noncanonical = @target_noncanonical@
|
||||
|
||||
include_HEADERS = jni.h jvmpi.h
|
||||
tool_include__HEADERS = jni.h jvmpi.h
|
||||
|
||||
@ -38,12 +38,13 @@ build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
target_triplet = @target@
|
||||
subdir = include
|
||||
DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
$(srcdir)/config.h.in $(tool_include__HEADERS)
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
|
||||
$(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/gcc-version.m4 \
|
||||
$(top_srcdir)/../config/gxx-include-dir.m4 \
|
||||
$(top_srcdir)/../config/iconv.m4 \
|
||||
$(top_srcdir)/../config/lcmessage.m4 \
|
||||
$(top_srcdir)/../config/lib-ld.m4 \
|
||||
@ -65,9 +66,9 @@ am__vpath_adj = case $$p in \
|
||||
*) f=$$p;; \
|
||||
esac;
|
||||
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
||||
am__installdirs = "$(DESTDIR)$(includedir)"
|
||||
includeHEADERS_INSTALL = $(INSTALL_HEADER)
|
||||
HEADERS = $(include_HEADERS)
|
||||
am__installdirs = "$(DESTDIR)$(tool_include_dir)"
|
||||
tool_include_HEADERS_INSTALL = $(INSTALL_HEADER)
|
||||
HEADERS = $(tool_include__HEADERS)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@ -257,6 +258,7 @@ exec_prefix = @exec_prefix@
|
||||
gcc_version = @gcc_version@
|
||||
gcc_version_full = @gcc_version_full@
|
||||
gcc_version_trigger = @gcc_version_trigger@
|
||||
gxx_include_dir = @gxx_include_dir@
|
||||
here = @here@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
@ -269,6 +271,7 @@ install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
libgcj_basedir = @libgcj_basedir@
|
||||
libstdcxx_incdir = @libstdcxx_incdir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
@ -293,7 +296,7 @@ toolexecdir = @toolexecdir@
|
||||
toolexeclibdir = @toolexeclibdir@
|
||||
toolexecmainlibdir = @toolexecmainlibdir@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
include_HEADERS = jni.h jvmpi.h
|
||||
tool_include__HEADERS = jni.h jvmpi.h
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||
|
||||
@ -354,22 +357,22 @@ clean-libtool:
|
||||
distclean-libtool:
|
||||
-rm -f libtool
|
||||
uninstall-info-am:
|
||||
install-includeHEADERS: $(include_HEADERS)
|
||||
install-tool_include_HEADERS: $(tool_include__HEADERS)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
|
||||
@list='$(include_HEADERS)'; for p in $$list; do \
|
||||
test -z "$(tool_include_dir)" || $(mkdir_p) "$(DESTDIR)$(tool_include_dir)"
|
||||
@list='$(tool_include__HEADERS)'; for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
f=$(am__strip_dir) \
|
||||
echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
|
||||
$(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
|
||||
echo " $(tool_include_HEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(tool_include_dir)/$$f'"; \
|
||||
$(tool_include_HEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(tool_include_dir)/$$f"; \
|
||||
done
|
||||
|
||||
uninstall-includeHEADERS:
|
||||
uninstall-tool_include_HEADERS:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(include_HEADERS)'; for p in $$list; do \
|
||||
@list='$(tool_include__HEADERS)'; for p in $$list; do \
|
||||
f=$(am__strip_dir) \
|
||||
echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(includedir)/$$f"; \
|
||||
echo " rm -f '$(DESTDIR)$(tool_include_dir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(tool_include_dir)/$$f"; \
|
||||
done
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
@ -451,7 +454,7 @@ check-am: all-am
|
||||
check: check-am
|
||||
all-am: Makefile $(HEADERS) config.h
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(includedir)"; do \
|
||||
for dir in "$(DESTDIR)$(tool_include_dir)"; do \
|
||||
test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
||||
done
|
||||
install: install-am
|
||||
@ -497,7 +500,7 @@ info: info-am
|
||||
|
||||
info-am:
|
||||
|
||||
install-data-am: install-includeHEADERS
|
||||
install-data-am: install-tool_include_HEADERS
|
||||
|
||||
install-exec-am:
|
||||
|
||||
@ -523,19 +526,19 @@ ps: ps-am
|
||||
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-includeHEADERS uninstall-info-am
|
||||
uninstall-am: uninstall-info-am uninstall-tool_include_HEADERS
|
||||
|
||||
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
|
||||
clean-libtool ctags distclean distclean-generic distclean-hdr \
|
||||
distclean-libtool distclean-tags distdir dvi dvi-am html \
|
||||
html-am info info-am install install-am install-data \
|
||||
install-data-am install-exec install-exec-am \
|
||||
install-includeHEADERS install-info install-info-am \
|
||||
install-man install-strip installcheck installcheck-am \
|
||||
install-data-am install-exec install-exec-am install-info \
|
||||
install-info-am install-man install-strip \
|
||||
install-tool_include_HEADERS installcheck installcheck-am \
|
||||
installdirs maintainer-clean maintainer-clean-generic \
|
||||
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
|
||||
ps ps-am tags uninstall uninstall-am uninstall-includeHEADERS \
|
||||
uninstall-info-am
|
||||
ps ps-am tags uninstall uninstall-am uninstall-info-am \
|
||||
uninstall-tool_include_HEADERS
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
|
||||
@ -42,6 +42,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/../config/accross.m4 \
|
||||
$(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/gcc-version.m4 \
|
||||
$(top_srcdir)/../config/gxx-include-dir.m4 \
|
||||
$(top_srcdir)/../config/iconv.m4 \
|
||||
$(top_srcdir)/../config/lcmessage.m4 \
|
||||
$(top_srcdir)/../config/lib-ld.m4 \
|
||||
@ -246,6 +247,7 @@ exec_prefix = @exec_prefix@
|
||||
gcc_version = @gcc_version@
|
||||
gcc_version_full = @gcc_version_full@
|
||||
gcc_version_trigger = @gcc_version_trigger@
|
||||
gxx_include_dir = @gxx_include_dir@
|
||||
here = @here@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
@ -258,6 +260,7 @@ install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
libgcj_basedir = @libgcj_basedir@
|
||||
libstdcxx_incdir = @libstdcxx_incdir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
|
||||
Loading…
Reference in New Issue
Block a user