PatchSet 7072
Date: 2006/01/03 22:36:50
Author: robilad
Branch: HEAD
Tag: (none)
Log:
fixed --with-system-zlib
2006-01-03 Dalibor Topic <[EMAIL PROTECTED]>
* external/gcc/Makefile.am: build zlib conditionally.
* external/gcc/fastjar/configure.ac: Fixed zlib check.
Members:
ChangeLog:1.4591->1.4592
external/gcc/Makefile.am:1.1->1.2
external/gcc/Makefile.in:1.1->1.2
external/gcc/fastjar/Makefile.in:1.1->1.2
external/gcc/fastjar/config.h.in:1.1->1.2
external/gcc/fastjar/configure:1.1->1.2
external/gcc/fastjar/configure.ac:1.1->1.2
external/gcc/fastjar/fastjar.info:1.1->1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4591 kaffe/ChangeLog:1.4592
--- kaffe/ChangeLog:1.4591 Tue Jan 3 15:26:37 2006
+++ kaffe/ChangeLog Tue Jan 3 22:36:50 2006
@@ -1,5 +1,11 @@
2006-01-03 Dalibor Topic <[EMAIL PROTECTED]>
+ * external/gcc/Makefile.am: build zlib conditionally.
+
+ * external/gcc/fastjar/configure.ac: Fixed zlib check.
+
+2006-01-03 Dalibor Topic <[EMAIL PROTECTED]>
+
* Makefile.am: (SUBDIRS) Added external subdir.
(DIST_SUBDIRS) Added external subdir.
Index: kaffe/external/gcc/Makefile.am
diff -u kaffe/external/gcc/Makefile.am:1.1 kaffe/external/gcc/Makefile.am:1.2
--- kaffe/external/gcc/Makefile.am:1.1 Tue Jan 3 15:27:00 2006
+++ kaffe/external/gcc/Makefile.am Tue Jan 3 22:36:56 2006
@@ -1,5 +1,10 @@
+if COND_SYSTEM_ZLIB
+else
+MAYBE_ZLIB=zlib
+endif
+
if COND_FASTJAR
MAYBE_FASTJAR=fastjar
endif
-SUBDIRS = zlib $(MAYBE_FASTJAR)
+SUBDIRS = $(MAYBE_ZLIB) $(MAYBE_FASTJAR)
Index: kaffe/external/gcc/Makefile.in
diff -u kaffe/external/gcc/Makefile.in:1.1 kaffe/external/gcc/Makefile.in:1.2
--- kaffe/external/gcc/Makefile.in:1.1 Tue Jan 3 15:27:00 2006
+++ kaffe/external/gcc/Makefile.in Tue Jan 3 22:36:56 2006
@@ -338,8 +338,9 @@
target_alias = @target_alias@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
[EMAIL PROTECTED]@MAYBE_ZLIB = zlib
@[EMAIL PROTECTED] = fastjar
-SUBDIRS = zlib $(MAYBE_FASTJAR)
+SUBDIRS = $(MAYBE_ZLIB) $(MAYBE_FASTJAR)
all: all-recursive
.SUFFIXES:
Index: kaffe/external/gcc/fastjar/Makefile.in
diff -u kaffe/external/gcc/fastjar/Makefile.in:1.1
kaffe/external/gcc/fastjar/Makefile.in:1.2
--- kaffe/external/gcc/fastjar/Makefile.in:1.1 Tue Jan 3 15:27:00 2006
+++ kaffe/external/gcc/fastjar/Makefile.in Tue Jan 3 22:36:56 2006
@@ -22,7 +22,7 @@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
+top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -39,36 +39,24 @@
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = fastjar$(EXEEXT)
-subdir = external/gcc/fastjar
-DIST_COMMON = README $(fastjar_TEXINFOS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog INSTALL NEWS \
+DIST_COMMON = README $(am__configure_deps) $(fastjar_TEXINFOS) \
+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/config.h.in $(srcdir)/install-defs.sh.in \
+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
compile config.guess config.sub depcomp install-sh ltmain.sh \
missing
+subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \
- $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \
- $(top_srcdir)/m4/ax_cflags_gcc_option.m4 \
- $(top_srcdir)/m4/ax_cflags_warn_all.m4 \
- $(top_srcdir)/m4/ax_create_stdint_h.m4 \
- $(top_srcdir)/m4/binreloc.m4 $(top_srcdir)/m4/compile_value.m4 \
- $(top_srcdir)/m4/esd.m4 $(top_srcdir)/m4/gcc_attribute.m4 \
- $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibcver.m4 \
- $(top_srcdir)/m4/gmp.m4 $(top_srcdir)/m4/gwqt.m4 \
- $(top_srcdir)/m4/herrno.m4 $(top_srcdir)/m4/iconv.m4 \
- $(top_srcdir)/m4/in6addr.m4 $(top_srcdir)/m4/lcmessage.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/semaphore.m4 \
- $(top_srcdir)/m4/size_max.m4 $(top_srcdir)/m4/sockaddrin6.m4 \
- $(top_srcdir)/m4/sockinttypes.m4 \
- $(top_srcdir)/m4/solarispthread.m4 $(top_srcdir)/m4/valist.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/accross.m4 \
+ $(top_srcdir)/m4/gcc_AC_FUNC_MKDIR_TAKES_ONE_ARG.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config/config.h
-CONFIG_CLEAN_FILES =
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno configure.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = install-defs.sh
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" \
"$(DESTDIR)$(man1dir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -77,12 +65,10 @@
fastjar-dostime.$(OBJEXT) fastjar-compress.$(OBJEXT) \
fastjar-pushback.$(OBJEXT) fastjar-shift.$(OBJEXT)
fastjar_OBJECTS = $(am_fastjar_OBJECTS)
-am__DEPENDENCIES_1 =
[EMAIL PROTECTED]@am__DEPENDENCIES_2 = ../zlib/libz.la
[EMAIL PROTECTED]@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-fastjar_DEPENDENCIES = $(am__DEPENDENCIES_2)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
[EMAIL PROTECTED]@am__DEPENDENCIES_1 = ../zlib/libz.la
+fastjar_DEPENDENCIES = $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -111,62 +97,33 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+ { test ! -d $(distdir) \
+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-ALSA_CFLAGS = @ALSA_CFLAGS@
-ALSA_LIBS = @ALSA_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
-AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
-AWT_LIBS = @AWT_LIBS@
-BCEL_JAR = @BCEL_JAR@
-BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
-BINRELOC_LIBS = @BINRELOC_LIBS@
-BOEHMGC_SPECIFIC_FLAGS = @BOEHMGC_SPECIFIC_FLAGS@
CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
CCLD = @CCLD@
CFLAGS = @CFLAGS@
-CFLAGS_PG = @CFLAGS_PG@
-CFLAGS_WITHOUT_PG = @CFLAGS_WITHOUT_PG@
-CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@
-COND_CLASSPATH_TOOLS_FALSE = @COND_CLASSPATH_TOOLS_FALSE@
-COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
-COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
-COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
-COND_FASTJAR_FALSE = @COND_FASTJAR_FALSE@
-COND_FASTJAR_TRUE = @COND_FASTJAR_TRUE@
-COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
-COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
-COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
-COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
-COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
-COND_KAFFE_QT_AWT_TRUE = @COND_KAFFE_QT_AWT_TRUE@
-COND_KAFFE_X_AWT_FALSE = @COND_KAFFE_X_AWT_FALSE@
-COND_KAFFE_X_AWT_TRUE = @COND_KAFFE_X_AWT_TRUE@
-COND_NATIVE_AWT_FALSE = @COND_NATIVE_AWT_FALSE@
-COND_NATIVE_AWT_TRUE = @COND_NATIVE_AWT_TRUE@
-COND_NATIVE_SOUND_FALSE = @COND_NATIVE_SOUND_FALSE@
-COND_NATIVE_SOUND_TRUE = @COND_NATIVE_SOUND_TRUE@
-COND_PURE_JAVA_MATH_FALSE = @COND_PURE_JAVA_MATH_FALSE@
-COND_PURE_JAVA_MATH_TRUE = @COND_PURE_JAVA_MATH_TRUE@
-COND_SOUND_ALSA_FALSE = @COND_SOUND_ALSA_FALSE@
-COND_SOUND_ALSA_TRUE = @COND_SOUND_ALSA_TRUE@
-COND_SOUND_ESD_FALSE = @COND_SOUND_ESD_FALSE@
-COND_SOUND_ESD_TRUE = @COND_SOUND_ESD_TRUE@
+CHMOD = @CHMOD@
COND_SYSTEM_ZLIB_FALSE = @COND_SYSTEM_ZLIB_FALSE@
COND_SYSTEM_ZLIB_TRUE = @COND_SYSTEM_ZLIB_TRUE@
-CONFIG_CALLKAFFEEXCEPTION_H = @CONFIG_CALLKAFFEEXCEPTION_H@
-CONFIG_JIT_MD_H = @CONFIG_JIT_MD_H@
-CONFIG_MD_H = @CONFIG_MD_H@
-CONFIG_XPROFILE_MD_H = @CONFIG_XPROFILE_MD_H@
+CP = @CP@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -176,157 +133,50 @@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIRSEP = @DIRSEP@
-DLLTOOL = @DLLTOOL@
-DLOPEN_JAVA_LIBS = @DLOPEN_JAVA_LIBS@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_JVMPI_FALSE = @ENABLE_JVMPI_FALSE@
-ENABLE_JVMPI_TRUE = @ENABLE_JVMPI_TRUE@
-ENABLE_XPROF_FALSE = @ENABLE_XPROF_FALSE@
-ENABLE_XPROF_TRUE = @ENABLE_XPROF_TRUE@
-ENGINE_NAME = @ENGINE_NAME@
-ESD_CFLAGS = @ESD_CFLAGS@
-ESD_CONFIG = @ESD_CONFIG@
-ESD_LIBS = @ESD_LIBS@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-GC_NAME = @GC_NAME@
-GMSGFMT = @GMSGFMT@
-HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
-HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
-HAVE_CONFIG_JIT_MD_H = @HAVE_CONFIG_JIT_MD_H@
-HAVE_GCJ_SUPPORT_FALSE = @HAVE_GCJ_SUPPORT_FALSE@
-HAVE_GCJ_SUPPORT_TRUE = @HAVE_GCJ_SUPPORT_TRUE@
-HAVE_JASMIN_FALSE = @HAVE_JASMIN_FALSE@
-HAVE_JASMIN_TRUE = @HAVE_JASMIN_TRUE@
-HAVE_JAVAC_FALSE = @HAVE_JAVAC_FALSE@
-HAVE_JAVAC_TRUE = @HAVE_JAVAC_TRUE@
-HAVE_MKTEMP_FALSE = @HAVE_MKTEMP_FALSE@
-HAVE_MKTEMP_TRUE = @HAVE_MKTEMP_TRUE@
-HAVE_ZIP_FALSE = @HAVE_ZIP_FALSE@
-HAVE_ZIP_TRUE = @HAVE_ZIP_TRUE@
-INCLUDED_EXTENSIONS = @INCLUDED_EXTENSIONS@
-INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
+GENINSRC_FALSE = @GENINSRC_FALSE@
+GENINSRC_TRUE = @GENINSRC_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-JASMIN = @JASMIN@
-JAVAC_FLAGS = @JAVAC_FLAGS@
-JAVA_COMPILER = @JAVA_COMPILER@
-JAVA_LIBS = @JAVA_LIBS@
-JIKESPROG = @JIKESPROG@
-KAFFEH = @KAFFEH@
-KAFFEVM_ICODE_H = @KAFFEVM_ICODE_H@
-KAFFEVM_JIT_DEF = @KAFFEVM_JIT_DEF@
-KAFFEVM_MD_C = @KAFFEVM_MD_C@
-KAFFEVM_TRAMPOLINES_S = @KAFFEVM_TRAMPOLINES_S@
-KAFFE_ARCHOS = @KAFFE_ARCHOS@
-KAFFE_LIBS = @KAFFE_LIBS@
-KLIBFLAGS = @KLIBFLAGS@
-KPREFIX = @KPREFIX@
-KVMBINFLAGS = @KVMBINFLAGS@
-KVMLIBFLAGS = @KVMLIBFLAGS@
LDFLAGS = @LDFLAGS@
-LIBADD_GMP = @LIBADD_GMP@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
-MAKE_KAFFEH = @MAKE_KAFFEH@
-MATH_LIB = @MATH_LIB@
-MAY_RUN_PO_FALSE = @MAY_RUN_PO_FALSE@
-MAY_RUN_PO_TRUE = @MAY_RUN_PO_TRUE@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MKTEMP = @MKTEMP@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-M_LIBS = @M_LIBS@
-NANOX_CFLAGS = @NANOX_CFLAGS@
-NEED_LIBXPROF_FALSE = @NEED_LIBXPROF_FALSE@
-NEED_LIBXPROF_TRUE = @NEED_LIBXPROF_TRUE@
-NET_LIBS = @NET_LIBS@
-OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
-OPT_DLOPEN_JAVA_LIBS = @OPT_DLOPEN_JAVA_LIBS@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
-PATHSEP = @PATHSEP@
PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_TO_RT_JAR = @PATH_TO_RT_JAR@
-POSUB = @POSUB@
-PROFILE = @PROFILE@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-QASSISTANTCLIENT_LDADD = @QASSISTANTCLIENT_LDADD@
-QEMBED = @QEMBED@
-QT_CXXFLAGS = @QT_CXXFLAGS@
-QT_GUILINK = @QT_GUILINK@
-QT_LDADD = @QT_LDADD@
RANLIB = @RANLIB@
-REGEN_FORWARD = @REGEN_FORWARD@
-SECURITY_LIBS = @SECURITY_LIBS@
-SEMAPHORE_LIB = @SEMAPHORE_LIB@
+RM = @RM@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SUN_COMPAT_FALSE = @SUN_COMPAT_FALSE@
-SUN_COMPAT_TRUE = @SUN_COMPAT_TRUE@
-THREAD_DIR = @THREAD_DIR@
-THREAD_SYSTEM = @THREAD_SYSTEM@
-UIC = @UIC@
-USE_COMPAT_IFADDRS_FALSE = @USE_COMPAT_IFADDRS_FALSE@
-USE_COMPAT_IFADDRS_TRUE = @USE_COMPAT_IFADDRS_TRUE@
-USE_GMP = @USE_GMP@
-USE_JIT_FALSE = @USE_JIT_FALSE@
-USE_JIT_TRUE = @USE_JIT_TRUE@
-USE_NLS = @USE_NLS@
-USE_PRECOMPILED_RT_JAR_FALSE = @USE_PRECOMPILED_RT_JAR_FALSE@
-USE_PRECOMPILED_RT_JAR_TRUE = @USE_PRECOMPILED_RT_JAR_TRUE@
VERSION = @VERSION@
-VM_LIBS = @VM_LIBS@
-XGETTEXT = @XGETTEXT@
-XI18N_CFLAGS = @XI18N_CFLAGS@
-X_CFLAGS = @X_CFLAGS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-ZIP = @ZIP@
-ZIP_LIBS = @ZIP_LIBS@
-abssrcdir = @abssrcdir@
ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
-acx_pthread_config = @acx_pthread_config@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -344,6 +194,7 @@
build_vendor = @build_vendor@
datadir = @datadir@
exec_prefix = @exec_prefix@
+fastjar_warn_cflags = @fastjar_warn_cflags@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -352,29 +203,18 @@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
-jrebindir = @jrebindir@
-jredir = @jredir@
-jrelibdir = @jrelibdir@
-kaffe_TRANSF = @kaffe_TRANSF@
-kaffebin_TRANSF = @kaffebin_TRANSF@
-kaffeh_TRANSF = @kaffeh_TRANSF@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
-nativedir = @nativedir@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
-securitydir = @securitydir@
sharedstatedir = @sharedstatedir@
-subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-toolslibdir = @toolslibdir@
-with_engine = @with_engine@
ACLOCAL_AMFLAGS = -I m4
@[EMAIL PROTECTED] = ../zlib/libz.la
@[EMAIL PROTECTED] = $(ZIP_LIBS)
@@ -420,39 +260,63 @@
m4/accross.m4 \
m4/gcc_AC_FUNC_MKDIR_TAKES_ONE_ARG.m4
-all: all-am
+all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .1 .c .dvi .lo .o .obj .pod .ps
+am--refresh:
+ @:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am
$(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+ cd $(srcdir) && $(AUTOMAKE) --gnu \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu
external/gcc/fastjar/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu external/gcc/fastjar/Makefile
+ $(AUTOMAKE) --gnu Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ echo ' $(SHELL) ./config.status'; \
+ $(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@
$(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@
$(am__depfiles_maybe);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(SHELL) ./config.status --recheck
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ cd $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.h: stamp-h1
+ @if test ! -f $@; then \
+ rm -f stamp-h1; \
+ $(MAKE) stamp-h1; \
+ else :; fi
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h1
+ touch $@
+
+distclean-hdr:
+ -rm -f config.h stamp-h1
+install-defs.sh: $(top_builddir)/config.status $(srcdir)/install-defs.sh.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@@ -747,11 +611,11 @@
mkid -fID $$unique
tags: TAGS
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -763,11 +627,11 @@
$$tags $$unique; \
fi
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -786,7 +650,9 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/m4
+ $(am__remove_distdir)
+ mkdir $(distdir)
+ $(mkdir_p) $(distdir)/. $(distdir)/m4
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -816,9 +682,106 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-info
+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {}
\; \
+ || chmod -R a+r $(distdir)
+dist-gzip: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
+ $(am__remove_distdir)
+
+dist-bzip2: distdir
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-tarZ: distdir
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+
+dist-shar: distdir
+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ $(am__remove_distdir)
+
+dist-zip: distdir
+ -rm -f $(distdir).zip
+ zip -rq $(distdir).zip $(distdir)
+ $(am__remove_distdir)
+
+dist dist-all: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
+ $(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration. Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
+ chmod a-w $(distdir)
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e
's,^[^:\\/]:[\\/],/,'` \
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+ && cd $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base"
\
+ distuninstallcheck \
+ && chmod -R a-w "$$dc_install_base" \
+ && ({ \
+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+ } || { rm -rf "$$dc_destdir"; exit 1; }) \
+ && rm -rf "$$dc_destdir" \
+ && $(MAKE) $(AM_MAKEFLAGS) dist \
+ && rm -rf $(DIST_ARCHIVES) \
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ $(am__remove_distdir)
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+distuninstallcheck:
+ @cd $(distuninstallcheck_dir) \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+ fi ; \
+ $(distuninstallcheck_listfiles) ; \
+ exit 1; } >&2
+distcleancheck: distclean
+ @if test '$(srcdir)' = . ; then \
+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+ exit 1 ; \
+ fi
+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left in build directory after distclean:" ; \
+ $(distcleancheck_listfiles) ; \
+ exit 1; } >&2
check-am: all-am
check: check-am
-all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(MANS) all-local
+all-am: Makefile $(INFO_DEPS) $(PROGRAMS) $(MANS) config.h all-local
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)"
"$(DESTDIR)$(man1dir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
@@ -855,10 +818,11 @@
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
- distclean-libtool distclean-tags
+ distclean-hdr distclean-libtool distclean-tags
dvi: dvi-am
@@ -913,6 +877,8 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -rf $(top_srcdir)/autom4te.cache
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-aminfo \
@@ -935,15 +901,17 @@
uninstall-man: uninstall-man1
-.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
- clean-binPROGRAMS clean-generic clean-libtool ctags dist-info \
- 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-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-man1 \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-aminfo \
+.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \
+ clean clean-binPROGRAMS clean-generic clean-libtool ctags dist \
+ dist-all dist-bzip2 dist-gzip dist-info dist-shar dist-tarZ \
+ dist-zip distcheck distclean distclean-compile \
+ distclean-generic distclean-hdr distclean-libtool \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-man1 install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-aminfo \
maintainer-clean-generic mostlyclean mostlyclean-aminfo \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags uninstall uninstall-am \
Index: kaffe/external/gcc/fastjar/config.h.in
diff -u kaffe/external/gcc/fastjar/config.h.in:1.1
kaffe/external/gcc/fastjar/config.h.in:1.2
--- kaffe/external/gcc/fastjar/config.h.in:1.1 Tue Jan 3 15:27:01 2006
+++ kaffe/external/gcc/fastjar/config.h.in Tue Jan 3 22:36:56 2006
@@ -19,6 +19,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
+/* Define to 1 if you have the `z' library (-lz). */
+#undef HAVE_LIBZ
+
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
Index: kaffe/external/gcc/fastjar/configure
diff -u kaffe/external/gcc/fastjar/configure:1.1
kaffe/external/gcc/fastjar/configure:1.2
--- kaffe/external/gcc/fastjar/configure:1.1 Tue Jan 3 15:27:01 2006
+++ kaffe/external/gcc/fastjar/configure Tue Jan 3 22:36:56 2006
@@ -463,7 +463,7 @@
# 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
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 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 RM CP CHMOD build build_cpu build_vendor build_os host
host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB
CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE
CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCLD MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT fastjar_warn_cflags ZIP_LIBS COND_SYSTEM_ZLIB_TRUE
COND_SYSTEM_ZLIB_FALSE GENINSRC_TRUE GENINSRC_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
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 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 RM CP CHMOD build build_cpu build_vendor build_os host
host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB
CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE
CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCLD MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT fastjar_warn_cflags COND_SYSTEM_ZLIB_TRUE
COND_SYSTEM_ZLIB_FALSE GENINSRC_TRUE GENINSRC_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -20436,6 +20436,19 @@
fi
+
+# Check whether --with-system-zlib or --without-system-zlib was given.
+if test "${with_system_zlib+set}" = set; then
+ withval="$with_system_zlib"
+
+else
+ with_system_zlib=no
+
+fi;
+
+if test x"$with_system_zlib" != x"no" ; then
+ # Check for libraries for zip library.
+
echo "$as_me:$LINENO: checking for deflate in -lz" >&5
echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6
if test "${ac_cv_lib_z_deflate+set}" = set; then
@@ -20501,21 +20514,15 @@
echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5
echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6
if test $ac_cv_lib_z_deflate = yes; then
- ZIP_LIBS
-fi
-
-ZIP_LIBS="$CTLIBS $ZIP_LIBS"
-
-
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBZ 1
+_ACEOF
-# Check whether --with-system-zlib or --without-system-zlib was given.
-if test "${with_system_zlib+set}" = set; then
- withval="$with_system_zlib"
+ LIBS="-lz $LIBS"
-else
- with_system_zlib=no
+fi
-fi;
+fi
@@ -21301,7 +21308,6 @@
s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
s,@MAINT@,$MAINT,;t t
s,@fastjar_warn_cflags@,$fastjar_warn_cflags,;t t
-s,@ZIP_LIBS@,$ZIP_LIBS,;t t
s,@COND_SYSTEM_ZLIB_TRUE@,$COND_SYSTEM_ZLIB_TRUE,;t t
s,@COND_SYSTEM_ZLIB_FALSE@,$COND_SYSTEM_ZLIB_FALSE,;t t
s,@GENINSRC_TRUE@,$GENINSRC_TRUE,;t t
Index: kaffe/external/gcc/fastjar/configure.ac
diff -u kaffe/external/gcc/fastjar/configure.ac:1.1
kaffe/external/gcc/fastjar/configure.ac:1.2
--- kaffe/external/gcc/fastjar/configure.ac:1.1 Tue Jan 3 15:27:01 2006
+++ kaffe/external/gcc/fastjar/configure.ac Tue Jan 3 22:36:57 2006
@@ -52,17 +52,17 @@
dnl Check byte order
AC_C_BIGENDIAN_CROSS
-dnl Check for libraries for zip library.
-AC_CHECK_LIB(z,deflate,ZIP_LIBS)
-ZIP_LIBS="$CTLIBS $ZIP_LIBS"
-AC_SUBST(ZIP_LIBS)
-
AC_ARG_WITH([system-zlib],
AS_HELP_STRING([--with-system-zlib],
[Use installed zlib on the system instead of Kaffe's
copy]),
[],
[with_system_zlib=no]
)
+
+if test x"$with_system_zlib" != x"no" ; then
+ # Check for libraries for zip library.
+ AC_CHECK_LIB(z,deflate)
+fi
AM_CONDITIONAL(COND_SYSTEM_ZLIB, test x"$with_system_zlib" != x"no")
Index: kaffe/external/gcc/fastjar/fastjar.info
diff -u kaffe/external/gcc/fastjar/fastjar.info:1.1
kaffe/external/gcc/fastjar/fastjar.info:1.2
--- kaffe/external/gcc/fastjar/fastjar.info:1.1 Tue Jan 3 15:27:01 2006
+++ kaffe/external/gcc/fastjar/fastjar.info Tue Jan 3 22:36:57 2006
@@ -1,5 +1,5 @@
-This is fastjar.info, produced by makeinfo version 4.8 from
-/scratch/mitchell/gcc-releases/gcc-4.0.2/gcc-4.0.2/fastjar/fastjar.texi.
+This is fastjar.info, produced by makeinfo version 4.7 from
+../../../../kaffe/external/gcc/fastjar/fastjar.texi.
INFO-DIR-SECTION Programming
START-INFO-DIR-ENTRY
@@ -502,9 +502,9 @@
Tag Table:
-Node: Top889
-Node: Invoking fastjar1207
-Node: Invoking grepjar2907
-Node: Copying3518
+Node: Top869
+Node: Invoking fastjar1187
+Node: Invoking grepjar2887
+Node: Copying3498
End Tag Table
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
