1999-04-07 16:42:40 +02:00
|
|
|
AC_DEFUN(LIBGCJ_CONFIGURE,
|
|
|
|
[
|
|
|
|
dnl Default to --enable-multilib
|
|
|
|
AC_ARG_ENABLE(multilib,
|
[multiple changes]
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile: Rebuilt.
* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
builds.
* java/net/natPlainSocketImpl.cc: Include <sys/select.h> only if
present.
* configure: Rebuilt.
* configure.in: Properly align --help output, fix capitalization
and punctuation.
* acinclude.m4: Likewise.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* include/javaprims.h (_Jv_word, _Jv_word2): New types.
* include/java-interp.h (_Jv_InterpMethodInvocation): Use _Jv_word.
(_Jv_callInterpretedMethod): Unused. Remove.
(_Jv_InterpMethod::run,run_normal,run_synch_object,run_synch_class):
Use ffi_raw.
* include/java-cpool.h (_Jv_get, _Jv_put): Remove.
(_Jv_{store,load}{Indexes,Int,Float,Long,Double}): Use _Jv_word.
* boehm.cc (_Jv_MarkObj): Use _Jv_word.
* interpret.cc: use _Jv_word.
* defineclass.cc: use_Jv_word.
* resolve.cc: Use _Jv_word.
(_Jv_ResolvePoolEntry): Return _Jv_word.
* java/lang/Class.h (_Jv_Constants): Use _Jv_word for cpool.
* java/lang/natClassLoader.cc (_Jv_InternClassStrings): Use _Jv_word.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Change comment.
From-SVN: r28641
1999-08-10 07:32:23 +02:00
|
|
|
[ --enable-multilib build many library versions (default)],
|
1999-04-07 16:42:40 +02:00
|
|
|
[case "${enableval}" in
|
|
|
|
yes) multilib=yes ;;
|
|
|
|
no) multilib=no ;;
|
|
|
|
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
|
|
|
|
esac], [multilib=yes])dnl
|
|
|
|
|
|
|
|
dnl We may get other options which we dont document:
|
|
|
|
dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
|
|
|
|
|
2001-07-04 00:31:43 +02:00
|
|
|
# When building with srcdir == objdir, links to the source files will
|
|
|
|
# be created in directories within the target_subdir. We have to
|
|
|
|
# adjust toplevel_srcdir accordingly, so that configure finds
|
|
|
|
# install-sh and other auxiliary files that live in the top-level
|
|
|
|
# source directory.
|
|
|
|
if test "${srcdir}" = "."; then
|
|
|
|
if test -z "${with_target_subdir}"; then
|
|
|
|
toprel=".."
|
1999-04-07 16:42:40 +02:00
|
|
|
else
|
2001-07-04 00:31:43 +02:00
|
|
|
if test "${with_target_subdir}" != "."; then
|
|
|
|
toprel="${with_multisrctop}../.."
|
|
|
|
else
|
|
|
|
toprel="${with_multisrctop}.."
|
|
|
|
fi
|
1999-04-07 16:42:40 +02:00
|
|
|
fi
|
|
|
|
else
|
2001-07-04 00:31:43 +02:00
|
|
|
toprel=".."
|
1999-04-07 16:42:40 +02:00
|
|
|
fi
|
2001-07-04 00:31:43 +02:00
|
|
|
|
|
|
|
libgcj_basedir=$srcdir/$toprel/$1/libjava
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_SUBST(libgcj_basedir)
|
2001-07-04 00:31:43 +02:00
|
|
|
|
|
|
|
AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
|
2001-06-08 20:02:03 +02:00
|
|
|
if :; then :; else
|
|
|
|
# This overrides the previous occurrence for automake, but not for
|
|
|
|
# autoconf, which is exactly what we want.
|
|
|
|
AC_CONFIG_AUX_DIR(..)
|
|
|
|
fi
|
1999-04-07 16:42:40 +02:00
|
|
|
|
2001-07-04 00:31:43 +02:00
|
|
|
# This works around an automake problem.
|
|
|
|
mkinstalldirs="`cd $ac_aux_dir && pwd`/mkinstalldirs"
|
|
|
|
AC_SUBST(mkinstalldirs)
|
|
|
|
|
2001-06-08 20:02:03 +02:00
|
|
|
AC_CANONICAL_SYSTEM
|
1999-04-07 16:42:40 +02:00
|
|
|
|
2000-09-10 11:26:50 +02:00
|
|
|
dnl This shouldn't be needed, as long as top-level dependencies are
|
|
|
|
dnl defined correctly and shared-library paths are set up so that
|
|
|
|
dnl execution tests succeed. FIXME.
|
|
|
|
define([AC_PROG_CC_WORKS],[])
|
|
|
|
define([AC_PROG_CXX_WORKS],[])
|
|
|
|
|
|
|
|
AC_PROG_CC
|
|
|
|
AC_PROG_CXX
|
|
|
|
|
1999-05-19 14:55:15 +02:00
|
|
|
dnl version is pulled out to make it a bit easier to change using sed.
|
|
|
|
version=0.0.7
|
1999-04-07 16:42:40 +02:00
|
|
|
dnl Still use "libjava" here to placate dejagnu.
|
1999-05-19 14:55:15 +02:00
|
|
|
AM_INIT_AUTOMAKE(libjava, $version)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
# AC_CHECK_TOOL does AC_REQUIRE (AC_CANONICAL_BUILD). If we dont
|
|
|
|
# run it explicitly here, it will be run implicitly before
|
|
|
|
# LIBGCJ_CONFIGURE, which doesn't work because that means that it will
|
|
|
|
# be run before AC_CANONICAL_HOST.
|
|
|
|
AC_CANONICAL_BUILD
|
|
|
|
|
|
|
|
AC_CHECK_TOOL(AS, as)
|
|
|
|
AC_CHECK_TOOL(AR, ar)
|
|
|
|
AC_CHECK_TOOL(RANLIB, ranlib, :)
|
|
|
|
|
|
|
|
AC_PROG_INSTALL
|
|
|
|
|
|
|
|
AM_MAINTAINER_MODE
|
|
|
|
|
|
|
|
# We need AC_EXEEXT to keep automake happy in cygnus mode. However,
|
|
|
|
# at least currently, we never actually build a program, so we never
|
|
|
|
# need to use $(EXEEXT). Moreover, the test for EXEEXT normally
|
|
|
|
# fails, because we are probably configuring with a cross compiler
|
|
|
|
# which cant create executables. So we include AC_EXEEXT to keep
|
|
|
|
# automake happy, but we dont execute it, since we dont care about
|
|
|
|
# the result.
|
|
|
|
if false; then
|
2001-06-09 22:31:23 +02:00
|
|
|
# autoconf 2.50 runs AC_EXEEXT by default, and the macro expands
|
|
|
|
# to nothing, so nothing would remain between `then' and `fi' if it
|
|
|
|
# were not for the `:' below.
|
|
|
|
:
|
1999-04-07 16:42:40 +02:00
|
|
|
AC_EXEEXT
|
|
|
|
fi
|
|
|
|
|
|
|
|
# configure.host sets the following important variables
|
|
|
|
# libgcj_cflags - host specific C compiler flags
|
|
|
|
# libgcj_cxxflags - host specific C++ compiler flags
|
|
|
|
# libgcj_javaflags - host specific Java compiler flags
|
|
|
|
|
|
|
|
libgcj_cflags=
|
|
|
|
libgcj_cxxflags=
|
|
|
|
libgcj_javaflags=
|
|
|
|
|
2001-06-13 18:48:29 +02:00
|
|
|
. [$]{srcdir}/configure.host
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
LIBGCJ_CFLAGS="[$]{libgcj_cflags}"
|
|
|
|
LIBGCJ_CXXFLAGS="[$]{libgcj_cxxflags}"
|
|
|
|
LIBGCJ_JAVAFLAGS="[$]{libgcj_javaflags}"
|
|
|
|
AC_SUBST(LIBGCJ_CFLAGS)
|
|
|
|
AC_SUBST(LIBGCJ_CXXFLAGS)
|
|
|
|
AC_SUBST(LIBGCJ_JAVAFLAGS)
|
|
|
|
])dnl
|
2000-09-10 10:12:11 +02:00
|
|
|
|
|
|
|
sinclude(../libtool.m4)
|
|
|
|
dnl The lines below arrange for aclocal not to bring libtool.m4
|
|
|
|
dnl AM_PROG_LIBTOOL into aclocal.m4, while still arranging for automake
|
|
|
|
dnl to add a definition of LIBTOOL to Makefile.in.
|
|
|
|
ifelse(yes,no,[
|
|
|
|
AC_DEFUN([AM_PROG_LIBTOOL],)
|
|
|
|
AC_DEFUN([AC_LIBTOOL_DLOPEN],)
|
|
|
|
AC_DEFUN([AC_LIBLTDL_CONVENIENCE],)
|
2000-09-13 21:01:20 +02:00
|
|
|
AC_DEFUN([LT_AC_PROG_GCJ],)
|
|
|
|
AC_SUBST(GCJ)
|
2000-09-10 10:12:11 +02:00
|
|
|
AC_SUBST(LIBTOOL)
|
|
|
|
])
|
2001-07-18 19:06:24 +02:00
|
|
|
|
|
|
|
#serial AM2
|
|
|
|
|
|
|
|
dnl From Bruno Haible.
|
|
|
|
|
|
|
|
AC_DEFUN([AM_ICONV],
|
|
|
|
[
|
|
|
|
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
|
|
|
|
dnl those with the standalone portable GNU libiconv installed).
|
|
|
|
|
|
|
|
AC_ARG_WITH([libiconv-prefix],
|
|
|
|
[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [
|
|
|
|
for dir in `echo "$withval" | tr : ' '`; do
|
|
|
|
if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
|
|
|
|
if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
|
|
|
|
done
|
|
|
|
])
|
|
|
|
|
|
|
|
AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
|
|
|
|
am_cv_func_iconv="no, consider installing GNU libiconv"
|
|
|
|
am_cv_lib_iconv=no
|
|
|
|
AC_TRY_LINK([#include <stdlib.h>
|
|
|
|
#include <iconv.h>],
|
|
|
|
[iconv_t cd = iconv_open("","");
|
|
|
|
iconv(cd,NULL,NULL,NULL,NULL);
|
|
|
|
iconv_close(cd);],
|
|
|
|
am_cv_func_iconv=yes)
|
|
|
|
if test "$am_cv_func_iconv" != yes; then
|
|
|
|
am_save_LIBS="$LIBS"
|
|
|
|
LIBS="$LIBS -liconv"
|
|
|
|
AC_TRY_LINK([#include <stdlib.h>
|
|
|
|
#include <iconv.h>],
|
|
|
|
[iconv_t cd = iconv_open("","");
|
|
|
|
iconv(cd,NULL,NULL,NULL,NULL);
|
|
|
|
iconv_close(cd);],
|
|
|
|
am_cv_lib_iconv=yes
|
|
|
|
am_cv_func_iconv=yes)
|
|
|
|
LIBS="$am_save_LIBS"
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
if test "$am_cv_func_iconv" = yes; then
|
|
|
|
AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
|
|
|
|
AC_MSG_CHECKING([for iconv declaration])
|
|
|
|
AC_CACHE_VAL(am_cv_proto_iconv, [
|
|
|
|
AC_TRY_COMPILE([
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <iconv.h>
|
|
|
|
extern
|
|
|
|
#ifdef __cplusplus
|
|
|
|
"C"
|
|
|
|
#endif
|
|
|
|
#if defined(__STDC__) || defined(__cplusplus)
|
|
|
|
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
|
|
|
|
#else
|
|
|
|
size_t iconv();
|
|
|
|
#endif
|
|
|
|
], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
|
|
|
|
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
|
|
|
|
am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
|
|
|
|
AC_MSG_RESULT([$]{ac_t:-
|
|
|
|
}[$]am_cv_proto_iconv)
|
|
|
|
AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
|
|
|
|
[Define as const if the declaration of iconv() needs const.])
|
|
|
|
fi
|
|
|
|
LIBICONV=
|
|
|
|
if test "$am_cv_lib_iconv" = yes; then
|
|
|
|
LIBICONV="-liconv"
|
|
|
|
fi
|
|
|
|
AC_SUBST(LIBICONV)
|
|
|
|
])
|