Skip to content

R
riscv-gcc-1
Commit aed6152d by Nathanael Nerode
Options

configure.in: Eliminate uses of changequote (mostly by quoting []). 

	* configure.in: Eliminate uses of changequote (mostly by quoting []).
	Replace most top level 'dnl' comments with '#' comments, conforming
	to new autoconf style.  Use AS_HELP_STRING throughout; improve a few
	help strings.
	* configure: Rebuilt.

From-SVN: r85540
parent b0e9ac08
Showing with 191 additions and 137 deletions
libjava/ChangeLog
2004-08-03 Nathanael Nerode <neroden@gcc.gnu.org>
* configure.in: Eliminate uses of changequote (mostly by quoting []).
Replace most top level 'dnl' comments with '#' comments, conforming
to new autoconf style. Use AS_HELP_STRING throughout; improve a few
help strings.
* configure: Rebuilt.
2004-07-17 Nathanael Nerode <neroden@gcc.gnu.org> 2004-07-17 Nathanael Nerode <neroden@gcc.gnu.org>
* acinclude.m4: Include no-executables.m4. * acinclude.m4: Include no-executables.m4.
......
libjava/configure
...@@ -848,8 +848,8 @@ Optional Features: ...@@ -848,8 +848,8 @@ Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-version-specific-runtime-libs --enable-version-specific-runtime-libs
specify that runtime libraries should be installed in a compiler-specific specify that runtime libraries should be installed
directory in a compiler-specific directory
--enable-multilib build many library versions (default) --enable-multilib build many library versions (default)
--enable-maintainer-mode enable make rules and dependencies not useful --enable-maintainer-mode enable make rules and dependencies not useful
(and sometimes confusing) to the casual installer (and sometimes confusing) to the casual installer
...@@ -862,27 +862,29 @@ Optional Features: ...@@ -862,27 +862,29 @@ Optional Features:
--enable-hash-synchronization --enable-hash-synchronization
use global hash table for monitor locks use global hash table for monitor locks
--enable-libgcj-multifile --enable-libgcj-multifile
allow compilation of several files at once allow compilation of several files at once
--enable-libgcj-debug enable runtime debugging code --enable-libgcj-debug enable runtime debugging code
--enable-interpreter enable interpreter --enable-interpreter enable interpreter
--enable-sjlj-exceptions force use of builtin_setjmp for exceptions --enable-sjlj-exceptions
force use of builtin_setjmp for exceptions
--disable-java-net disable java.net --disable-java-net disable java.net
--disable-jvmpi disable JVMPI support --disable-jvmpi disable JVMPI support
--enable-java-awt list of AWT peer implementations to be built --enable-java-awt list of AWT peer implementations to be built
--enable-gtk-cairo build the cairo Graphics2D implementation on GTK --enable-gtk-cairo build the cairo Graphics2D implementation on GTK
--enable-java-gc=TYPE choose garbage collector boehm --enable-java-gc=TYPE choose garbage collector (default is boehm)
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-target-subdir=SUBDIR --with-target-subdir=SUBDIR
configuring in a subdirectory configure in a subdirectory
--with-cross-host=HOST configuring with a cross compiler --with-cross-host=HOST configure with a cross compiler from HOST
--with-newlib Configuring with newlib --with-newlib configure with newlib
--with-gnu-ld assume the C compiler uses GNU ld default=no --with-gnu-ld assume the C compiler uses GNU ld default=no
--with-pic try to use only PIC/non-PIC objects default=use both --with-pic try to use only PIC/non-PIC objects default=use both
--with-win32-nlsapi=ansi, unicows or unicode --with-win32-nlsapi=ansi or unicows or unicode
native MinGW libgcj Win32 OS API ansi native MinGW libgcj Win32 OS API (default is ansi)
--without-libffi don't use libffi --without-libffi don't use libffi
--with-ecos enable runtime eCos target support --with-ecos enable runtime eCos target support
--with-system-zlib use installed libz --with-system-zlib use installed libz
...@@ -1340,6 +1342,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ...@@ -1340,6 +1342,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# We use these options to decide which functions to include.
# Check whether --with-target-subdir or --without-target-subdir was given. # Check whether --with-target-subdir or --without-target-subdir was given.
if test "${with_target_subdir+set}" = set; then if test "${with_target_subdir+set}" = set; then
...@@ -1347,6 +1350,8 @@ if test "${with_target_subdir+set}" = set; then ...@@ -1347,6 +1350,8 @@ if test "${with_target_subdir+set}" = set; then
fi; fi;
# We may get other options which we don't document:
# --with-target-subdir, --with-multisrctop, --with-multisubdir
# When building with srcdir == objdir, links to the source files will # When building with srcdir == objdir, links to the source files will
# be created in directories within the target_subdir. We have to # be created in directories within the target_subdir. We have to
...@@ -1576,6 +1581,7 @@ else ...@@ -1576,6 +1581,7 @@ else
fi; fi;
# Default to --enable-multilib
# Check whether --enable-multilib or --disable-multilib was given. # Check whether --enable-multilib or --disable-multilib was given.
if test "${enable_multilib+set}" = set; then if test "${enable_multilib+set}" = set; then
enableval="$enable_multilib" enableval="$enable_multilib"
...@@ -1589,6 +1595,7 @@ echo "$as_me: error: bad value ${enableval} for multilib option" >&2;} ...@@ -1589,6 +1595,7 @@ echo "$as_me: error: bad value ${enableval} for multilib option" >&2;}
else else
multilib=yes multilib=yes
fi; fi;
# It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
# (1) We use an abnormal CXX (without library references), so we # (1) We use an abnormal CXX (without library references), so we
...@@ -2921,7 +2928,9 @@ CXXFLAGS="$save_CXXFLAGS" ...@@ -2921,7 +2928,9 @@ CXXFLAGS="$save_CXXFLAGS"
# version is pulled out to make it a bit easier to change using sed.
version=0.0.7 version=0.0.7
# Still use "libjava" here to placate dejagnu.
# Find a good install program. We prefer a C program (faster), # Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or # so one script is as good as another. But avoid the broken or
# incompatible versions: # incompatible versions:
...@@ -4315,7 +4324,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" ...@@ -4315,7 +4324,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
case $host in case $host in
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 4318 "configure"' > conftest.$ac_ext echo '#line 4327 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
...@@ -4871,6 +4880,7 @@ else ...@@ -4871,6 +4880,7 @@ else
fi fi
# The -no-testsuite modules omit the test subdir.
if test -d $srcdir/testsuite; then if test -d $srcdir/testsuite; then
...@@ -4881,12 +4891,15 @@ else ...@@ -4881,12 +4891,15 @@ else
TESTSUBDIR_FALSE= TESTSUBDIR_FALSE=
fi fi
# Should the runtime set system properties by examining the
# environment variable GCJ_PROPERTIES?
# Check whether --enable-getenv-properties or --disable-getenv-properties was given. # Check whether --enable-getenv-properties or --disable-getenv-properties was given.
if test "${enable_getenv_properties+set}" = set; then if test "${enable_getenv_properties+set}" = set; then
enableval="$enable_getenv_properties" enableval="$enable_getenv_properties"
fi; fi;
# Whether GCJ_PROPERTIES is used depends on the target.
if test -z "$enable_getenv_properties"; then if test -z "$enable_getenv_properties"; then
enable_getenv_properties=${enable_getenv_properties_default-yes} enable_getenv_properties=${enable_getenv_properties_default-yes}
fi fi
...@@ -4898,6 +4911,7 @@ _ACEOF ...@@ -4898,6 +4911,7 @@ _ACEOF
fi fi
# Whether we should use arguments to main()
if test -z "$enable_main_args"; then if test -z "$enable_main_args"; then
enable_main_args=${enable_main_args_default-yes} enable_main_args=${enable_main_args_default-yes}
fi fi
...@@ -4910,6 +4924,9 @@ _ACEOF ...@@ -4910,6 +4924,9 @@ _ACEOF
fi fi
# Should we use hashtable-based synchronization?
# Currently works only for Linux X86/ia64
# Typically faster and more space-efficient
# Check whether --enable-hash-synchronization or --disable-hash-synchronization was given. # Check whether --enable-hash-synchronization or --disable-hash-synchronization was given.
if test "${enable_hash_synchronization+set}" = set; then if test "${enable_hash_synchronization+set}" = set; then
enableval="$enable_hash_synchronization" enableval="$enable_hash_synchronization"
...@@ -4949,8 +4966,7 @@ fi ...@@ -4949,8 +4966,7 @@ fi
# Check whether --with-win32-nlsapi or --without-win32-nlsapi was given. # Check whether --with-win32-nlsapi or --without-win32-nlsapi was given.
if test "${with_win32_nlsapi+set}" = set; then if test "${with_win32_nlsapi+set}" = set; then
withval="$with_win32_nlsapi" withval="$with_win32_nlsapi"
case "${withval}" in
case "${withval}" in
ansi) with_win32_nlsapi=ansi ;; ansi) with_win32_nlsapi=ansi ;;
unicows) with_win32_nlsapi=unicows ;; unicows) with_win32_nlsapi=unicows ;;
unicode) with_win32_nlsapi=unicode ;; unicode) with_win32_nlsapi=unicode ;;
...@@ -4972,6 +4988,8 @@ _ACEOF ...@@ -4972,6 +4988,8 @@ _ACEOF
;; ;;
esac esac
# configure.host sets slow_pthread_self if the synchronization code should
# try to avoid pthread_self calls by caching thread IDs in a hashtable.
if test "${slow_pthread_self}" = "yes"; then if test "${slow_pthread_self}" = "yes"; then
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
...@@ -4981,6 +4999,7 @@ _ACEOF ...@@ -4981,6 +4999,7 @@ _ACEOF
fi fi
# See if the user has requested runtime debugging.
LIBGCJDEBUG="false" LIBGCJDEBUG="false"
# Check whether --enable-libgcj-debug or --disable-libgcj-debug was given. # Check whether --enable-libgcj-debug or --disable-libgcj-debug was given.
...@@ -4996,6 +5015,7 @@ _ACEOF ...@@ -4996,6 +5015,7 @@ _ACEOF
fi fi
fi; fi;
# See if the user has the interpreter included.
# Check whether --enable-interpreter or --disable-interpreter was given. # Check whether --enable-interpreter or --disable-interpreter was given.
if test "${enable_interpreter+set}" = set; then if test "${enable_interpreter+set}" = set; then
enableval="$enable_interpreter" enableval="$enable_interpreter"
...@@ -5033,7 +5053,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then ...@@ -5033,7 +5053,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then
: :
else else
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 5036 "configure" #line 5056 "configure"
struct S { ~S(); }; struct S { ~S(); };
void bar(); void bar();
void foo() void foo()
...@@ -5089,12 +5109,15 @@ if test $can_unwind_signal = no && test $enable_sjlj_exceptions = no; then ...@@ -5089,12 +5109,15 @@ if test $can_unwind_signal = no && test $enable_sjlj_exceptions = no; then
EXCEPTIONSPEC= EXCEPTIONSPEC=
fi fi
# See if the user wants to disable java.net. This is the mildly
# ugly way that we admit that target-side configuration sucks.
# Check whether --enable-java-net or --disable-java-net was given. # Check whether --enable-java-net or --disable-java-net was given.
if test "${enable_java_net+set}" = set; then if test "${enable_java_net+set}" = set; then
enableval="$enable_java_net" enableval="$enable_java_net"
fi; fi;
# Whether java.net is built by default can depend on the target.
if test -z "$enable_java_net"; then if test -z "$enable_java_net"; then
enable_java_net=${enable_java_net_default-yes} enable_java_net=${enable_java_net_default-yes}
fi fi
...@@ -5106,11 +5129,14 @@ _ACEOF ...@@ -5106,11 +5129,14 @@ _ACEOF
fi fi
# See if the user wants to configure without libffi. Some
# architectures don't support it, and default values are set in
# configure.host.
# Check whether --with-libffi or --without-libffi was given. # Check whether --with-libffi or --without-libffi was given.
if test "${with_libffi+set}" = set; then if test "${with_libffi+set}" = set; then
withval="$with_libffi" withval="$with_libffi"
:
else else
with_libffi=${with_libffi_default-yes} with_libffi=${with_libffi_default-yes}
fi; fi;
...@@ -5129,6 +5155,7 @@ fi ...@@ -5129,6 +5155,7 @@ fi
# See if the user wants to disable JVMPI support.
# Check whether --enable-jvmpi or --disable-jvmpi was given. # Check whether --enable-jvmpi or --disable-jvmpi was given.
if test "${enable_jvmpi+set}" = set; then if test "${enable_jvmpi+set}" = set; then
enableval="$enable_jvmpi" enableval="$enable_jvmpi"
...@@ -5143,6 +5170,10 @@ _ACEOF ...@@ -5143,6 +5170,10 @@ _ACEOF
fi fi
# If the target is an eCos system, use the appropriate eCos
# I/O routines.
# FIXME: this should not be a local option but a global target
# system; at present there is no eCos target.
TARGET_ECOS=${PROCESS-"no"} TARGET_ECOS=${PROCESS-"no"}
# Check whether --with-ecos or --without-ecos was given. # Check whether --with-ecos or --without-ecos was given.
...@@ -5551,6 +5582,8 @@ rm -f conftest* ...@@ -5551,6 +5582,8 @@ rm -f conftest*
# These may not be defined in a non-ANS conformant embedded system.
# FIXME: Should these case a runtime exception in that case?
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
...@@ -5590,6 +5623,8 @@ fi ...@@ -5590,6 +5623,8 @@ fi
rm -f conftest* rm -f conftest*
# Create the subdirectory for natFile.cc, or the attempt
# to create the link will fail.
test -d java || mkdir java test -d java || mkdir java
test -d java/io || mkdir java/io test -d java/io || mkdir java/io
test -d gnu || mkdir gnu test -d gnu || mkdir gnu
...@@ -5603,6 +5638,7 @@ done ...@@ -5603,6 +5638,7 @@ done
ac_config_links="$ac_config_links $ac_config_links_2" ac_config_links="$ac_config_links $ac_config_links_2"
# Likewise for ConcreteProcess.java and natConcreteProcess.cc.
test -d java/lang || mkdir java/lang test -d java/lang || mkdir java/lang
ac_sources="java/lang/${PLATFORM}Process.java" ac_sources="java/lang/${PLATFORM}Process.java"
ac_dests="java/lang/ConcreteProcess.java" ac_dests="java/lang/ConcreteProcess.java"
...@@ -5623,6 +5659,7 @@ done ...@@ -5623,6 +5659,7 @@ done
ac_config_links="$ac_config_links $ac_config_links_4" ac_config_links="$ac_config_links $ac_config_links_4"
# Likewise for natInetAddress.cc and natNetworkInterface.cc.
test -d java/net || mkdir java/net test -d java/net || mkdir java/net
ac_sources="java/net/natInetAddress${PLATFORMNET}.cc" ac_sources="java/net/natInetAddress${PLATFORMNET}.cc"
ac_dests="java/net/natInetAddress.cc" ac_dests="java/net/natInetAddress.cc"
...@@ -5643,6 +5680,7 @@ done ...@@ -5643,6 +5680,7 @@ done
ac_config_links="$ac_config_links $ac_config_links_6" ac_config_links="$ac_config_links $ac_config_links_6"
# Likewise for natPlainSocketImpl.cc and natPlainDatagramSocketImpl.cc.
test -d gnu/java || mkdir gnu/java test -d gnu/java || mkdir gnu/java
test -d gnu/java/net || mkdir gnu/java/net test -d gnu/java/net || mkdir gnu/java/net
ac_sources="gnu/java/net/natPlainSocketImpl${PLATFORMNET}.cc" ac_sources="gnu/java/net/natPlainSocketImpl${PLATFORMNET}.cc"
...@@ -5664,6 +5702,7 @@ done ...@@ -5664,6 +5702,7 @@ done
ac_config_links="$ac_config_links $ac_config_links_8" ac_config_links="$ac_config_links $ac_config_links_8"
# Likewise for natPipeImpl.cc and natSelectorImpl.cc.
test -d gnu/java/nio || mkdir gnu/java/nio test -d gnu/java/nio || mkdir gnu/java/nio
ac_sources="gnu/java/nio/natPipeImpl${PLATFORM}.cc" ac_sources="gnu/java/nio/natPipeImpl${PLATFORM}.cc"
ac_dests="gnu/java/nio/natPipeImpl.cc" ac_dests="gnu/java/nio/natPipeImpl.cc"
...@@ -7182,6 +7221,7 @@ fi ...@@ -7182,6 +7221,7 @@ fi
fi fi
# Determine which AWT peer libraries to build
# Check whether --enable-java-awt or --disable-java-awt was given. # Check whether --enable-java-awt or --disable-java-awt was given.
if test "${enable_java_awt+set}" = set; then if test "${enable_java_awt+set}" = set; then
enableval="$enable_java_awt" enableval="$enable_java_awt"
...@@ -7250,6 +7290,7 @@ else ...@@ -7250,6 +7290,7 @@ else
GTK_AWT_FALSE= GTK_AWT_FALSE=
fi fi
# determine whether to enable the cairo GTK Graphics2D backend
# Check whether --enable-gtk-cairo or --disable-gtk-cairo was given. # Check whether --enable-gtk-cairo or --disable-gtk-cairo was given.
if test "${enable_gtk_cairo+set}" = set; then if test "${enable_gtk_cairo+set}" = set; then
enableval="$enable_gtk_cairo" enableval="$enable_gtk_cairo"
...@@ -7468,14 +7509,15 @@ fi ...@@ -7468,14 +7509,15 @@ fi
# FIXME: this should be _libs on some hosts.
libsubdir=.libs libsubdir=.libs
# Allow the GC to be disabled. Can be useful when debugging.
echo "$as_me:$LINENO: checking for garbage collector to use" >&5 echo "$as_me:$LINENO: checking for garbage collector to use" >&5
echo $ECHO_N "checking for garbage collector to use... $ECHO_C" >&6 echo $ECHO_N "checking for garbage collector to use... $ECHO_C" >&6
# Check whether --enable-java-gc or --disable-java-gc was given. # Check whether --enable-java-gc or --disable-java-gc was given.
if test "${enable_java_gc+set}" = set; then if test "${enable_java_gc+set}" = set; then
enableval="$enable_java_gc" enableval="$enable_java_gc"
GC=$enableval GC=$enableval
else else
GC=boehm GC=boehm
...@@ -7495,9 +7537,12 @@ echo "${ECHO_T}boehm" >&6 ...@@ -7495,9 +7537,12 @@ echo "${ECHO_T}boehm" >&6
JC1GCSPEC='-fuse-boehm-gc' JC1GCSPEC='-fuse-boehm-gc'
GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs" GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs"
GCINCS="`cat ../boehm-gc/boehm-cflags`" # We also want to pick up some cpp flags required when including
# boehm-config.h. Yuck.
GCINCS="`cat ../boehm-gc/boehm-cflags`"
GCOBJS=boehm.lo GCOBJS=boehm.lo
GCHDR=boehm-gc.h GCHDR=boehm-gc.h
# The POSIX thread support needs to know this.
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HAVE_BOEHM_GC 1 #define HAVE_BOEHM_GC 1
...@@ -7584,9 +7629,7 @@ case "$THREADS" in ...@@ -7584,9 +7629,7 @@ case "$THREADS" in
*-*-cygwin*) *-*-cygwin*)
# Don't set THREADLIBS here. Cygwin doesn't have -lpthread. # Don't set THREADLIBS here. Cygwin doesn't have -lpthread.
;; ;;
*-*-freebsd[1234]*) *-*-freebsd[1234]*)
# Before FreeBSD 5, it didn't have -lpthread (or any library which # Before FreeBSD 5, it didn't have -lpthread (or any library which
# merely adds pthread_* functions) but it does have a -pthread switch # merely adds pthread_* functions) but it does have a -pthread switch
# which is required at link-time to select -lc_r *instead* of -lc. # which is required at link-time to select -lc_r *instead* of -lc.
...@@ -7757,16 +7800,19 @@ cat >>confdefs.h <<\_ACEOF ...@@ -7757,16 +7800,19 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_USLEEP_DECL 1 #define HAVE_USLEEP_DECL 1
_ACEOF _ACEOF
# This is only for POSIX threads.
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HAVE_PTHREAD_MUTEXATTR_INIT 1 #define HAVE_PTHREAD_MUTEXATTR_INIT 1
_ACEOF _ACEOF
cat >>confdefs.h <<\_ACEOF # We also assume we are using gcc, which provides alloca.
cat >>confdefs.h <<\_ACEOF
#define HAVE_ALLOCA 1 #define HAVE_ALLOCA 1
_ACEOF _ACEOF
# Assume we do not have getuid and friends.
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define NO_GETUID 1 #define NO_GETUID 1
...@@ -12471,9 +12517,7 @@ fi ...@@ -12471,9 +12517,7 @@ fi
if test -z "${with_multisubdir}"; then if test -z "${with_multisubdir}"; then
builddotdot=. builddotdot=.
else else
builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'` builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`
fi fi
NATIVE=yes NATIVE=yes
...@@ -12828,9 +12872,7 @@ esac ...@@ -12828,9 +12872,7 @@ esac
# Determine gcj version number. # Determine gcj version number.
gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'` gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'`
GCJVERSION=$gcjversion GCJVERSION=$gcjversion
...@@ -12839,6 +12881,9 @@ cat >>confdefs.h <<_ACEOF ...@@ -12839,6 +12881,9 @@ cat >>confdefs.h <<_ACEOF
_ACEOF _ACEOF
# 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.
...@@ -13006,6 +13051,8 @@ fi ...@@ -13006,6 +13051,8 @@ fi
done done
# We avoid AC_HEADER_DIRENT since we really only care about dirent.h
# for now. If you change this, you also must update natFile.cc.
for ac_header in dirent.h for ac_header in dirent.h
do do
...@@ -16391,9 +16438,7 @@ h=`${PWDCMD-pwd}` ...@@ -16391,9 +16438,7 @@ h=`${PWDCMD-pwd}`
while read f; do while read f; do
echo "include $f" >> deps.mk echo "include $f" >> deps.mk
test -f $f || { test -f $f || {
d=`echo $f | sed -e 's,/[^/]*$,,'` d=`echo $f | sed -e 's,/[^/]*$,,'`
if test ! -d $d; then if test ! -d $d; then
$libgcj_basedir/../mkinstalldirs $d $libgcj_basedir/../mkinstalldirs $d
fi; fi;
......
libjava/configure.in
dnl Process this with autoconf to create configure dnl # Process this with autoconf to create configure
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_INIT(java/lang/System.java) AC_INIT(java/lang/System.java)
dnl We use these options to decide which functions to include. # We use these options to decide which functions to include.
AC_ARG_WITH(target-subdir, AC_ARG_WITH(target-subdir,
[ --with-target-subdir=SUBDIR AS_HELP_STRING([--with-target-subdir=SUBDIR],
configuring in a subdirectory]) [configure in a subdirectory]))
dnl We may get other options which we don't document: # We may get other options which we don't document:
dnl --with-target-subdir, --with-multisrctop, --with-multisubdir # --with-target-subdir, --with-multisrctop, --with-multisubdir
# When building with srcdir == objdir, links to the source files will # When building with srcdir == objdir, links to the source files will
# be created in directories within the target_subdir. We have to # be created in directories within the target_subdir. We have to
...@@ -58,15 +58,16 @@ mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" ...@@ -58,15 +58,16 @@ mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
AC_SUBST(mkinstalldirs) AC_SUBST(mkinstalldirs)
AC_ARG_WITH(cross-host, AC_ARG_WITH(cross-host,
[ --with-cross-host=HOST configuring with a cross compiler]) AS_HELP_STRING([--with-cross-host=HOST],
[configure with a cross compiler from HOST]))
AC_ARG_WITH(newlib, AC_ARG_WITH(newlib,
[ --with-newlib Configuring with newlib]) AS_HELP_STRING([--with-newlib],
[configure with newlib]))
AC_ARG_ENABLE(version-specific-runtime-libs, AC_ARG_ENABLE(version-specific-runtime-libs,
[ --enable-version-specific-runtime-libs AS_HELP_STRING([--enable-version-specific-runtime-libs],
specify that runtime libraries should be installed in a compiler-specific [specify that runtime libraries should be installed in a compiler-specific directory]),
directory ],
[case "$enableval" in [case "$enableval" in
yes) version_specific_libs=yes ;; yes) version_specific_libs=yes ;;
no) version_specific_libs=no ;; no) version_specific_libs=no ;;
...@@ -75,16 +76,17 @@ AC_ARG_ENABLE(version-specific-runtime-libs, ...@@ -75,16 +76,17 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
[version_specific_libs=no] [version_specific_libs=no]
) )
dnl Default to --enable-multilib # Default to --enable-multilib
AC_ARG_ENABLE(multilib, AC_ARG_ENABLE(multilib,
[ --enable-multilib build many library versions (default)], AS_HELP_STRING([--enable-multilib],
[build many library versions (default)]),
[case "${enableval}" in [case "${enableval}" in
yes) multilib=yes ;; yes) multilib=yes ;;
no) multilib=no ;; no) multilib=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;; *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
esac], [multilib=yes])dnl esac], [multilib=yes])dnl
dnl # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
GCC_NO_EXECUTABLES GCC_NO_EXECUTABLES
# (1) We use an abnormal CXX (without library references), so we # (1) We use an abnormal CXX (without library references), so we
...@@ -110,9 +112,9 @@ AC_SUBST(CFLAGS) ...@@ -110,9 +112,9 @@ AC_SUBST(CFLAGS)
AC_SUBST(CXXFLAGS) AC_SUBST(CXXFLAGS)
AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS)
dnl version is pulled out to make it a bit easier to change using sed. # version is pulled out to make it a bit easier to change using sed.
version=0.0.7 version=0.0.7
dnl Still use "libjava" here to placate dejagnu. # Still use "libjava" here to placate dejagnu.
AM_INIT_AUTOMAKE(libjava, $version) AM_INIT_AUTOMAKE(libjava, $version)
AC_CHECK_TOOL(AS, as) AC_CHECK_TOOL(AS, as)
...@@ -134,11 +136,11 @@ libgcj_cflags= ...@@ -134,11 +136,11 @@ libgcj_cflags=
libgcj_cxxflags= libgcj_cxxflags=
libgcj_javaflags= libgcj_javaflags=
. [$]{srcdir}/configure.host . ${srcdir}/configure.host
LIBGCJ_CFLAGS="[$]{libgcj_cflags}" LIBGCJ_CFLAGS="${libgcj_cflags}"
LIBGCJ_CXXFLAGS="[$]{libgcj_cxxflags}" LIBGCJ_CXXFLAGS="${libgcj_cxxflags}"
LIBGCJ_JAVAFLAGS="[$]{libgcj_javaflags}" LIBGCJ_JAVAFLAGS="${libgcj_javaflags}"
AC_SUBST(LIBGCJ_CFLAGS) AC_SUBST(LIBGCJ_CFLAGS)
AC_SUBST(LIBGCJ_CXXFLAGS) AC_SUBST(LIBGCJ_CXXFLAGS)
AC_SUBST(LIBGCJ_JAVAFLAGS) AC_SUBST(LIBGCJ_JAVAFLAGS)
...@@ -170,16 +172,16 @@ else ...@@ -170,16 +172,16 @@ else
fi fi
AC_SUBST(COMPPATH) AC_SUBST(COMPPATH)
dnl The -no-testsuite modules omit the test subdir. # The -no-testsuite modules omit the test subdir.
AM_CONDITIONAL(TESTSUBDIR, test -d $srcdir/testsuite) AM_CONDITIONAL(TESTSUBDIR, test -d $srcdir/testsuite)
dnl Should the runtime set system properties by examining the # Should the runtime set system properties by examining the
dnl environment variable GCJ_PROPERTIES? # environment variable GCJ_PROPERTIES?
AC_ARG_ENABLE(getenv-properties, AC_ARG_ENABLE(getenv-properties,
[ --disable-getenv-properties AS_HELP_STRING([--disable-getenv-properties],
don't set system properties from GCJ_PROPERTIES]) [don't set system properties from GCJ_PROPERTIES]))
dnl Whether GCJ_PROPERTIES is used depends on the target. # Whether GCJ_PROPERTIES is used depends on the target.
if test -z "$enable_getenv_properties"; then if test -z "$enable_getenv_properties"; then
enable_getenv_properties=${enable_getenv_properties_default-yes} enable_getenv_properties=${enable_getenv_properties_default-yes}
fi fi
...@@ -188,7 +190,7 @@ if test "$enable_getenv_properties" = no; then ...@@ -188,7 +190,7 @@ if test "$enable_getenv_properties" = no; then
[Define if system properties shouldn't be read from getenv("GCJ_PROPERTIES").]) [Define if system properties shouldn't be read from getenv("GCJ_PROPERTIES").])
fi fi
dnl Whether we should use arguments to main() # Whether we should use arguments to main()
if test -z "$enable_main_args"; then if test -z "$enable_main_args"; then
enable_main_args=${enable_main_args_default-yes} enable_main_args=${enable_main_args_default-yes}
fi fi
...@@ -197,12 +199,12 @@ if test "$enable_main_args" = no; then ...@@ -197,12 +199,12 @@ if test "$enable_main_args" = no; then
fi fi
dnl Should we use hashtable-based synchronization? # Should we use hashtable-based synchronization?
dnl Currently works only for Linux X86/ia64 # Currently works only for Linux X86/ia64
dnl Typically faster and more space-efficient # Typically faster and more space-efficient
AC_ARG_ENABLE(hash-synchronization, AC_ARG_ENABLE(hash-synchronization,
[ --enable-hash-synchronization AS_HELP_STRING([--enable-hash-synchronization],
use global hash table for monitor locks]) [use global hash table for monitor locks]))
if test -z "$enable_hash_synchronization"; then if test -z "$enable_hash_synchronization"; then
enable_hash_synchronization=$enable_hash_synchronization_default enable_hash_synchronization=$enable_hash_synchronization_default
...@@ -210,8 +212,8 @@ fi ...@@ -210,8 +212,8 @@ fi
# Do we allow intermodule optimizations (i.e. compiling many files at once)? # Do we allow intermodule optimizations (i.e. compiling many files at once)?
AC_ARG_ENABLE(libgcj-multifile, AC_ARG_ENABLE(libgcj-multifile,
[ --enable-libgcj-multifile AS_HELP_STRING([--enable-libgcj-multifile]
allow compilation of several files at once], [allow compilation of several files at once]),
[case "${enableval}" in [case "${enableval}" in
yes) enable_libgcj_multifile=yes ;; yes) enable_libgcj_multifile=yes ;;
no) enable_libgcj_multifile=no ;; no) enable_libgcj_multifile=no ;;
...@@ -221,10 +223,8 @@ AM_CONDITIONAL(ONESTEP, test "$enable_libgcj_multifile" = yes) ...@@ -221,10 +223,8 @@ AM_CONDITIONAL(ONESTEP, test "$enable_libgcj_multifile" = yes)
# What is the native OS API for MinGW? # What is the native OS API for MinGW?
AC_ARG_WITH(win32-nlsapi, AC_ARG_WITH(win32-nlsapi,
changequote(<<,>>)dnl AS_HELP_STRING([--with-win32-nlsapi=ansi or unicows or unicode],
<< --with-win32-nlsapi=ansi, unicows or unicode [native MinGW libgcj Win32 OS API (default is ansi)]),
native MinGW libgcj Win32 OS API [ansi]>>,
changequote([,])
[case "${withval}" in [case "${withval}" in
ansi) with_win32_nlsapi=ansi ;; ansi) with_win32_nlsapi=ansi ;;
unicows) with_win32_nlsapi=unicows ;; unicows) with_win32_nlsapi=unicows ;;
...@@ -239,33 +239,35 @@ case "${with_win32_nlsapi}" in ...@@ -239,33 +239,35 @@ case "${with_win32_nlsapi}" in
;; ;;
esac esac
dnl configure.host sets slow_pthread_self if the synchronization code should # configure.host sets slow_pthread_self if the synchronization code should
dnl try to avoid pthread_self calls by caching thread IDs in a hashtable. # try to avoid pthread_self calls by caching thread IDs in a hashtable.
if test "${slow_pthread_self}" = "yes"; then if test "${slow_pthread_self}" = "yes"; then
AC_DEFINE(SLOW_PTHREAD_SELF, 1, AC_DEFINE(SLOW_PTHREAD_SELF, 1,
[Define if if the synchronization code should try to avoid pthread_self calls by caching thread IDs in a hashtable.]) [Define if if the synchronization code should try to avoid pthread_self calls by caching thread IDs in a hashtable.])
fi fi
dnl See if the user has requested runtime debugging. # See if the user has requested runtime debugging.
LIBGCJDEBUG="false" LIBGCJDEBUG="false"
AC_SUBST(LIBGCJDEBUG) AC_SUBST(LIBGCJDEBUG)
AC_ARG_ENABLE(libgcj-debug, AC_ARG_ENABLE(libgcj-debug,
[ --enable-libgcj-debug enable runtime debugging code], AS_HELP_STRING([--enable-libgcj-debug],
if test "$enable_libgcj_debug" = yes; then [enable runtime debugging code]),
[if test "$enable_libgcj_debug" = yes; then
AC_DEFINE(DEBUG, 1, [Define this if you want runtime debugging enabled.]) AC_DEFINE(DEBUG, 1, [Define this if you want runtime debugging enabled.])
LIBGCJDEBUG="true" LIBGCJDEBUG="true"
fi) fi])
dnl See if the user has the interpreter included. # See if the user has the interpreter included.
AC_ARG_ENABLE(interpreter, AC_ARG_ENABLE(interpreter,
[ --enable-interpreter enable interpreter], AS_HELP_STRING([--enable-interpreter],
if test "$enable_interpreter" = yes; then [enable interpreter]),
[if test "$enable_interpreter" = yes; then
# This can also be set in configure.host. # This can also be set in configure.host.
libgcj_interpreter=yes libgcj_interpreter=yes
elif test "$enable_interpreter" = no; then elif test "$enable_interpreter" = no; then
libgcj_interpreter=no libgcj_interpreter=no
fi) fi])
if test "$libgcj_interpreter" = yes; then if test "$libgcj_interpreter" = yes; then
AC_DEFINE(INTERPRETER, 1, [Define if you want a bytecode interpreter.]) AC_DEFINE(INTERPRETER, 1, [Define if you want a bytecode interpreter.])
...@@ -277,7 +279,8 @@ AC_MSG_CHECKING([for exception model to use]) ...@@ -277,7 +279,8 @@ AC_MSG_CHECKING([for exception model to use])
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_ARG_ENABLE(sjlj-exceptions, AC_ARG_ENABLE(sjlj-exceptions,
[ --enable-sjlj-exceptions force use of builtin_setjmp for exceptions], AS_HELP_STRING([--enable-sjlj-exceptions],
[force use of builtin_setjmp for exceptions]),
[:], [:],
[dnl Botheration. Now we've got to detect the exception model. [dnl Botheration. Now we've got to detect the exception model.
dnl Link tests against libgcc.a are problematic since -- at least dnl Link tests against libgcc.a are problematic since -- at least
...@@ -327,12 +330,13 @@ if test $can_unwind_signal = no && test $enable_sjlj_exceptions = no; then ...@@ -327,12 +330,13 @@ if test $can_unwind_signal = no && test $enable_sjlj_exceptions = no; then
EXCEPTIONSPEC= EXCEPTIONSPEC=
fi fi
dnl See if the user wants to disable java.net. This is the mildly # See if the user wants to disable java.net. This is the mildly
dnl ugly way that we admit that target-side configuration sucks. # ugly way that we admit that target-side configuration sucks.
AC_ARG_ENABLE(java-net, AC_ARG_ENABLE(java-net,
[ --disable-java-net disable java.net]) AS_HELP_STRING([--disable-java-net],
[disable java.net]))
dnl Whether java.net is built by default can depend on the target. # Whether java.net is built by default can depend on the target.
if test -z "$enable_java_net"; then if test -z "$enable_java_net"; then
enable_java_net=${enable_java_net_default-yes} enable_java_net=${enable_java_net_default-yes}
fi fi
...@@ -340,11 +344,14 @@ if test "$enable_java_net" = no; then ...@@ -340,11 +344,14 @@ if test "$enable_java_net" = no; then
AC_DEFINE(DISABLE_JAVA_NET, 1, [Define if java.net native functions should be stubbed out.]) AC_DEFINE(DISABLE_JAVA_NET, 1, [Define if java.net native functions should be stubbed out.])
fi fi
dnl See if the user wants to configure without libffi. Some # See if the user wants to configure without libffi. Some
dnl architectures don't support it, and default values are set in # architectures don't support it, and default values are set in
dnl configure.host. # configure.host.
AC_ARG_WITH(libffi, AC_ARG_WITH(libffi,
[ --without-libffi don't use libffi],,with_libffi=${with_libffi_default-yes}) AS_HELP_STRING([--without-libffi],
[don't use libffi]),
[:],
[with_libffi=${with_libffi_default-yes}])
LIBFFI= LIBFFI=
LIBFFIINCS= LIBFFIINCS=
...@@ -356,18 +363,19 @@ fi ...@@ -356,18 +363,19 @@ fi
AC_SUBST(LIBFFI) AC_SUBST(LIBFFI)
AC_SUBST(LIBFFIINCS) AC_SUBST(LIBFFIINCS)
dnl See if the user wants to disable JVMPI support. # See if the user wants to disable JVMPI support.
AC_ARG_ENABLE(jvmpi, AC_ARG_ENABLE(jvmpi,
[ --disable-jvmpi disable JVMPI support]) AS_HELP_STRING([--disable-jvmpi],
[disable JVMPI support]))
if test "$enable_jvmpi" != no; then if test "$enable_jvmpi" != no; then
AC_DEFINE(ENABLE_JVMPI, 1, [Define if you are using JVMPI.]) AC_DEFINE(ENABLE_JVMPI, 1, [Define if you are using JVMPI.])
fi fi
dnl If the target is an eCos system, use the appropriate eCos # If the target is an eCos system, use the appropriate eCos
dnl I/O routines. # I/O routines.
dnl FIXME: this should not be a local option but a global target # FIXME: this should not be a local option but a global target
dnl system; at present there is no eCos target. # system; at present there is no eCos target.
TARGET_ECOS=${PROCESS-"no"} TARGET_ECOS=${PROCESS-"no"}
AC_ARG_WITH(ecos, AC_ARG_WITH(ecos,
[ --with-ecos enable runtime eCos target support], [ --with-ecos enable runtime eCos target support],
...@@ -416,37 +424,37 @@ AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, ...@@ -416,37 +424,37 @@ AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1,
[Define if you have u_int32_t])) [Define if you have u_int32_t]))
dnl These may not be defined in a non-ANS conformant embedded system. # These may not be defined in a non-ANS conformant embedded system.
dnl FIXME: Should these case a runtime exception in that case? # FIXME: Should these case a runtime exception in that case?
AC_EGREP_HEADER(mktime, time.h, AC_DEFINE(HAVE_MKTIME, 1, AC_EGREP_HEADER(mktime, time.h, AC_DEFINE(HAVE_MKTIME, 1,
[Define is you have 'mktime' in <time.h>])) [Define is you have 'mktime' in <time.h>]))
AC_EGREP_HEADER(localtime, time.h, AC_DEFINE(HAVE_LOCALTIME, 1, AC_EGREP_HEADER(localtime, time.h, AC_DEFINE(HAVE_LOCALTIME, 1,
[Define is you have 'localtime' in <time.h>])) [Define is you have 'localtime' in <time.h>]))
dnl Create the subdirectory for natFile.cc, or the attempt # Create the subdirectory for natFile.cc, or the attempt
dnl to create the link will fail. # to create the link will fail.
test -d java || mkdir java test -d java || mkdir java
test -d java/io || mkdir java/io test -d java/io || mkdir java/io
test -d gnu || mkdir gnu test -d gnu || mkdir gnu
AC_LINK_FILES(java/io/natFile${FILE-${PLATFORM}}.cc, java/io/natFile.cc) AC_LINK_FILES(java/io/natFile${FILE-${PLATFORM}}.cc, java/io/natFile.cc)
dnl Likewise for ConcreteProcess.java and natConcreteProcess.cc. # Likewise for ConcreteProcess.java and natConcreteProcess.cc.
test -d java/lang || mkdir java/lang test -d java/lang || mkdir java/lang
AC_LINK_FILES(java/lang/${PLATFORM}Process.java, java/lang/ConcreteProcess.java) AC_LINK_FILES(java/lang/${PLATFORM}Process.java, java/lang/ConcreteProcess.java)
AC_LINK_FILES(java/lang/nat${PLATFORM}Process.cc, java/lang/natConcreteProcess.cc) AC_LINK_FILES(java/lang/nat${PLATFORM}Process.cc, java/lang/natConcreteProcess.cc)
dnl Likewise for natInetAddress.cc and natNetworkInterface.cc. # Likewise for natInetAddress.cc and natNetworkInterface.cc.
test -d java/net || mkdir java/net test -d java/net || mkdir java/net
AC_LINK_FILES(java/net/natInetAddress${PLATFORMNET}.cc, java/net/natInetAddress.cc) AC_LINK_FILES(java/net/natInetAddress${PLATFORMNET}.cc, java/net/natInetAddress.cc)
AC_LINK_FILES(java/net/natNetworkInterface${PLATFORMNET}.cc, java/net/natNetworkInterface.cc) AC_LINK_FILES(java/net/natNetworkInterface${PLATFORMNET}.cc, java/net/natNetworkInterface.cc)
dnl Likewise for natPlainSocketImpl.cc and natPlainDatagramSocketImpl.cc. # Likewise for natPlainSocketImpl.cc and natPlainDatagramSocketImpl.cc.
test -d gnu/java || mkdir gnu/java test -d gnu/java || mkdir gnu/java
test -d gnu/java/net || mkdir gnu/java/net test -d gnu/java/net || mkdir gnu/java/net
AC_LINK_FILES(gnu/java/net/natPlainSocketImpl${PLATFORMNET}.cc, gnu/java/net/natPlainSocketImpl.cc) AC_LINK_FILES(gnu/java/net/natPlainSocketImpl${PLATFORMNET}.cc, gnu/java/net/natPlainSocketImpl.cc)
AC_LINK_FILES(gnu/java/net/natPlainDatagramSocketImpl${PLATFORMNET}.cc, gnu/java/net/natPlainDatagramSocketImpl.cc) AC_LINK_FILES(gnu/java/net/natPlainDatagramSocketImpl${PLATFORMNET}.cc, gnu/java/net/natPlainDatagramSocketImpl.cc)
dnl Likewise for natPipeImpl.cc and natSelectorImpl.cc. # Likewise for natPipeImpl.cc and natSelectorImpl.cc.
test -d gnu/java/nio || mkdir gnu/java/nio test -d gnu/java/nio || mkdir gnu/java/nio
AC_LINK_FILES(gnu/java/nio/natPipeImpl${PLATFORM}.cc, gnu/java/nio/natPipeImpl.cc) AC_LINK_FILES(gnu/java/nio/natPipeImpl${PLATFORM}.cc, gnu/java/nio/natPipeImpl.cc)
AC_LINK_FILES(gnu/java/nio/natSelectorImpl${PLATFORM}.cc, gnu/java/nio/natSelectorImpl.cc) AC_LINK_FILES(gnu/java/nio/natSelectorImpl${PLATFORM}.cc, gnu/java/nio/natSelectorImpl.cc)
...@@ -470,7 +478,8 @@ LIBGCJTESTSPEC="-L`${PWDCMD-pwd}`/.libs -rpath `${PWDCMD-pwd}`/.libs" ...@@ -470,7 +478,8 @@ LIBGCJTESTSPEC="-L`${PWDCMD-pwd}`/.libs -rpath `${PWDCMD-pwd}`/.libs"
AC_SUBST(LIBGCJTESTSPEC) AC_SUBST(LIBGCJTESTSPEC)
AC_ARG_WITH(system-zlib, AC_ARG_WITH(system-zlib,
[ --with-system-zlib use installed libz]) AS_HELP_STRING([--with-system-zlib],
[use installed libz]))
ZLIBSPEC= ZLIBSPEC=
AC_SUBST(ZLIBSPEC) AC_SUBST(ZLIBSPEC)
ZLIBTESTSPEC= ZLIBTESTSPEC=
...@@ -478,9 +487,10 @@ AC_SUBST(ZLIBTESTSPEC) ...@@ -478,9 +487,10 @@ AC_SUBST(ZLIBTESTSPEC)
AC_PATH_XTRA AC_PATH_XTRA
dnl Determine which AWT peer libraries to build # Determine which AWT peer libraries to build
AC_ARG_ENABLE(java-awt, AC_ARG_ENABLE(java-awt,
[ --enable-java-awt list of AWT peer implementations to be built]) AS_HELP_STRING([--enable-java-awt],
[list of AWT peer implementations to be built]))
peerlibs="`echo ${enable_java_awt} | tr ',' ' '`" peerlibs="`echo ${enable_java_awt} | tr ',' ' '`"
use_xlib_awt="" use_xlib_awt=""
...@@ -528,8 +538,10 @@ done ...@@ -528,8 +538,10 @@ done
AM_CONDITIONAL(XLIB_AWT, test "$use_xlib_awt" = yes) AM_CONDITIONAL(XLIB_AWT, test "$use_xlib_awt" = yes)
AM_CONDITIONAL(GTK_AWT, test "$use_gtk_awt" = yes) AM_CONDITIONAL(GTK_AWT, test "$use_gtk_awt" = yes)
dnl determine whether to enable the cairo GTK Graphics2D backend # determine whether to enable the cairo GTK Graphics2D backend
AC_ARG_ENABLE(gtk-cairo, [ --enable-gtk-cairo build the cairo Graphics2D implementation on GTK]) AC_ARG_ENABLE(gtk-cairo,
AS_HELP_STRING([--enable-gtk-cairo],
[build the cairo Graphics2D implementation on GTK]))
AM_CONDITIONAL(GTK_CAIRO, test "x${enable_gtk_cairo}" = xyes) AM_CONDITIONAL(GTK_CAIRO, test "x${enable_gtk_cairo}" = xyes)
if test "x${enable_gtk_cairo}" = xyes if test "x${enable_gtk_cairo}" = xyes
then then
...@@ -541,17 +553,16 @@ AC_SUBST(CAIRO_CFLAGS) ...@@ -541,17 +553,16 @@ AC_SUBST(CAIRO_CFLAGS)
AC_SUBST(PANGOFT2_LIBS) AC_SUBST(PANGOFT2_LIBS)
AC_SUBST(PANGOFT2_CFLAGS) AC_SUBST(PANGOFT2_CFLAGS)
dnl FIXME: this should be _libs on some hosts. # FIXME: this should be _libs on some hosts.
libsubdir=.libs libsubdir=.libs
dnl Allow the GC to be disabled. Can be useful when debugging. # Allow the GC to be disabled. Can be useful when debugging.
AC_MSG_CHECKING([for garbage collector to use]) AC_MSG_CHECKING([for garbage collector to use])
AC_ARG_ENABLE(java-gc, AC_ARG_ENABLE(java-gc,
changequote(<<,>>)dnl AS_HELP_STRING([--enable-java-gc=TYPE],
<< --enable-java-gc=TYPE choose garbage collector [boehm]>>, [choose garbage collector (default is boehm)]),
changequote([,]) [GC=$enableval],
GC=$enableval, [GC=boehm])
GC=boehm)
GCLIBS= GCLIBS=
GCINCS= GCINCS=
GCDEPS= GCDEPS=
...@@ -566,12 +577,12 @@ case "$GC" in ...@@ -566,12 +577,12 @@ case "$GC" in
JC1GCSPEC='-fuse-boehm-gc' JC1GCSPEC='-fuse-boehm-gc'
GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs" GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs"
dnl We also want to pick up some cpp flags required when including # We also want to pick up some cpp flags required when including
dnl boehm-config.h. Yuck. # boehm-config.h. Yuck.
GCINCS="`cat ../boehm-gc/boehm-cflags`" GCINCS="`cat ../boehm-gc/boehm-cflags`"
GCOBJS=boehm.lo GCOBJS=boehm.lo
GCHDR=boehm-gc.h GCHDR=boehm-gc.h
dnl The POSIX thread support needs to know this. # The POSIX thread support needs to know this.
AC_DEFINE(HAVE_BOEHM_GC, 1, [Define if Boehm GC in use.]) AC_DEFINE(HAVE_BOEHM_GC, 1, [Define if Boehm GC in use.])
;; ;;
no) no)
...@@ -633,9 +644,7 @@ case "$THREADS" in ...@@ -633,9 +644,7 @@ case "$THREADS" in
*-*-cygwin*) *-*-cygwin*)
# Don't set THREADLIBS here. Cygwin doesn't have -lpthread. # Don't set THREADLIBS here. Cygwin doesn't have -lpthread.
;; ;;
changequote(<<,>>) *-*-freebsd[[1234]]*)
*-*-freebsd[1234]*)
changequote([,])
# Before FreeBSD 5, it didn't have -lpthread (or any library which # Before FreeBSD 5, it didn't have -lpthread (or any library which
# merely adds pthread_* functions) but it does have a -pthread switch # merely adds pthread_* functions) but it does have a -pthread switch
# which is required at link-time to select -lc_r *instead* of -lc. # which is required at link-time to select -lc_r *instead* of -lc.
...@@ -717,12 +726,10 @@ AM_CONDITIONAL(USING_GCC, test "$GCC" = yes) ...@@ -717,12 +726,10 @@ AM_CONDITIONAL(USING_GCC, test "$GCC" = yes)
GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc' GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc'
# Figure out where generated headers like libgcj-config.h get installed. # Figure out where generated headers like libgcj-config.h get installed.
changequote(,)dnl
gcc_version_trigger=${libgcj_basedir}/../gcc/version.c gcc_version_trigger=${libgcj_basedir}/../gcc/version.c
gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'` gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([[^\"]]*\)\".*/\1/'`
gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` gcc_version=`echo ${gcc_version_full} | sed -e 's/\([[^ ]]*\) .*/\1/'`
tool_include_dir='$(libdir)/gcc/$(target_noncanonical)/'${gcc_version}/include tool_include_dir='$(libdir)/gcc/$(target_noncanonical)/'${gcc_version}/include
changequote([,])dnl
AC_SUBST(tool_include_dir) AC_SUBST(tool_include_dir)
AC_SUBST(gcc_version) AC_SUBST(gcc_version)
...@@ -740,12 +747,12 @@ if test "x${with_newlib}" = "xyes"; then ...@@ -740,12 +747,12 @@ if test "x${with_newlib}" = "xyes"; then
AC_DEFINE(HAVE_GMTIME_R, 1, [Define if you have the 'gmtime_r' function]) AC_DEFINE(HAVE_GMTIME_R, 1, [Define if you have the 'gmtime_r' function])
AC_DEFINE(HAVE_LOCALTIME_R, 1, [Define if you have the 'localtime_r' function.]) AC_DEFINE(HAVE_LOCALTIME_R, 1, [Define if you have the 'localtime_r' function.])
AC_DEFINE(HAVE_USLEEP_DECL, 1, [Define if usleep is declared in <unistd.h>.]) AC_DEFINE(HAVE_USLEEP_DECL, 1, [Define if usleep is declared in <unistd.h>.])
dnl This is only for POSIX threads. # This is only for POSIX threads.
AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT, 1, [Define if using POSIX threads that have the mutexattr functions.]) AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT, 1, [Define if using POSIX threads that have the mutexattr functions.])
dnl We also assume we are using gcc, which provides alloca. # We also assume we are using gcc, which provides alloca.
AC_DEFINE(HAVE_ALLOCA) AC_DEFINE(HAVE_ALLOCA)
dnl Assume we do not have getuid and friends. # Assume we do not have getuid and friends.
AC_DEFINE(NO_GETUID, 1, [Define if getuid() and friends are missing.]) AC_DEFINE(NO_GETUID, 1, [Define if getuid() and friends are missing.])
PLATFORMNET=NoNet PLATFORMNET=NoNet
else else
...@@ -1017,9 +1024,7 @@ fi ...@@ -1017,9 +1024,7 @@ fi
if test -z "${with_multisubdir}"; then if test -z "${with_multisubdir}"; then
builddotdot=. builddotdot=.
else else
changequote(<<,>>) builddotdot=`echo ${with_multisubdir} | sed -e 's:[[^/]][[^/]]*:..:g'`
builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`
changequote([,])
fi fi
NATIVE=yes NATIVE=yes
...@@ -1180,19 +1185,17 @@ AC_SUBST(toolexecmainlibdir) ...@@ -1180,19 +1185,17 @@ AC_SUBST(toolexecmainlibdir)
AC_SUBST(toolexeclibdir) AC_SUBST(toolexeclibdir)
# Determine gcj version number. # Determine gcj version number.
changequote(<<,>>) gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([[^ ]]*\).*$/\1/p'`
gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'`
changequote([,])
GCJVERSION=$gcjversion GCJVERSION=$gcjversion
AC_SUBST(GCJVERSION) AC_SUBST(GCJVERSION)
AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID]) AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID])
dnl We check for sys/filio.h because Solaris 2.5 defines FIONREAD there. # We check for sys/filio.h because Solaris 2.5 defines FIONREAD there.
dnl On that system, sys/ioctl.h will not include sys/filio.h unless # On that system, sys/ioctl.h will not include sys/filio.h unless
dnl BSD_COMP is defined; just including sys/filio.h is simpler. # BSD_COMP is defined; just including sys/filio.h is simpler.
AC_CHECK_HEADERS(unistd.h bstring.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sys/stat.h sys/select.h sys/socket.h netinet/in.h arpa/inet.h netdb.h net/if.h pwd.h sys/config.h stdint.h langinfo.h locale.h) AC_CHECK_HEADERS(unistd.h bstring.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sys/stat.h sys/select.h sys/socket.h netinet/in.h arpa/inet.h netdb.h net/if.h pwd.h sys/config.h stdint.h langinfo.h locale.h)
dnl We avoid AC_HEADER_DIRENT since we really only care about dirent.h # We avoid AC_HEADER_DIRENT since we really only care about dirent.h
dnl for now. If you change this, you also must update natFile.cc. # for now. If you change this, you also must update natFile.cc.
AC_CHECK_HEADERS(dirent.h) AC_CHECK_HEADERS(dirent.h)
AC_CHECK_HEADERS(inttypes.h, [ AC_CHECK_HEADERS(inttypes.h, [
AC_DEFINE(HAVE_INTTYPES_H, 1, [Define if <inttypes.h> is available]) AC_DEFINE(HAVE_INTTYPES_H, 1, [Define if <inttypes.h> is available])
...@@ -1383,9 +1386,7 @@ h=`${PWDCMD-pwd}` ...@@ -1383,9 +1386,7 @@ h=`${PWDCMD-pwd}`
while read f; do while read f; do
echo "include $f" >> deps.mk echo "include $f" >> deps.mk
test -f $f || { test -f $f || {
changequote(<<,>>) d=`echo $f | sed -e 's,/[[^/]]*$,,'`
d=`echo $f | sed -e 's,/[^/]*$,,'`
changequote([,])
if test ! -d $d; then if test ! -d $d; then
$libgcj_basedir/../mkinstalldirs $d $libgcj_basedir/../mkinstalldirs $d
fi; fi;
......
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