Skip to content

R
riscv-gcc-1
Commit 02809848 by Paolo Bonzini Committed by Paolo Bonzini
Options

install.texi: Document that InfoZIP can replace jar. 

gcc:
2006-06-01  Paolo Bonzini  <bonzini@gnu.org>

	* doc/install.texi: Document that InfoZIP can replace jar.

libjava:
2006-06-01  Paolo Bonzini  <bonzini@gnu.org>

	* configure.ac (ZIP, UNZIP): New programs.
	(JAR): Fall back to bash script.  Generate it.
	(BASH_JAR): New conditional.
	* Makefile.am (bin_SCRIPTS): New.
	* jar.in: New file.

From-SVN: r114304
parent d5b0558f
Showing with 110 additions and 54 deletions
gcc/ChangeLog
2006-06-01 Paolo Bonzini <bonzini@gnu.org>
* doc/install.texi: Document that InfoZIP can replace jar.
2006-05-31 Roger Sayle <roger@eyesopen.com> 2006-05-31 Roger Sayle <roger@eyesopen.com>
* config/i386/i386.c (ix86_expand_fp_absneg_operator): When SSE * config/i386/i386.c (ix86_expand_fp_absneg_operator): When SSE
......
gcc/doc/install.texi
...@@ -305,7 +305,7 @@ release (4.1.3) when configured with @option{--enable-mpfr}. ...@@ -305,7 +305,7 @@ release (4.1.3) when configured with @option{--enable-mpfr}.
The @option{--with-mpfr} or @option{--with-mpfr-dir} configure option should The @option{--with-mpfr} or @option{--with-mpfr-dir} configure option should
be used if your MPFR Library is not installed in your library search path. be used if your MPFR Library is not installed in your library search path.
@item jar @item @command{jar}, or InfoZIP (@command{zip} and @command{unzip})
Necessary to build libgcj, the GCJ runtime. Necessary to build libgcj, the GCJ runtime.
...@@ -2911,6 +2911,10 @@ to build the Ada language as it can't be bootstrapped using C@. Ada is ...@@ -2911,6 +2911,10 @@ to build the Ada language as it can't be bootstrapped using C@. Ada is
only available for the 32-bit PA-RISC runtime. The libffi and libjava only available for the 32-bit PA-RISC runtime. The libffi and libjava
haven't been ported to HP-UX and don't build. haven't been ported to HP-UX and don't build.
Starting with GCC 3.4 an ISO C compiler is required to bootstrap. The
bundled compiler supports only traditional C; you will need either HP's
unbundled compiler, or a binary distribution of GCC@.
It is possible to build GCC 3.3 starting with the bundled HP compiler, It is possible to build GCC 3.3 starting with the bundled HP compiler,
but the process requires several steps. GCC 3.3 can then be used to but the process requires several steps. GCC 3.3 can then be used to
build later versions. The fastjar program contains ISO C code and build later versions. The fastjar program contains ISO C code and
...@@ -2919,10 +2923,6 @@ avoided by not building the Java language. For example, use the ...@@ -2919,10 +2923,6 @@ avoided by not building the Java language. For example, use the
@option{--enable-languages="c,c++,f77,objc"} option in your configure @option{--enable-languages="c,c++,f77,objc"} option in your configure
command. command.
Starting with GCC 3.4 an ISO C compiler is required to bootstrap. The
bundled compiler supports only traditional C; you will need either HP's
unbundled compiler, or a binary distribution of GCC@.
There are several possible approaches to building the distribution. There are several possible approaches to building the distribution.
Binutils can be built first using the HP tools. Then, the GCC Binutils can be built first using the HP tools. Then, the GCC
distribution can be built. The second approach is to build GCC distribution can be built. The second approach is to build GCC
......
libjava/ChangeLog
2006-06-01 Paolo Bonzini <bonzini@gnu.org>
* configure.ac (ZIP, UNZIP): New programs.
(JAR): Fall back to bash script. Generate it.
(BASH_JAR): New conditional.
* Makefile.am (bin_SCRIPTS): New.
* jar.in: New file.
2006-06-01 Bryce McKinlay <mckinlay@redhat.com> 2006-06-01 Bryce McKinlay <mckinlay@redhat.com>
* gnu/java/lang/MainThread (run): Revert exception chaining change. * gnu/java/lang/MainThread (run): Revert exception chaining change.
......
libjava/Makefile.am
...@@ -85,7 +85,9 @@ bin_SCRIPTS = addr2name.awk ...@@ -85,7 +85,9 @@ bin_SCRIPTS = addr2name.awk
## Compilers and compilation flags. ## Compilers and compilation flags.
## ##
GCJH = @GCJH@ if BASH_JAR
bin_SCRIPTS += scripts/jar
endif
## The compiler with whatever flags we want for both -c and -C ## The compiler with whatever flags we want for both -c and -C
## compiles. ## compiles.
......
libjava/Makefile.in
...@@ -46,15 +46,16 @@ target_triplet = @target@ ...@@ -46,15 +46,16 @@ target_triplet = @target@
@NATIVE_TRUE@bin_PROGRAMS = jv-convert$(EXEEXT) gij$(EXEEXT) \ @NATIVE_TRUE@bin_PROGRAMS = jv-convert$(EXEEXT) gij$(EXEEXT) \
@NATIVE_TRUE@ grmic$(EXEEXT) grmiregistry$(EXEEXT) \ @NATIVE_TRUE@ grmic$(EXEEXT) grmiregistry$(EXEEXT) \
@NATIVE_TRUE@ gcj-dbtool$(EXEEXT) @NATIVE_TRUE@ gcj-dbtool$(EXEEXT)
@USING_GCC_TRUE@am__append_4 = $(WARNINGS) @BASH_JAR_TRUE@am__append_4 = scripts/jar
@USING_BOEHMGC_TRUE@am__append_5 = boehm.cc @USING_GCC_TRUE@am__append_5 = $(WARNINGS)
@USING_NOGC_TRUE@am__append_6 = nogc.cc @USING_BOEHMGC_TRUE@am__append_6 = boehm.cc
@USING_POSIX_PLATFORM_TRUE@am__append_7 = posix.cc @USING_NOGC_TRUE@am__append_7 = nogc.cc
@USING_WIN32_PLATFORM_TRUE@am__append_8 = win32.cc @USING_POSIX_PLATFORM_TRUE@am__append_8 = posix.cc
@USING_DARWIN_CRT_TRUE@am__append_9 = darwin.cc @USING_WIN32_PLATFORM_TRUE@am__append_9 = win32.cc
@USING_POSIX_THREADS_TRUE@am__append_10 = posix-threads.cc @USING_DARWIN_CRT_TRUE@am__append_10 = darwin.cc
@USING_WIN32_THREADS_TRUE@am__append_11 = win32-threads.cc @USING_POSIX_THREADS_TRUE@am__append_11 = posix-threads.cc
@USING_NO_THREADS_TRUE@am__append_12 = no-threads.cc @USING_WIN32_THREADS_TRUE@am__append_12 = win32-threads.cc
@USING_NO_THREADS_TRUE@am__append_13 = no-threads.cc
DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
$(srcdir)/../config.guess $(srcdir)/../config.sub \ $(srcdir)/../config.guess $(srcdir)/../config.sub \
$(srcdir)/../depcomp $(srcdir)/../install-sh \ $(srcdir)/../depcomp $(srcdir)/../install-sh \
...@@ -62,11 +63,11 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \ ...@@ -62,11 +63,11 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
$(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \ $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/libgcj-test.spec.in \ $(srcdir)/Makefile.in $(srcdir)/libgcj-test.spec.in \
$(srcdir)/libgcj.pc.in $(srcdir)/libgcj.spec.in \ $(srcdir)/libgcj.pc.in $(srcdir)/libgcj.spec.in \
$(srcdir)/sources.am $(top_srcdir)/configure COPYING ChangeLog \ $(srcdir)/sources.am $(top_srcdir)/configure \
NEWS THANKS $(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS
@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@noinst_PROGRAMS = \ @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@noinst_PROGRAMS = \
@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ gen-from-JIS$(EXEEXT) @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@ gen-from-JIS$(EXEEXT)
@XLIB_AWT_TRUE@am__append_13 = $(xlib_nat_headers) @XLIB_AWT_TRUE@am__append_14 = $(xlib_nat_headers)
subdir = . subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
...@@ -90,7 +91,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ...@@ -90,7 +91,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
CONFIG_HEADER = $(top_builddir)/include/config.h \ CONFIG_HEADER = $(top_builddir)/include/config.h \
$(top_builddir)/gcj/libgcj-config.h $(top_builddir)/gcj/libgcj-config.h
CONFIG_CLEAN_FILES = libgcj.pc libgcj.spec libgcj-test.spec \ CONFIG_CLEAN_FILES = libgcj.pc libgcj.spec libgcj-test.spec \
java/io/natFile.cc java/lang/ConcreteProcess.java \ scripts/jar java/io/natFile.cc java/lang/ConcreteProcess.java \
java/lang/natConcreteProcess.cc java/net/natInetAddress.cc \ java/lang/natConcreteProcess.cc java/net/natInetAddress.cc \
java/net/natVMNetworkInterface.cc \ java/net/natVMNetworkInterface.cc \
gnu/java/net/natPlainSocketImpl.cc \ gnu/java/net/natPlainSocketImpl.cc \
...@@ -440,6 +441,8 @@ AUTOHEADER = @AUTOHEADER@ ...@@ -440,6 +441,8 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BACKTRACESPEC = @BACKTRACESPEC@ BACKTRACESPEC = @BACKTRACESPEC@
BASH_JAR_FALSE = @BASH_JAR_FALSE@
BASH_JAR_TRUE = @BASH_JAR_TRUE@
CAIRO_CFLAGS = @CAIRO_CFLAGS@ CAIRO_CFLAGS = @CAIRO_CFLAGS@
CAIRO_LIBS = @CAIRO_LIBS@ CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@ CC = @CC@
...@@ -477,6 +480,7 @@ GCSPEC = @GCSPEC@ ...@@ -477,6 +480,7 @@ GCSPEC = @GCSPEC@
GCTESTSPEC = @GCTESTSPEC@ GCTESTSPEC = @GCTESTSPEC@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@ GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@ GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
GTK_CFLAGS = @GTK_CFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@
...@@ -555,6 +559,7 @@ THREADLDFLAGS = @THREADLDFLAGS@ ...@@ -555,6 +559,7 @@ THREADLDFLAGS = @THREADLDFLAGS@
THREADLIBS = @THREADLIBS@ THREADLIBS = @THREADLIBS@
THREADSPEC = @THREADSPEC@ THREADSPEC = @THREADSPEC@
TOOLKIT = @TOOLKIT@ TOOLKIT = @TOOLKIT@
UNZIP = @UNZIP@
USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@ USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@
USING_BOEHMGC_TRUE = @USING_BOEHMGC_TRUE@ USING_BOEHMGC_TRUE = @USING_BOEHMGC_TRUE@
USING_DARWIN_CRT_FALSE = @USING_DARWIN_CRT_FALSE@ USING_DARWIN_CRT_FALSE = @USING_DARWIN_CRT_FALSE@
...@@ -576,22 +581,18 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@ ...@@ -576,22 +581,18 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@
VERSION = @VERSION@ VERSION = @VERSION@
XLIB_AWT_FALSE = @XLIB_AWT_FALSE@ XLIB_AWT_FALSE = @XLIB_AWT_FALSE@
XLIB_AWT_TRUE = @XLIB_AWT_TRUE@ XLIB_AWT_TRUE = @XLIB_AWT_TRUE@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
ZINCS = @ZINCS@ ZINCS = @ZINCS@
ZIP = @ZIP@
ZLIBS = @ZLIBS@ ZLIBS = @ZLIBS@
ZLIBSPEC = @ZLIBSPEC@ ZLIBSPEC = @ZLIBSPEC@
ZLIBTESTSPEC = @ZLIBTESTSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@
ac_ct_AR = @ac_ct_AR@
ac_ct_AS = @ac_ct_AS@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_GCJ = @ac_ct_GCJ@
ac_ct_LD = @ac_ct_LD@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
...@@ -611,7 +612,10 @@ build_os = @build_os@ ...@@ -611,7 +612,10 @@ build_os = @build_os@
build_subdir = @build_subdir@ build_subdir = @build_subdir@
build_vendor = @build_vendor@ build_vendor = @build_vendor@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@
dbexecdir = @dbexecdir@ dbexecdir = @dbexecdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
extra_ldflags_libjava = @extra_ldflags_libjava@ extra_ldflags_libjava = @extra_ldflags_libjava@
gxx_include_dir = @gxx_include_dir@ gxx_include_dir = @gxx_include_dir@
...@@ -622,6 +626,7 @@ host_cpu = @host_cpu@ ...@@ -622,6 +626,7 @@ host_cpu = @host_cpu@
host_os = @host_os@ host_os = @host_os@
host_subdir = @host_subdir@ host_subdir = @host_subdir@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@ includedir = @includedir@
infodir = @infodir@ infodir = @infodir@
install_sh = @install_sh@ install_sh = @install_sh@
...@@ -629,13 +634,16 @@ libdir = @libdir@ ...@@ -629,13 +634,16 @@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
libgcj_basedir = @libgcj_basedir@ libgcj_basedir = @libgcj_basedir@
libstdcxx_incdir = @libstdcxx_incdir@ libstdcxx_incdir = @libstdcxx_incdir@
localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
mandir = @mandir@ mandir = @mandir@
mkdir_p = @mkdir_p@ mkdir_p = @mkdir_p@
mkinstalldirs = @mkinstalldirs@ mkinstalldirs = @mkinstalldirs@
oldincludedir = @oldincludedir@ oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
subdirs = @subdirs@ subdirs = @subdirs@
...@@ -686,7 +694,7 @@ propdir = $(libdir) ...@@ -686,7 +694,7 @@ propdir = $(libdir)
db_name = classmap.db db_name = classmap.db
db_pathtail = gcj-$(gcc_version)/$(db_name) db_pathtail = gcj-$(gcc_version)/$(db_name)
@NATIVE_TRUE@dbexec_DATA = $(db_name) @NATIVE_TRUE@dbexec_DATA = $(db_name)
bin_SCRIPTS = addr2name.awk bin_SCRIPTS = addr2name.awk $(am__append_4)
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \ GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \
$(LDFLAGS) -o $@ $(LDFLAGS) -o $@
...@@ -724,7 +732,7 @@ AM_GCJFLAGS = \ ...@@ -724,7 +732,7 @@ AM_GCJFLAGS = \
--encoding=UTF-8 \ --encoding=UTF-8 \
-Wno-deprecated -fbootstrap-classes -Wno-deprecated -fbootstrap-classes
AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_4) AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_5)
PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long
JCFLAGS = -g JCFLAGS = -g
JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS) JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
...@@ -748,10 +756,10 @@ libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \ ...@@ -748,10 +756,10 @@ libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.cc \ libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.cc \
defineclass.cc interpret.cc verify.cc java/lang/Class.java \ defineclass.cc interpret.cc verify.cc java/lang/Class.java \
java/lang/Object.java $(nat_source_files) $(am__append_5) \ java/lang/Object.java $(nat_source_files) $(am__append_6) \
$(am__append_6) $(am__append_7) $(am__append_8) \ $(am__append_7) $(am__append_8) $(am__append_9) \
$(am__append_9) $(am__append_10) $(am__append_11) \ $(am__append_10) $(am__append_11) $(am__append_12) \
$(am__append_12) $(am__append_13)
nat_files = $(nat_source_files:.cc=.lo) nat_files = $(nat_source_files:.cc=.lo)
xlib_nat_files = $(xlib_nat_source_files:.cc=.lo) xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
...@@ -7097,7 +7105,7 @@ gnu/gcj/xlib/natXImage.cc \ ...@@ -7097,7 +7105,7 @@ gnu/gcj/xlib/natXImage.cc \
gnu/gcj/xlib/natXUnmapEvent.cc gnu/gcj/xlib/natXUnmapEvent.cc
sourcesdir = $(jardir) sourcesdir = $(jardir)
headers_to_make = $(nat_headers) $(am__append_13) headers_to_make = $(nat_headers) $(am__append_14)
# Work around what appears to be a GNU make bug handling MAKEFLAGS # Work around what appears to be a GNU make bug handling MAKEFLAGS
# values defined in terms of make variables, as is the case for CC and # values defined in terms of make variables, as is the case for CC and
...@@ -7194,6 +7202,8 @@ libgcj.spec: $(top_builddir)/config.status $(srcdir)/libgcj.spec.in ...@@ -7194,6 +7202,8 @@ libgcj.spec: $(top_builddir)/config.status $(srcdir)/libgcj.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@ cd $(top_builddir) && $(SHELL) ./config.status $@
libgcj-test.spec: $(top_builddir)/config.status $(srcdir)/libgcj-test.spec.in libgcj-test.spec: $(top_builddir)/config.status $(srcdir)/libgcj-test.spec.in
cd $(top_builddir) && $(SHELL) ./config.status $@ cd $(top_builddir) && $(SHELL) ./config.status $@
scripts/jar: $(top_builddir)/config.status $(top_srcdir)/scripts/jar.in
cd $(top_builddir) && $(SHELL) ./config.status $@
install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES) install-toolexeclibLTLIBRARIES: $(toolexeclib_LTLIBRARIES)
@$(NORMAL_INSTALL) @$(NORMAL_INSTALL)
test -z "$(toolexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(toolexeclibdir)" test -z "$(toolexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(toolexeclibdir)"
...@@ -8374,7 +8384,7 @@ distclean-tags: ...@@ -8374,7 +8384,7 @@ distclean-tags:
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(am__remove_distdir) $(am__remove_distdir)
mkdir $(distdir) mkdir $(distdir)
$(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../config $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../config $(distdir)/scripts
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \ list='$(DISTFILES)'; for file in $$list; do \
......
libjava/configure
This source diff could not be displayed because it is too large. You can view the blob instead.
libjava/configure.ac
...@@ -116,9 +116,18 @@ AC_CHECK_TOOL(AS, as) ...@@ -116,9 +116,18 @@ AC_CHECK_TOOL(AS, as)
AC_CHECK_TOOL(LD, ld) AC_CHECK_TOOL(LD, ld)
AC_CHECK_TOOL(AR, ar) AC_CHECK_TOOL(AR, ar)
AC_CHECK_TOOL(RANLIB, ranlib, :) AC_CHECK_TOOL(RANLIB, ranlib, :)
AC_CHECK_PROGS(JAR, [jar fastjar], false) AC_PROG_AWK
if test "$JAR" = false; then AC_CHECK_PROGS([JAR], [jar fastjar], no)
AC_MSG_ERROR(jar program not found) AC_PATH_PROG([ZIP], [zip], no)
AC_PATH_PROG([UNZIP], [unzip], unzip)
AM_CONDITIONAL(BASH_JAR, test "$JAR" = no)
if test "$ZIP" = no; then
if test "$JAR" = no; then
AC_MSG_ERROR([cannot find neither zip nor jar, cannot continue])
fi
else
# InfoZIP available, use the 'guaranteed' Bourne-shell JAR to build libjava
JAR=`pwd`/scripts/jar
fi fi
AC_PROG_INSTALL AC_PROG_INSTALL
...@@ -1458,6 +1467,8 @@ include/Makefile ...@@ -1458,6 +1467,8 @@ include/Makefile
testsuite/Makefile testsuite/Makefile
]) ])
AC_CONFIG_FILES([scripts/jar], [chmod +x scripts/jar])
AC_CONFIG_COMMANDS([default], AC_CONFIG_COMMANDS([default],
[# Only add multilib support code if we just rebuilt top-level Makefile. [# Only add multilib support code if we just rebuilt top-level Makefile.
case " $CONFIG_FILES " in case " $CONFIG_FILES " in
......
libjava/gcj/Makefile.in
...@@ -87,6 +87,8 @@ AUTOHEADER = @AUTOHEADER@ ...@@ -87,6 +87,8 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BACKTRACESPEC = @BACKTRACESPEC@ BACKTRACESPEC = @BACKTRACESPEC@
BASH_JAR_FALSE = @BASH_JAR_FALSE@
BASH_JAR_TRUE = @BASH_JAR_TRUE@
CAIRO_CFLAGS = @CAIRO_CFLAGS@ CAIRO_CFLAGS = @CAIRO_CFLAGS@
CAIRO_LIBS = @CAIRO_LIBS@ CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@ CC = @CC@
...@@ -124,6 +126,7 @@ GCSPEC = @GCSPEC@ ...@@ -124,6 +126,7 @@ GCSPEC = @GCSPEC@
GCTESTSPEC = @GCTESTSPEC@ GCTESTSPEC = @GCTESTSPEC@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@ GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@ GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
GTK_CFLAGS = @GTK_CFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@
...@@ -202,6 +205,7 @@ THREADLDFLAGS = @THREADLDFLAGS@ ...@@ -202,6 +205,7 @@ THREADLDFLAGS = @THREADLDFLAGS@
THREADLIBS = @THREADLIBS@ THREADLIBS = @THREADLIBS@
THREADSPEC = @THREADSPEC@ THREADSPEC = @THREADSPEC@
TOOLKIT = @TOOLKIT@ TOOLKIT = @TOOLKIT@
UNZIP = @UNZIP@
USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@ USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@
USING_BOEHMGC_TRUE = @USING_BOEHMGC_TRUE@ USING_BOEHMGC_TRUE = @USING_BOEHMGC_TRUE@
USING_DARWIN_CRT_FALSE = @USING_DARWIN_CRT_FALSE@ USING_DARWIN_CRT_FALSE = @USING_DARWIN_CRT_FALSE@
...@@ -223,22 +227,18 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@ ...@@ -223,22 +227,18 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@
VERSION = @VERSION@ VERSION = @VERSION@
XLIB_AWT_FALSE = @XLIB_AWT_FALSE@ XLIB_AWT_FALSE = @XLIB_AWT_FALSE@
XLIB_AWT_TRUE = @XLIB_AWT_TRUE@ XLIB_AWT_TRUE = @XLIB_AWT_TRUE@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
ZINCS = @ZINCS@ ZINCS = @ZINCS@
ZIP = @ZIP@
ZLIBS = @ZLIBS@ ZLIBS = @ZLIBS@
ZLIBSPEC = @ZLIBSPEC@ ZLIBSPEC = @ZLIBSPEC@
ZLIBTESTSPEC = @ZLIBTESTSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@
ac_ct_AR = @ac_ct_AR@
ac_ct_AS = @ac_ct_AS@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_GCJ = @ac_ct_GCJ@
ac_ct_LD = @ac_ct_LD@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
...@@ -258,7 +258,10 @@ build_os = @build_os@ ...@@ -258,7 +258,10 @@ build_os = @build_os@
build_subdir = @build_subdir@ build_subdir = @build_subdir@
build_vendor = @build_vendor@ build_vendor = @build_vendor@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@
dbexecdir = @dbexecdir@ dbexecdir = @dbexecdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
extra_ldflags_libjava = @extra_ldflags_libjava@ extra_ldflags_libjava = @extra_ldflags_libjava@
gxx_include_dir = @gxx_include_dir@ gxx_include_dir = @gxx_include_dir@
...@@ -269,6 +272,7 @@ host_cpu = @host_cpu@ ...@@ -269,6 +272,7 @@ host_cpu = @host_cpu@
host_os = @host_os@ host_os = @host_os@
host_subdir = @host_subdir@ host_subdir = @host_subdir@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@ includedir = @includedir@
infodir = @infodir@ infodir = @infodir@
install_sh = @install_sh@ install_sh = @install_sh@
...@@ -276,13 +280,16 @@ libdir = @libdir@ ...@@ -276,13 +280,16 @@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
libgcj_basedir = @libgcj_basedir@ libgcj_basedir = @libgcj_basedir@
libstdcxx_incdir = @libstdcxx_incdir@ libstdcxx_incdir = @libstdcxx_incdir@
localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
mandir = @mandir@ mandir = @mandir@
mkdir_p = @mkdir_p@ mkdir_p = @mkdir_p@
mkinstalldirs = @mkinstalldirs@ mkinstalldirs = @mkinstalldirs@
oldincludedir = @oldincludedir@ oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
subdirs = @subdirs@ subdirs = @subdirs@
......
libjava/include/Makefile.in
...@@ -86,6 +86,8 @@ AUTOHEADER = @AUTOHEADER@ ...@@ -86,6 +86,8 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BACKTRACESPEC = @BACKTRACESPEC@ BACKTRACESPEC = @BACKTRACESPEC@
BASH_JAR_FALSE = @BASH_JAR_FALSE@
BASH_JAR_TRUE = @BASH_JAR_TRUE@
CAIRO_CFLAGS = @CAIRO_CFLAGS@ CAIRO_CFLAGS = @CAIRO_CFLAGS@
CAIRO_LIBS = @CAIRO_LIBS@ CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@ CC = @CC@
...@@ -123,6 +125,7 @@ GCSPEC = @GCSPEC@ ...@@ -123,6 +125,7 @@ GCSPEC = @GCSPEC@
GCTESTSPEC = @GCTESTSPEC@ GCTESTSPEC = @GCTESTSPEC@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@ GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@ GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
GTK_CFLAGS = @GTK_CFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@
...@@ -201,6 +204,7 @@ THREADLDFLAGS = @THREADLDFLAGS@ ...@@ -201,6 +204,7 @@ THREADLDFLAGS = @THREADLDFLAGS@
THREADLIBS = @THREADLIBS@ THREADLIBS = @THREADLIBS@
THREADSPEC = @THREADSPEC@ THREADSPEC = @THREADSPEC@
TOOLKIT = @TOOLKIT@ TOOLKIT = @TOOLKIT@
UNZIP = @UNZIP@
USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@ USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@
USING_BOEHMGC_TRUE = @USING_BOEHMGC_TRUE@ USING_BOEHMGC_TRUE = @USING_BOEHMGC_TRUE@
USING_DARWIN_CRT_FALSE = @USING_DARWIN_CRT_FALSE@ USING_DARWIN_CRT_FALSE = @USING_DARWIN_CRT_FALSE@
...@@ -222,22 +226,18 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@ ...@@ -222,22 +226,18 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@
VERSION = @VERSION@ VERSION = @VERSION@
XLIB_AWT_FALSE = @XLIB_AWT_FALSE@ XLIB_AWT_FALSE = @XLIB_AWT_FALSE@
XLIB_AWT_TRUE = @XLIB_AWT_TRUE@ XLIB_AWT_TRUE = @XLIB_AWT_TRUE@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
ZINCS = @ZINCS@ ZINCS = @ZINCS@
ZIP = @ZIP@
ZLIBS = @ZLIBS@ ZLIBS = @ZLIBS@
ZLIBSPEC = @ZLIBSPEC@ ZLIBSPEC = @ZLIBSPEC@
ZLIBTESTSPEC = @ZLIBTESTSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@
ac_ct_AR = @ac_ct_AR@
ac_ct_AS = @ac_ct_AS@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_GCJ = @ac_ct_GCJ@
ac_ct_LD = @ac_ct_LD@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
...@@ -257,7 +257,10 @@ build_os = @build_os@ ...@@ -257,7 +257,10 @@ build_os = @build_os@
build_subdir = @build_subdir@ build_subdir = @build_subdir@
build_vendor = @build_vendor@ build_vendor = @build_vendor@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@
dbexecdir = @dbexecdir@ dbexecdir = @dbexecdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
extra_ldflags_libjava = @extra_ldflags_libjava@ extra_ldflags_libjava = @extra_ldflags_libjava@
gxx_include_dir = @gxx_include_dir@ gxx_include_dir = @gxx_include_dir@
...@@ -268,6 +271,7 @@ host_cpu = @host_cpu@ ...@@ -268,6 +271,7 @@ host_cpu = @host_cpu@
host_os = @host_os@ host_os = @host_os@
host_subdir = @host_subdir@ host_subdir = @host_subdir@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@ includedir = @includedir@
infodir = @infodir@ infodir = @infodir@
install_sh = @install_sh@ install_sh = @install_sh@
...@@ -275,13 +279,16 @@ libdir = @libdir@ ...@@ -275,13 +279,16 @@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
libgcj_basedir = @libgcj_basedir@ libgcj_basedir = @libgcj_basedir@
libstdcxx_incdir = @libstdcxx_incdir@ libstdcxx_incdir = @libstdcxx_incdir@
localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
mandir = @mandir@ mandir = @mandir@
mkdir_p = @mkdir_p@ mkdir_p = @mkdir_p@
mkinstalldirs = @mkinstalldirs@ mkinstalldirs = @mkinstalldirs@
oldincludedir = @oldincludedir@ oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
subdirs = @subdirs@ subdirs = @subdirs@
......
libjava/testsuite/Makefile.in
...@@ -75,6 +75,8 @@ AUTOHEADER = @AUTOHEADER@ ...@@ -75,6 +75,8 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@ AWK = @AWK@
BACKTRACESPEC = @BACKTRACESPEC@ BACKTRACESPEC = @BACKTRACESPEC@
BASH_JAR_FALSE = @BASH_JAR_FALSE@
BASH_JAR_TRUE = @BASH_JAR_TRUE@
CAIRO_CFLAGS = @CAIRO_CFLAGS@ CAIRO_CFLAGS = @CAIRO_CFLAGS@
CAIRO_LIBS = @CAIRO_LIBS@ CAIRO_LIBS = @CAIRO_LIBS@
CC = @CC@ CC = @CC@
...@@ -112,6 +114,7 @@ GCSPEC = @GCSPEC@ ...@@ -112,6 +114,7 @@ GCSPEC = @GCSPEC@
GCTESTSPEC = @GCTESTSPEC@ GCTESTSPEC = @GCTESTSPEC@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@ GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@ GTK_CAIRO_TRUE = @GTK_CAIRO_TRUE@
GTK_CFLAGS = @GTK_CFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@
...@@ -190,6 +193,7 @@ THREADLDFLAGS = @THREADLDFLAGS@ ...@@ -190,6 +193,7 @@ THREADLDFLAGS = @THREADLDFLAGS@
THREADLIBS = @THREADLIBS@ THREADLIBS = @THREADLIBS@
THREADSPEC = @THREADSPEC@ THREADSPEC = @THREADSPEC@
TOOLKIT = @TOOLKIT@ TOOLKIT = @TOOLKIT@
UNZIP = @UNZIP@
USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@ USING_BOEHMGC_FALSE = @USING_BOEHMGC_FALSE@
USING_BOEHMGC_TRUE = @USING_BOEHMGC_TRUE@ USING_BOEHMGC_TRUE = @USING_BOEHMGC_TRUE@
USING_DARWIN_CRT_FALSE = @USING_DARWIN_CRT_FALSE@ USING_DARWIN_CRT_FALSE = @USING_DARWIN_CRT_FALSE@
...@@ -211,22 +215,18 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@ ...@@ -211,22 +215,18 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@
VERSION = @VERSION@ VERSION = @VERSION@
XLIB_AWT_FALSE = @XLIB_AWT_FALSE@ XLIB_AWT_FALSE = @XLIB_AWT_FALSE@
XLIB_AWT_TRUE = @XLIB_AWT_TRUE@ XLIB_AWT_TRUE = @XLIB_AWT_TRUE@
XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@ X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@
ZINCS = @ZINCS@ ZINCS = @ZINCS@
ZIP = @ZIP@
ZLIBS = @ZLIBS@ ZLIBS = @ZLIBS@
ZLIBSPEC = @ZLIBSPEC@ ZLIBSPEC = @ZLIBSPEC@
ZLIBTESTSPEC = @ZLIBTESTSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@
ac_ct_AR = @ac_ct_AR@
ac_ct_AS = @ac_ct_AS@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_GCJ = @ac_ct_GCJ@
ac_ct_LD = @ac_ct_LD@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
...@@ -246,7 +246,10 @@ build_os = @build_os@ ...@@ -246,7 +246,10 @@ build_os = @build_os@
build_subdir = @build_subdir@ build_subdir = @build_subdir@
build_vendor = @build_vendor@ build_vendor = @build_vendor@
datadir = @datadir@ datadir = @datadir@
datarootdir = @datarootdir@
dbexecdir = @dbexecdir@ dbexecdir = @dbexecdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
extra_ldflags_libjava = @extra_ldflags_libjava@ extra_ldflags_libjava = @extra_ldflags_libjava@
gxx_include_dir = @gxx_include_dir@ gxx_include_dir = @gxx_include_dir@
...@@ -257,6 +260,7 @@ host_cpu = @host_cpu@ ...@@ -257,6 +260,7 @@ host_cpu = @host_cpu@
host_os = @host_os@ host_os = @host_os@
host_subdir = @host_subdir@ host_subdir = @host_subdir@
host_vendor = @host_vendor@ host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@ includedir = @includedir@
infodir = @infodir@ infodir = @infodir@
install_sh = @install_sh@ install_sh = @install_sh@
...@@ -264,13 +268,16 @@ libdir = @libdir@ ...@@ -264,13 +268,16 @@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
libgcj_basedir = @libgcj_basedir@ libgcj_basedir = @libgcj_basedir@
libstdcxx_incdir = @libstdcxx_incdir@ libstdcxx_incdir = @libstdcxx_incdir@
localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
mandir = @mandir@ mandir = @mandir@
mkdir_p = @mkdir_p@ mkdir_p = @mkdir_p@
mkinstalldirs = @mkinstalldirs@ mkinstalldirs = @mkinstalldirs@
oldincludedir = @oldincludedir@ oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
subdirs = @subdirs@ subdirs = @subdirs@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment