From 4c86f32571913801c3e876d2621ef74adce3fdbc Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Fri, 16 Jul 2004 21:04:58 +0000 Subject: [PATCH] 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 --- libjava/ChangeLog | 9 ++ libjava/Makefile.am | 18 +--- libjava/Makefile.in | 11 +- libjava/configure | 198 +++++++++++++++++----------------- libjava/configure.in | 28 ++++- libjava/gcj/Makefile.in | 2 + libjava/include/Makefile.in | 2 + libjava/testsuite/Makefile.in | 2 + 8 files changed, 143 insertions(+), 127 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d6e06aa2059..b3b070b9cef 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2004-07-16 Nathanael Nerode + + * 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 * configure.in: Use target_noncanonical rather than diff --git a/libjava/Makefile.am b/libjava/Makefile.am index ef3a7bbc4c8..a7e79b4748e 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -71,22 +71,8 @@ bin_SCRIPTS = addr2name.awk ## Compilers and compilation flags. ## -## CANADIAN is a misnomer. Really we check to see if we must pick up -## the tools from the path. -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 +GCJH = @GCJH@ +ZIP = @ZIP@ ## The compiler with whatever flags we want for both -c and -C ## compiles. diff --git a/libjava/Makefile.in b/libjava/Makefile.in index a835fbd3879..0505da13e34 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -196,12 +196,9 @@ propdir = $(libdir) @NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij rmic rmiregistry 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 -@CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar -@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 + +GCJH = @GCJH@ +ZIP = @ZIP@ GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated @@ -3075,7 +3072,7 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DATA = $(jar_DATA) $(pkgconfig_DATA) $(toolexecmainlib_DATA) 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 diff --git a/libjava/configure b/libjava/configure index 8fd9b65f7f6..f51143d359c 100755 --- a/libjava/configure +++ b/libjava/configure @@ -7188,7 +7188,7 @@ case "${which_gcj}" in GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/" ;; cross) - # See the comment in Makefile.am about CANADIAN being a misnomer + # See the comment below about CANADIAN being a misnomer CANADIAN=yes NULL_TARGET=no if test "x${with_newlib}" = "xyes"; then @@ -7200,13 +7200,33 @@ case "${which_gcj}" in fi ;; path) - # See the comment in Makefile.am about CANADIAN being a misnomer + # See the comment below about CANADIAN being a misnomer CANADIAN=yes NULL_TARGET=yes GCJ="gcj -B`${PWDCMD-pwd}`/" ;; 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 test -f libgcj.spec || touch libgcj.spec @@ -7235,7 +7255,7 @@ fi # 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 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 echo $ac_n "(cached) $ac_c" 1>&6 else @@ -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. set dummy gcj; ac_word=$2 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 echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7329,13 +7349,13 @@ exec 5>>./config.log CPPFLAGS=$GCJ_SAVE_CPPFLAGS 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 echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -7345,7 +7365,7 @@ int main() { switch (0) case 0: case (sizeof (void *) == $ac_size):; ; return 0; } 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* ac_cv_sizeof_void_p=$ac_size else @@ -7390,25 +7410,7 @@ fi -if test "$CANADIAN" = 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 +if test "$NATIVE" = yes; then NATIVE_TRUE= NATIVE_FALSE='#' 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/ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 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 echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF 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}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7514,17 +7516,17 @@ for ac_hdr in dirent.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 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 echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF 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}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7554,17 +7556,17 @@ for ac_hdr in inttypes.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 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 echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF 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}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7600,12 +7602,12 @@ fi done 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 echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7621,7 +7623,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } 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* ac_cv_header_sys_wait_h=yes else @@ -7643,12 +7645,12 @@ fi 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 echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7656,7 +7658,7 @@ else #include EOF 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}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7673,7 +7675,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -7691,7 +7693,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -7712,7 +7714,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -7723,7 +7725,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } 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 : else @@ -7747,12 +7749,12 @@ EOF fi 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 echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -7781,9 +7783,9 @@ fi 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 < #if STDC_HEADERS @@ -7797,7 +7799,7 @@ int main() { in_addr_t foo; ; return 0; } 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* cat >> confdefs.h <<\EOF #define HAVE_IN_ADDR_T 1 @@ -7813,16 +7815,16 @@ fi rm -f conftest* 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 < int main() { struct ip_mreq mreq; ; return 0; } 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* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_IP_MREQ 1 @@ -7838,16 +7840,16 @@ fi rm -f conftest* 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 < int main() { struct ipv6_mreq mreq6; ; return 0; } 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* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_IPV6_MREQ 1 @@ -7863,16 +7865,16 @@ fi rm -f conftest* 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 < int main() { struct sockaddr_in6 addr6; ; return 0; } 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* cat >> confdefs.h <<\EOF #define HAVE_INET6 1 @@ -7888,9 +7890,9 @@ fi rm -f conftest* 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 < @@ -7899,7 +7901,7 @@ int main() { socklen_t x = 5; ; return 0; } 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* cat >> confdefs.h <<\EOF #define HAVE_SOCKLEN_T 1 @@ -7915,16 +7917,16 @@ fi rm -f conftest* 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 < int main() { struct tm tim; tim.tm_gmtoff = 0; ; return 0; } 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* cat >> confdefs.h <<\EOF #define STRUCT_TM_HAS_GMTOFF 1 @@ -7937,16 +7939,16 @@ else rm -rf conftest* echo "$ac_t""no" 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 < int main() { void i(){long z2 = 2*timezone;} ; return 0; } 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* cat >> confdefs.h <<\EOF #define HAVE_TIMEZONE 1 @@ -7959,16 +7961,16 @@ else rm -rf conftest* echo "$ac_t""no" 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 < int main() { long z2 = _timezone; ; return 0; } 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* cat >> confdefs.h <<\EOF #define HAVE_UNDERSCORE_TIMEZONE 1 @@ -7990,19 +7992,19 @@ rm -f conftest* # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! 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 echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } 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* ac_cv_header_alloca_h=yes else @@ -8023,12 +8025,12 @@ EOF fi 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 echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&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* ac_cv_func_alloca_works=yes else @@ -8088,12 +8090,12 @@ EOF 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 echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do 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 echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&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* eval "ac_cv_func_$ac_func=yes" else @@ -8173,7 +8175,7 @@ done fi 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 echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8181,7 +8183,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&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 ac_cv_c_stack_direction=1 else @@ -8225,17 +8227,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 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 echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF 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}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8264,12 +8266,12 @@ done for ac_func in getpagesize do 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 echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&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* eval "ac_cv_func_$ac_func=yes" else @@ -8317,7 +8319,7 @@ fi done 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 echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8325,7 +8327,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&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 ac_cv_func_mmap_fixed_mapped=yes else @@ -8493,7 +8495,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 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 echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8855,6 +8857,8 @@ s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g s%@GLIB_LIBS@%$GLIB_LIBS%g s%@LIBART_CFLAGS@%$LIBART_CFLAGS%g s%@LIBART_LIBS@%$LIBART_LIBS%g +s%@GCJH@%$GCJH%g +s%@ZIP@%$ZIP%g s%@GCJ@%$GCJ%g s%@GCJFLAGS@%$GCJFLAGS%g s%@ZLIBS@%$ZLIBS%g @@ -8864,10 +8868,6 @@ s%@DIVIDESPEC@%$DIVIDESPEC%g s%@CHECKREFSPEC@%$CHECKREFSPEC%g s%@EXCEPTIONSPEC@%$EXCEPTIONSPEC%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_FALSE@%$NATIVE_FALSE%g s%@NEEDS_DATA_START_TRUE@%$NEEDS_DATA_START_TRUE%g diff --git a/libjava/configure.in b/libjava/configure.in index 0d6d92852b5..3efd6d498f8 100644 --- a/libjava/configure.in +++ b/libjava/configure.in @@ -1093,7 +1093,7 @@ case "${which_gcj}" in GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/" ;; cross) - # See the comment in Makefile.am about CANADIAN being a misnomer + # See the comment below about CANADIAN being a misnomer CANADIAN=yes NULL_TARGET=no if test "x${with_newlib}" = "xyes"; then @@ -1105,13 +1105,33 @@ case "${which_gcj}" in fi ;; path) - # See the comment in Makefile.am about CANADIAN being a misnomer + # See the comment below about CANADIAN being a misnomer CANADIAN=yes NULL_TARGET=yes GCJ="gcj -B`${PWDCMD-pwd}`/" ;; 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 test -f libgcj.spec || touch libgcj.spec @@ -1163,9 +1183,7 @@ AC_SUBST(CHECKREFSPEC) AC_SUBST(EXCEPTIONSPEC) AC_SUBST(IEEESPEC) -AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes) -AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes) -AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes || test "$NULL_TARGET" = yes) +AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes) AM_CONDITIONAL(NEEDS_DATA_START, test "$NEEDS_DATA_START" = yes && test "$NATIVE" = yes) AC_SUBST(GCC_UNWIND_INCLUDE) diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index af1b861092d..9402129e0fa 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -85,6 +85,7 @@ GCDEPS = @GCDEPS@ GCINCS = @GCINCS@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ +GCJH = @GCJH@ GCJVERSION = @GCJVERSION@ GCLIBS = @GCLIBS@ GCOBJS = @GCOBJS@ @@ -139,6 +140,7 @@ THREADSPEC = @THREADSPEC@ TOOLKIT = @TOOLKIT@ VERSION = @VERSION@ ZINCS = @ZINCS@ +ZIP = @ZIP@ ZLIBS = @ZLIBS@ ZLIBSPEC = @ZLIBSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@ diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 68f9e9afceb..d00ce1d3b4d 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -85,6 +85,7 @@ GCDEPS = @GCDEPS@ GCINCS = @GCINCS@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ +GCJH = @GCJH@ GCJVERSION = @GCJVERSION@ GCLIBS = @GCLIBS@ GCOBJS = @GCOBJS@ @@ -139,6 +140,7 @@ THREADSPEC = @THREADSPEC@ TOOLKIT = @TOOLKIT@ VERSION = @VERSION@ ZINCS = @ZINCS@ +ZIP = @ZIP@ ZLIBS = @ZLIBS@ ZLIBSPEC = @ZLIBSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@ diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index 89f758db06a..83a4b77c5c0 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -85,6 +85,7 @@ GCDEPS = @GCDEPS@ GCINCS = @GCINCS@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ +GCJH = @GCJH@ GCJVERSION = @GCJVERSION@ GCLIBS = @GCLIBS@ GCOBJS = @GCOBJS@ @@ -139,6 +140,7 @@ THREADSPEC = @THREADSPEC@ TOOLKIT = @TOOLKIT@ VERSION = @VERSION@ ZINCS = @ZINCS@ +ZIP = @ZIP@ ZLIBS = @ZLIBS@ ZLIBSPEC = @ZLIBSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@ -- 2.30.2