Commit 86e44bd7 by H.J. Lu Committed by H.J. Lu

re PR java/32098 (New libtool doesn't support libjava)

2007-05-30  H.J. Lu  <hongjiu.lu@intel.com>

	PR libjava/32098
	* configure.ac: Add AC_CONFIG_AUX_DIR(../..).
	* aclocal.m4: Regenerated.
	* configure: Likewise.
	* Makefile.in: Likewise.

From-SVN: r125194
parent 60c7a11a
2007-05-30 H.J. Lu <hongjiu.lu@intel.com>
PR libjava/32098
* configure.ac: Add AC_CONFIG_AUX_DIR(../..).
* aclocal.m4: Regenerated.
* configure: Likewise.
* Makefile.in: Likewise.
2007-04-25 Andrew Haley <aph@redhat.com> 2007-04-25 Andrew Haley <aph@redhat.com>
* java/io/ObjectStreamClass.java (ensureFieldsSet): New method. * java/io/ObjectStreamClass.java (ensureFieldsSet): New method.
......
...@@ -36,23 +36,35 @@ POST_UNINSTALL = : ...@@ -36,23 +36,35 @@ POST_UNINSTALL = :
build_triplet = @build@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
target_triplet = @target@ target_triplet = @target@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ DIST_COMMON = README $(am__configure_deps) \
$(srcdir)/Makefile.in $(top_srcdir)/configure \ $(srcdir)/../../config.guess $(srcdir)/../../config.sub \
$(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \
$(srcdir)/../../missing $(srcdir)/../../mkinstalldirs \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/configure \
$(top_srcdir)/gnu/classpath/Configuration.java.in \ $(top_srcdir)/gnu/classpath/Configuration.java.in \
$(top_srcdir)/gnu/java/security/Configuration.java.in \ $(top_srcdir)/gnu/java/security/Configuration.java.in \
$(top_srcdir)/resource/META-INF/services/java.util.prefs.PreferencesFactory.in \ $(top_srcdir)/resource/META-INF/services/java.util.prefs.PreferencesFactory.in \
AUTHORS COPYING ChangeLog INSTALL NEWS TODO compile \ ../../ABOUT-NLS ../../COPYING ../../COPYING.LIB \
config.guess config.sub depcomp install-sh ltcf-c.sh \ ../../ChangeLog ../../README ../../compile ../../config.guess \
ltcf-cxx.sh ltcf-gcj.sh ltconfig ltmain.sh missing \ ../../config.rpath ../../config.sub ../../depcomp \
mkinstalldirs ../../install-sh ../../ltmain.sh ../../missing \
../../mkinstalldirs ../../ylwrap AUTHORS COPYING ChangeLog \
INSTALL NEWS TODO compile config.guess config.sub depcomp \
install-sh ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh ltconfig \
ltmain.sh missing mkinstalldirs
subdir = . subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \
$(top_srcdir)/../../config/lead-dot.m4 \ $(top_srcdir)/../../config/lead-dot.m4 \
$(top_srcdir)/../../config/multi.m4 \ $(top_srcdir)/../../config/multi.m4 \
$(top_srcdir)/../../config/no-executables.m4 \ $(top_srcdir)/../../config/no-executables.m4 \
$(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \ $(top_srcdir)/../../libtool.m4 \
$(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/../../ltoptions.m4 \
$(top_srcdir)/../../ltsugar.m4 \
$(top_srcdir)/../../ltversion.m4 \
$(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \
$(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
...@@ -62,7 +74,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ...@@ -62,7 +74,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno configure.lineno configure.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_HEADER = $(top_builddir)/include/config.h
CONFIG_CLEAN_FILES = gnu/classpath/Configuration.java \ CONFIG_CLEAN_FILES = gnu/classpath/Configuration.java \
gnu/java/security/Configuration.java \ gnu/java/security/Configuration.java \
...@@ -98,6 +110,7 @@ ACLOCAL = @ACLOCAL@ ...@@ -98,6 +110,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@ AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@
...@@ -149,6 +162,7 @@ DATE = @DATE@ ...@@ -149,6 +162,7 @@ DATE = @DATE@
DEFAULT_PREFS_PEER = @DEFAULT_PREFS_PEER@ DEFAULT_PREFS_PEER = @DEFAULT_PREFS_PEER@
DEFS = @DEFS@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@ ECHO_T = @ECHO_T@
...@@ -161,6 +175,7 @@ ERROR_CFLAGS = @ERROR_CFLAGS@ ...@@ -161,6 +175,7 @@ ERROR_CFLAGS = @ERROR_CFLAGS@
EXAMPLESDIR = @EXAMPLESDIR@ EXAMPLESDIR = @EXAMPLESDIR@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FASTJAR = @FASTJAR@ FASTJAR = @FASTJAR@
FGREP = @FGREP@
FIND = @FIND@ FIND = @FIND@
FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@ FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@ FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
...@@ -187,6 +202,7 @@ GENINSRC_TRUE = @GENINSRC_TRUE@ ...@@ -187,6 +202,7 @@ GENINSRC_TRUE = @GENINSRC_TRUE@
GJDOC = @GJDOC@ GJDOC = @GJDOC@
GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@ GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@ GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@ GTK_LIBS = @GTK_LIBS@
INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@ INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
...@@ -207,6 +223,7 @@ JIKES = @JIKES@ ...@@ -207,6 +223,7 @@ JIKES = @JIKES@
JIKESENCODING = @JIKESENCODING@ JIKESENCODING = @JIKESENCODING@
JIKESWARNINGS = @JIKESWARNINGS@ JIKESWARNINGS = @JIKESWARNINGS@
KJC = @KJC@ KJC = @KJC@
LD = @LD@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBDEBUG = @LIBDEBUG@ LIBDEBUG = @LIBDEBUG@
LIBICONV = @LIBICONV@ LIBICONV = @LIBICONV@
...@@ -226,6 +243,7 @@ MKDIR = @MKDIR@ ...@@ -226,6 +243,7 @@ MKDIR = @MKDIR@
MOC = @MOC@ MOC = @MOC@
MOZILLA_CFLAGS = @MOZILLA_CFLAGS@ MOZILLA_CFLAGS = @MOZILLA_CFLAGS@
MOZILLA_LIBS = @MOZILLA_LIBS@ MOZILLA_LIBS = @MOZILLA_LIBS@
NM = @NM@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
...@@ -247,6 +265,7 @@ RANLIB = @RANLIB@ ...@@ -247,6 +265,7 @@ RANLIB = @RANLIB@
REGEN_PARSERS_FALSE = @REGEN_PARSERS_FALSE@ REGEN_PARSERS_FALSE = @REGEN_PARSERS_FALSE@
REGEN_PARSERS_TRUE = @REGEN_PARSERS_TRUE@ REGEN_PARSERS_TRUE = @REGEN_PARSERS_TRUE@
REMOVE = @REMOVE@ REMOVE = @REMOVE@
SED = @SED@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
STRICT_WARNING_CFLAGS = @STRICT_WARNING_CFLAGS@ STRICT_WARNING_CFLAGS = @STRICT_WARNING_CFLAGS@
...@@ -274,8 +293,10 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ ...@@ -274,8 +293,10 @@ 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@
ZIP = @ZIP@ ZIP = @ZIP@
ac_ct_AR = @ac_ct_AR@
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_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_RANLIB = @ac_ct_RANLIB@ ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@ ac_ct_STRIP = @ac_ct_STRIP@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
...@@ -308,6 +329,7 @@ install_sh = @install_sh@ ...@@ -308,6 +329,7 @@ install_sh = @install_sh@
libdir = @libdir@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@ mandir = @mandir@
mkdir_p = @mkdir_p@ mkdir_p = @mkdir_p@
multi_basedir = @multi_basedir@ multi_basedir = @multi_basedir@
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -9,6 +9,10 @@ dnl define([AC_CACHE_SAVE], )dnl ...@@ -9,6 +9,10 @@ dnl define([AC_CACHE_SAVE], )dnl
AC_INIT([GNU Classpath],[0.94-pre],[classpath@gnu.org],[classpath]) AC_INIT([GNU Classpath],[0.94-pre],[classpath@gnu.org],[classpath])
AC_CONFIG_SRCDIR(java/lang/System.java) AC_CONFIG_SRCDIR(java/lang/System.java)
dnl GCJ LOCAL
AC_CONFIG_AUX_DIR(../..)
dnl END GCJ LOCAL
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
dnl GCJ LOCAL dnl GCJ LOCAL
......
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