Skip to content

R
riscv-gcc-1
Commit 4c86f325 by Nathanael Nerode
Options

Makefile.am: Set ZIP and GCJH directly using autoconf. 

	* Makefile.am: Set ZIP and GCJH directly using autoconf.
	* Makefile.in, include/Makefile.in, testsuite/Makefile.in,
	gcj/Makefile.in: Regenerate.
	* configure.in: Set ZIP and GCJH.  Remove redundant condition
	in AM_CONDITIONAL(NATIVE,...)
	* configure: Regenerate.

From-SVN: r84832
parent 7740f00d
Showing with 143 additions and 127 deletions
libjava/ChangeLog
2004-07-16 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.am: Set ZIP and GCJH directly using autoconf.
* Makefile.in, include/Makefile.in, testsuite/Makefile.in,
gcj/Makefile.in: Regenerate.
* configure.in: Set ZIP and GCJH. Remove redundant condition
in AM_CONDITIONAL(NATIVE,...)
* configure: Regenerate.
2004-07-15 Nathanael Nerode <neroden@gcc.gnu.org> 2004-07-15 Nathanael Nerode <neroden@gcc.gnu.org>
* configure.in: Use target_noncanonical rather than * configure.in: Use target_noncanonical rather than
......
libjava/Makefile.am
...@@ -71,22 +71,8 @@ bin_SCRIPTS = addr2name.awk ...@@ -71,22 +71,8 @@ bin_SCRIPTS = addr2name.awk
## Compilers and compilation flags. ## Compilers and compilation flags.
## ##
## CANADIAN is a misnomer. Really we check to see if we must pick up GCJH = @GCJH@
## the tools from the path. ZIP = @ZIP@
if CANADIAN
if NULL_TARGET
## In this case, gcj is found outside the build tree. However, zip is
## found in the build tree.
ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
GCJH = gcjh
else
ZIP = jar
GCJH = $(target_noncanonical)-gcjh
endif
else # CANADIAN
GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh
ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
endif # CANADIAN
## The compiler with whatever flags we want for both -c and -C ## The compiler with whatever flags we want for both -c and -C
## compiles. ## compiles.
......
libjava/Makefile.in
...@@ -196,12 +196,9 @@ propdir = $(libdir) ...@@ -196,12 +196,9 @@ propdir = $(libdir)
@NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij rmic rmiregistry @NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij rmic rmiregistry
bin_SCRIPTS = addr2name.awk bin_SCRIPTS = addr2name.awk
@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@jar GCJH = @GCJH@
@CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar ZIP = @ZIP@
@CANADIAN_TRUE@@NULL_TARGET_TRUE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_TRUE@gcjh
@CANADIAN_TRUE@@NULL_TARGET_FALSE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_FALSE@$(target_noncanonical)-gcjh
@CANADIAN_FALSE@GCJH = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
...@@ -3075,7 +3072,7 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ...@@ -3075,7 +3072,7 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
DATA = $(jar_DATA) $(pkgconfig_DATA) $(toolexecmainlib_DATA) DATA = $(jar_DATA) $(pkgconfig_DATA) $(toolexecmainlib_DATA)
DIST_COMMON = README COPYING ChangeLog Makefile.am Makefile.in NEWS \ DIST_COMMON = README COPYING ChangeLog Makefile.am Makefile.in NEWS \
THANKS acinclude.m4 aclocal.m4 configure configure.in \ THANKS TODO acinclude.m4 aclocal.m4 configure configure.in \
libgcj-test.spec.in libgcj.pc.in libgcj.spec.in libgcj-test.spec.in libgcj.pc.in libgcj.spec.in
......
libjava/configure
...@@ -7188,7 +7188,7 @@ case "${which_gcj}" in ...@@ -7188,7 +7188,7 @@ case "${which_gcj}" in
GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/" GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
;; ;;
cross) cross)
# See the comment in Makefile.am about CANADIAN being a misnomer # See the comment below about CANADIAN being a misnomer
CANADIAN=yes CANADIAN=yes
NULL_TARGET=no NULL_TARGET=no
if test "x${with_newlib}" = "xyes"; then if test "x${with_newlib}" = "xyes"; then
...@@ -7200,13 +7200,33 @@ case "${which_gcj}" in ...@@ -7200,13 +7200,33 @@ case "${which_gcj}" in
fi fi
;; ;;
path) path)
# See the comment in Makefile.am about CANADIAN being a misnomer # See the comment below about CANADIAN being a misnomer
CANADIAN=yes CANADIAN=yes
NULL_TARGET=yes NULL_TARGET=yes
GCJ="gcj -B`${PWDCMD-pwd}`/" GCJ="gcj -B`${PWDCMD-pwd}`/"
;; ;;
esac esac
## CANADIAN is a misnomer. Really we check to see if we must pick up
## the tools from the path.
if test $CANADIAN = yes ; then
if test $NULL_TARGET = yes ; then
## In this case, gcj is found outside the build tree. However, zip is
## found in the build tree.
ZIP = '$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar'
GCJH = gcjh
else
ZIP = jar
GCJH = '$(target_noncanonical)-gcjh'
fi
else # CANADIAN
GCJH = '$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh'
ZIP = '$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar'
fi # CANADIAN
# Create it, so that compile/link tests don't fail # Create it, so that compile/link tests don't fail
test -f libgcj.spec || touch libgcj.spec test -f libgcj.spec || touch libgcj.spec
...@@ -7235,7 +7255,7 @@ fi ...@@ -7235,7 +7255,7 @@ fi
# Extract the first word of "${ac_tool_prefix}gcj", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}gcj", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcj; ac_word=$2 set dummy ${ac_tool_prefix}gcj; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:7239: checking for $ac_word" >&5 echo "configure:7259: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_GCJ'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_GCJ'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -7267,7 +7287,7 @@ if test -n "$ac_tool_prefix"; then ...@@ -7267,7 +7287,7 @@ if test -n "$ac_tool_prefix"; then
# Extract the first word of "gcj", so it can be a program name with args. # Extract the first word of "gcj", so it can be a program name with args.
set dummy gcj; ac_word=$2 set dummy gcj; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:7271: checking for $ac_word" >&5 echo "configure:7291: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_GCJ'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_GCJ'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -7329,13 +7349,13 @@ exec 5>>./config.log ...@@ -7329,13 +7349,13 @@ exec 5>>./config.log
CPPFLAGS=$GCJ_SAVE_CPPFLAGS CPPFLAGS=$GCJ_SAVE_CPPFLAGS
echo $ac_n "checking size of void *""... $ac_c" 1>&6 echo $ac_n "checking size of void *""... $ac_c" 1>&6
echo "configure:7333: checking size of void *" >&5 echo "configure:7353: checking size of void *" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7339 "configure" #line 7359 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
...@@ -7345,7 +7365,7 @@ int main() { ...@@ -7345,7 +7365,7 @@ int main() {
switch (0) case 0: case (sizeof (void *) == $ac_size):; switch (0) case 0: case (sizeof (void *) == $ac_size):;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:7369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_sizeof_void_p=$ac_size ac_cv_sizeof_void_p=$ac_size
else else
...@@ -7390,25 +7410,7 @@ fi ...@@ -7390,25 +7410,7 @@ fi
if test "$CANADIAN" = yes; then if test "$NATIVE" = yes; then
CANADIAN_TRUE=
CANADIAN_FALSE='#'
else
CANADIAN_TRUE='#'
CANADIAN_FALSE=
fi
if test "$NULL_TARGET" = yes; then
NULL_TARGET_TRUE=
NULL_TARGET_FALSE='#'
else
NULL_TARGET_TRUE='#'
NULL_TARGET_FALSE=
fi
if test "$NATIVE" = yes || test "$NULL_TARGET" = yes; then
NATIVE_TRUE= NATIVE_TRUE=
NATIVE_FALSE='#' NATIVE_FALSE='#'
else else
...@@ -7474,17 +7476,17 @@ for ac_hdr in unistd.h bstring.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/ ...@@ -7474,17 +7476,17 @@ for ac_hdr in unistd.h bstring.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:7478: checking for $ac_hdr" >&5 echo "configure:7480: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7483 "configure" #line 7485 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:7488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:7490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -7514,17 +7516,17 @@ for ac_hdr in dirent.h ...@@ -7514,17 +7516,17 @@ for ac_hdr in dirent.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:7518: checking for $ac_hdr" >&5 echo "configure:7520: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7523 "configure" #line 7525 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:7528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:7530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -7554,17 +7556,17 @@ for ac_hdr in inttypes.h ...@@ -7554,17 +7556,17 @@ for ac_hdr in inttypes.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:7558: checking for $ac_hdr" >&5 echo "configure:7560: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7563 "configure" #line 7565 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:7568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:7570: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -7600,12 +7602,12 @@ fi ...@@ -7600,12 +7602,12 @@ fi
done done
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
echo "configure:7604: checking for sys/wait.h that is POSIX.1 compatible" >&5 echo "configure:7606: checking for sys/wait.h that is POSIX.1 compatible" >&5
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7609 "configure" #line 7611 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
...@@ -7621,7 +7623,7 @@ wait (&s); ...@@ -7621,7 +7623,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:7627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_header_sys_wait_h=yes ac_cv_header_sys_wait_h=yes
else else
...@@ -7643,12 +7645,12 @@ fi ...@@ -7643,12 +7645,12 @@ fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
echo "configure:7647: checking for ANSI C header files" >&5 echo "configure:7649: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7652 "configure" #line 7654 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
...@@ -7656,7 +7658,7 @@ else ...@@ -7656,7 +7658,7 @@ else
#include <float.h> #include <float.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:7660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:7662: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -7673,7 +7675,7 @@ rm -f conftest* ...@@ -7673,7 +7675,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI. # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7677 "configure" #line 7679 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <string.h> #include <string.h>
EOF EOF
...@@ -7691,7 +7693,7 @@ fi ...@@ -7691,7 +7693,7 @@ fi
if test $ac_cv_header_stdc = yes; then if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7695 "configure" #line 7697 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
EOF EOF
...@@ -7712,7 +7714,7 @@ if test "$cross_compiling" = yes; then ...@@ -7712,7 +7714,7 @@ if test "$cross_compiling" = yes; then
: :
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7716 "configure" #line 7718 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
...@@ -7723,7 +7725,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); ...@@ -7723,7 +7725,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); } exit (0); }
EOF EOF
if { (eval echo configure:7727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:7729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
: :
else else
...@@ -7747,12 +7749,12 @@ EOF ...@@ -7747,12 +7749,12 @@ EOF
fi fi
echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
echo "configure:7751: checking for ssize_t" >&5 echo "configure:7753: checking for ssize_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7756 "configure" #line 7758 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#if STDC_HEADERS #if STDC_HEADERS
...@@ -7781,9 +7783,9 @@ fi ...@@ -7781,9 +7783,9 @@ fi
echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6 echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6
echo "configure:7785: checking for in_addr_t" >&5 echo "configure:7787: checking for in_addr_t" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7787 "configure" #line 7789 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#if STDC_HEADERS #if STDC_HEADERS
...@@ -7797,7 +7799,7 @@ int main() { ...@@ -7797,7 +7799,7 @@ int main() {
in_addr_t foo; in_addr_t foo;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:7803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_IN_ADDR_T 1 #define HAVE_IN_ADDR_T 1
...@@ -7813,16 +7815,16 @@ fi ...@@ -7813,16 +7815,16 @@ fi
rm -f conftest* rm -f conftest*
echo $ac_n "checking whether struct ip_mreq is in netinet/in.h""... $ac_c" 1>&6 echo $ac_n "checking whether struct ip_mreq is in netinet/in.h""... $ac_c" 1>&6
echo "configure:7817: checking whether struct ip_mreq is in netinet/in.h" >&5 echo "configure:7819: checking whether struct ip_mreq is in netinet/in.h" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7819 "configure" #line 7821 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <netinet/in.h> #include <netinet/in.h>
int main() { int main() {
struct ip_mreq mreq; struct ip_mreq mreq;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:7828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_STRUCT_IP_MREQ 1 #define HAVE_STRUCT_IP_MREQ 1
...@@ -7838,16 +7840,16 @@ fi ...@@ -7838,16 +7840,16 @@ fi
rm -f conftest* rm -f conftest*
echo $ac_n "checking whether struct ipv6_mreq is in netinet/in.h""... $ac_c" 1>&6 echo $ac_n "checking whether struct ipv6_mreq is in netinet/in.h""... $ac_c" 1>&6
echo "configure:7842: checking whether struct ipv6_mreq is in netinet/in.h" >&5 echo "configure:7844: checking whether struct ipv6_mreq is in netinet/in.h" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7844 "configure" #line 7846 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <netinet/in.h> #include <netinet/in.h>
int main() { int main() {
struct ipv6_mreq mreq6; struct ipv6_mreq mreq6;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:7853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_STRUCT_IPV6_MREQ 1 #define HAVE_STRUCT_IPV6_MREQ 1
...@@ -7863,16 +7865,16 @@ fi ...@@ -7863,16 +7865,16 @@ fi
rm -f conftest* rm -f conftest*
echo $ac_n "checking whether struct sockaddr_in6 is in netinet/in.h""... $ac_c" 1>&6 echo $ac_n "checking whether struct sockaddr_in6 is in netinet/in.h""... $ac_c" 1>&6
echo "configure:7867: checking whether struct sockaddr_in6 is in netinet/in.h" >&5 echo "configure:7869: checking whether struct sockaddr_in6 is in netinet/in.h" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7869 "configure" #line 7871 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <netinet/in.h> #include <netinet/in.h>
int main() { int main() {
struct sockaddr_in6 addr6; struct sockaddr_in6 addr6;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:7878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_INET6 1 #define HAVE_INET6 1
...@@ -7888,9 +7890,9 @@ fi ...@@ -7888,9 +7890,9 @@ fi
rm -f conftest* rm -f conftest*
echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6 echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
echo "configure:7892: checking for socklen_t in sys/socket.h" >&5 echo "configure:7894: checking for socklen_t in sys/socket.h" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7894 "configure" #line 7896 "configure"
#include "confdefs.h" #include "confdefs.h"
#define _POSIX_PII_SOCKET #define _POSIX_PII_SOCKET
#include <sys/types.h> #include <sys/types.h>
...@@ -7899,7 +7901,7 @@ int main() { ...@@ -7899,7 +7901,7 @@ int main() {
socklen_t x = 5; socklen_t x = 5;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:7905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_SOCKLEN_T 1 #define HAVE_SOCKLEN_T 1
...@@ -7915,16 +7917,16 @@ fi ...@@ -7915,16 +7917,16 @@ fi
rm -f conftest* rm -f conftest*
echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
echo "configure:7919: checking for tm_gmtoff in struct tm" >&5 echo "configure:7921: checking for tm_gmtoff in struct tm" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7921 "configure" #line 7923 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <time.h> #include <time.h>
int main() { int main() {
struct tm tim; tim.tm_gmtoff = 0; struct tm tim; tim.tm_gmtoff = 0;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:7930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define STRUCT_TM_HAS_GMTOFF 1 #define STRUCT_TM_HAS_GMTOFF 1
...@@ -7937,16 +7939,16 @@ else ...@@ -7937,16 +7939,16 @@ else
rm -rf conftest* rm -rf conftest*
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6 echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6
echo "configure:7941: checking for global timezone variable" >&5 echo "configure:7943: checking for global timezone variable" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7943 "configure" #line 7945 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <time.h> #include <time.h>
int main() { int main() {
void i(){long z2 = 2*timezone;} void i(){long z2 = 2*timezone;}
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:7952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_TIMEZONE 1 #define HAVE_TIMEZONE 1
...@@ -7959,16 +7961,16 @@ else ...@@ -7959,16 +7961,16 @@ else
rm -rf conftest* rm -rf conftest*
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for global _timezone variable""... $ac_c" 1>&6 echo $ac_n "checking for global _timezone variable""... $ac_c" 1>&6
echo "configure:7963: checking for global _timezone variable" >&5 echo "configure:7965: checking for global _timezone variable" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7965 "configure" #line 7967 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <time.h> #include <time.h>
int main() { int main() {
long z2 = _timezone; long z2 = _timezone;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:7972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:7974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define HAVE_UNDERSCORE_TIMEZONE 1 #define HAVE_UNDERSCORE_TIMEZONE 1
...@@ -7990,19 +7992,19 @@ rm -f conftest* ...@@ -7990,19 +7992,19 @@ rm -f conftest*
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless! # for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
echo "configure:7994: checking for working alloca.h" >&5 echo "configure:7996: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 7999 "configure" #line 8001 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <alloca.h> #include <alloca.h>
int main() { int main() {
char *p = alloca(2 * sizeof(int)); char *p = alloca(2 * sizeof(int));
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:8006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:8008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_cv_header_alloca_h=yes ac_cv_header_alloca_h=yes
else else
...@@ -8023,12 +8025,12 @@ EOF ...@@ -8023,12 +8025,12 @@ EOF
fi fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6 echo $ac_n "checking for alloca""... $ac_c" 1>&6
echo "configure:8027: checking for alloca" >&5 echo "configure:8029: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8032 "configure" #line 8034 "configure"
#include "confdefs.h" #include "confdefs.h"
#ifdef __GNUC__ #ifdef __GNUC__
...@@ -8056,7 +8058,7 @@ int main() { ...@@ -8056,7 +8058,7 @@ int main() {
char *p = (char *) alloca(1); char *p = (char *) alloca(1);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:8060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:8062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_cv_func_alloca_works=yes ac_cv_func_alloca_works=yes
else else
...@@ -8088,12 +8090,12 @@ EOF ...@@ -8088,12 +8090,12 @@ EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
echo "configure:8092: checking whether alloca needs Cray hooks" >&5 echo "configure:8094: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8097 "configure" #line 8099 "configure"
#include "confdefs.h" #include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2) #if defined(CRAY) && ! defined(CRAY2)
webecray webecray
...@@ -8118,12 +8120,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 ...@@ -8118,12 +8120,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
if test $ac_cv_os_cray = yes; then if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:8122: checking for $ac_func" >&5 echo "configure:8124: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8127 "configure" #line 8129 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -8146,7 +8148,7 @@ $ac_func(); ...@@ -8146,7 +8148,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:8150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:8152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -8173,7 +8175,7 @@ done ...@@ -8173,7 +8175,7 @@ done
fi fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
echo "configure:8177: checking stack direction for C alloca" >&5 echo "configure:8179: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -8181,7 +8183,7 @@ else ...@@ -8181,7 +8183,7 @@ else
ac_cv_c_stack_direction=0 ac_cv_c_stack_direction=0
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8185 "configure" #line 8187 "configure"
#include "confdefs.h" #include "confdefs.h"
find_stack_direction () find_stack_direction ()
{ {
...@@ -8200,7 +8202,7 @@ main () ...@@ -8200,7 +8202,7 @@ main ()
exit (find_stack_direction() < 0); exit (find_stack_direction() < 0);
} }
EOF EOF
if { (eval echo configure:8204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:8206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_c_stack_direction=1 ac_cv_c_stack_direction=1
else else
...@@ -8225,17 +8227,17 @@ for ac_hdr in unistd.h ...@@ -8225,17 +8227,17 @@ for ac_hdr in unistd.h
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:8229: checking for $ac_hdr" >&5 echo "configure:8231: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8234 "configure" #line 8236 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:8239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:8241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -8264,12 +8266,12 @@ done ...@@ -8264,12 +8266,12 @@ done
for ac_func in getpagesize for ac_func in getpagesize
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:8268: checking for $ac_func" >&5 echo "configure:8270: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8273 "configure" #line 8275 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -8292,7 +8294,7 @@ $ac_func(); ...@@ -8292,7 +8294,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:8296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:8298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -8317,7 +8319,7 @@ fi ...@@ -8317,7 +8319,7 @@ fi
done done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
echo "configure:8321: checking for working mmap" >&5 echo "configure:8323: checking for working mmap" >&5
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -8325,7 +8327,7 @@ else ...@@ -8325,7 +8327,7 @@ else
ac_cv_func_mmap_fixed_mapped=no ac_cv_func_mmap_fixed_mapped=no
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 8329 "configure" #line 8331 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test. /* Thanks to Mike Haertel and Jim Avera for this test.
...@@ -8465,7 +8467,7 @@ main() ...@@ -8465,7 +8467,7 @@ main()
} }
EOF EOF
if { (eval echo configure:8469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:8471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_mmap_fixed_mapped=yes
else else
...@@ -8493,7 +8495,7 @@ do ...@@ -8493,7 +8495,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:8497: checking for $ac_word" >&5 echo "configure:8499: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -8855,6 +8857,8 @@ s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g ...@@ -8855,6 +8857,8 @@ s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g
s%@GLIB_LIBS@%$GLIB_LIBS%g s%@GLIB_LIBS@%$GLIB_LIBS%g
s%@LIBART_CFLAGS@%$LIBART_CFLAGS%g s%@LIBART_CFLAGS@%$LIBART_CFLAGS%g
s%@LIBART_LIBS@%$LIBART_LIBS%g s%@LIBART_LIBS@%$LIBART_LIBS%g
s%@GCJH@%$GCJH%g
s%@ZIP@%$ZIP%g
s%@GCJ@%$GCJ%g s%@GCJ@%$GCJ%g
s%@GCJFLAGS@%$GCJFLAGS%g s%@GCJFLAGS@%$GCJFLAGS%g
s%@ZLIBS@%$ZLIBS%g s%@ZLIBS@%$ZLIBS%g
...@@ -8864,10 +8868,6 @@ s%@DIVIDESPEC@%$DIVIDESPEC%g ...@@ -8864,10 +8868,6 @@ s%@DIVIDESPEC@%$DIVIDESPEC%g
s%@CHECKREFSPEC@%$CHECKREFSPEC%g s%@CHECKREFSPEC@%$CHECKREFSPEC%g
s%@EXCEPTIONSPEC@%$EXCEPTIONSPEC%g s%@EXCEPTIONSPEC@%$EXCEPTIONSPEC%g
s%@IEEESPEC@%$IEEESPEC%g s%@IEEESPEC@%$IEEESPEC%g
s%@CANADIAN_TRUE@%$CANADIAN_TRUE%g
s%@CANADIAN_FALSE@%$CANADIAN_FALSE%g
s%@NULL_TARGET_TRUE@%$NULL_TARGET_TRUE%g
s%@NULL_TARGET_FALSE@%$NULL_TARGET_FALSE%g
s%@NATIVE_TRUE@%$NATIVE_TRUE%g s%@NATIVE_TRUE@%$NATIVE_TRUE%g
s%@NATIVE_FALSE@%$NATIVE_FALSE%g s%@NATIVE_FALSE@%$NATIVE_FALSE%g
s%@NEEDS_DATA_START_TRUE@%$NEEDS_DATA_START_TRUE%g s%@NEEDS_DATA_START_TRUE@%$NEEDS_DATA_START_TRUE%g
......
libjava/configure.in
...@@ -1093,7 +1093,7 @@ case "${which_gcj}" in ...@@ -1093,7 +1093,7 @@ case "${which_gcj}" in
GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/" GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
;; ;;
cross) cross)
# See the comment in Makefile.am about CANADIAN being a misnomer # See the comment below about CANADIAN being a misnomer
CANADIAN=yes CANADIAN=yes
NULL_TARGET=no NULL_TARGET=no
if test "x${with_newlib}" = "xyes"; then if test "x${with_newlib}" = "xyes"; then
...@@ -1105,13 +1105,33 @@ case "${which_gcj}" in ...@@ -1105,13 +1105,33 @@ case "${which_gcj}" in
fi fi
;; ;;
path) path)
# See the comment in Makefile.am about CANADIAN being a misnomer # See the comment below about CANADIAN being a misnomer
CANADIAN=yes CANADIAN=yes
NULL_TARGET=yes NULL_TARGET=yes
GCJ="gcj -B`${PWDCMD-pwd}`/" GCJ="gcj -B`${PWDCMD-pwd}`/"
;; ;;
esac esac
## CANADIAN is a misnomer. Really we check to see if we must pick up
## the tools from the path.
if test $CANADIAN = yes ; then
if test $NULL_TARGET = yes ; then
## In this case, gcj is found outside the build tree. However, zip is
## found in the build tree.
ZIP = '$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar'
GCJH = gcjh
else
ZIP = jar
GCJH = '$(target_noncanonical)-gcjh'
fi
else # CANADIAN
GCJH = '$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh'
ZIP = '$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar'
fi # CANADIAN
AC_SUBST(GCJH)
AC_SUBST(ZIP)
# Create it, so that compile/link tests don't fail # Create it, so that compile/link tests don't fail
test -f libgcj.spec || touch libgcj.spec test -f libgcj.spec || touch libgcj.spec
...@@ -1163,9 +1183,7 @@ AC_SUBST(CHECKREFSPEC) ...@@ -1163,9 +1183,7 @@ AC_SUBST(CHECKREFSPEC)
AC_SUBST(EXCEPTIONSPEC) AC_SUBST(EXCEPTIONSPEC)
AC_SUBST(IEEESPEC) AC_SUBST(IEEESPEC)
AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes) AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes)
AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes)
AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes || test "$NULL_TARGET" = yes)
AM_CONDITIONAL(NEEDS_DATA_START, test "$NEEDS_DATA_START" = yes && test "$NATIVE" = yes) AM_CONDITIONAL(NEEDS_DATA_START, test "$NEEDS_DATA_START" = yes && test "$NATIVE" = yes)
AC_SUBST(GCC_UNWIND_INCLUDE) AC_SUBST(GCC_UNWIND_INCLUDE)
......
libjava/gcj/Makefile.in
...@@ -85,6 +85,7 @@ GCDEPS = @GCDEPS@ ...@@ -85,6 +85,7 @@ GCDEPS = @GCDEPS@
GCINCS = @GCINCS@ GCINCS = @GCINCS@
GCJ = @GCJ@ GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@ GCJFLAGS = @GCJFLAGS@
GCJH = @GCJH@
GCJVERSION = @GCJVERSION@ GCJVERSION = @GCJVERSION@
GCLIBS = @GCLIBS@ GCLIBS = @GCLIBS@
GCOBJS = @GCOBJS@ GCOBJS = @GCOBJS@
...@@ -139,6 +140,7 @@ THREADSPEC = @THREADSPEC@ ...@@ -139,6 +140,7 @@ THREADSPEC = @THREADSPEC@
TOOLKIT = @TOOLKIT@ TOOLKIT = @TOOLKIT@
VERSION = @VERSION@ VERSION = @VERSION@
ZINCS = @ZINCS@ ZINCS = @ZINCS@
ZIP = @ZIP@
ZLIBS = @ZLIBS@ ZLIBS = @ZLIBS@
ZLIBSPEC = @ZLIBSPEC@ ZLIBSPEC = @ZLIBSPEC@
ZLIBTESTSPEC = @ZLIBTESTSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@
......
libjava/include/Makefile.in
...@@ -85,6 +85,7 @@ GCDEPS = @GCDEPS@ ...@@ -85,6 +85,7 @@ GCDEPS = @GCDEPS@
GCINCS = @GCINCS@ GCINCS = @GCINCS@
GCJ = @GCJ@ GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@ GCJFLAGS = @GCJFLAGS@
GCJH = @GCJH@
GCJVERSION = @GCJVERSION@ GCJVERSION = @GCJVERSION@
GCLIBS = @GCLIBS@ GCLIBS = @GCLIBS@
GCOBJS = @GCOBJS@ GCOBJS = @GCOBJS@
...@@ -139,6 +140,7 @@ THREADSPEC = @THREADSPEC@ ...@@ -139,6 +140,7 @@ THREADSPEC = @THREADSPEC@
TOOLKIT = @TOOLKIT@ TOOLKIT = @TOOLKIT@
VERSION = @VERSION@ VERSION = @VERSION@
ZINCS = @ZINCS@ ZINCS = @ZINCS@
ZIP = @ZIP@
ZLIBS = @ZLIBS@ ZLIBS = @ZLIBS@
ZLIBSPEC = @ZLIBSPEC@ ZLIBSPEC = @ZLIBSPEC@
ZLIBTESTSPEC = @ZLIBTESTSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@
......
libjava/testsuite/Makefile.in
...@@ -85,6 +85,7 @@ GCDEPS = @GCDEPS@ ...@@ -85,6 +85,7 @@ GCDEPS = @GCDEPS@
GCINCS = @GCINCS@ GCINCS = @GCINCS@
GCJ = @GCJ@ GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@ GCJFLAGS = @GCJFLAGS@
GCJH = @GCJH@
GCJVERSION = @GCJVERSION@ GCJVERSION = @GCJVERSION@
GCLIBS = @GCLIBS@ GCLIBS = @GCLIBS@
GCOBJS = @GCOBJS@ GCOBJS = @GCOBJS@
...@@ -139,6 +140,7 @@ THREADSPEC = @THREADSPEC@ ...@@ -139,6 +140,7 @@ THREADSPEC = @THREADSPEC@
TOOLKIT = @TOOLKIT@ TOOLKIT = @TOOLKIT@
VERSION = @VERSION@ VERSION = @VERSION@
ZINCS = @ZINCS@ ZINCS = @ZINCS@
ZIP = @ZIP@
ZLIBS = @ZLIBS@ ZLIBS = @ZLIBS@
ZLIBSPEC = @ZLIBSPEC@ ZLIBSPEC = @ZLIBSPEC@
ZLIBTESTSPEC = @ZLIBTESTSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@
......
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