From c34aeb9d18d45fd59b972838c9dbd41b6d434d34 Mon Sep 17 00:00:00 2001 From: tromey Date: Mon, 21 Jun 1999 13:03:47 +0000 Subject: [PATCH] * Makefile.in: Rebuilt. * Makefile.am (toolexeclibdir): Define as libdir when appropriate. * configure: Rebuilt. * configure.in (USE_LIBDIR): New conditional. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27667 138bc75d-0d04-0410-961f-82ee72b054a4 --- boehm-gc/ChangeLog | 6 ++++ boehm-gc/Makefile.am | 6 ++++ boehm-gc/Makefile.in | 9 ++++-- boehm-gc/configure | 12 ++++++++ boehm-gc/configure.in | 2 ++ libjava/ChangeLog | 8 ++++++ libjava/Makefile.am | 6 ++++ libjava/Makefile.in | 9 ++++-- libjava/configure | 77 +++++++++++++++++++++++++++++---------------------- libjava/configure.in | 1 + zlib/ChangeLog.gcj | 8 ++++++ zlib/Makefile.am | 6 ++++ zlib/Makefile.in | 9 ++++-- zlib/configure | 12 ++++++++ zlib/configure.in | 2 ++ 15 files changed, 131 insertions(+), 42 deletions(-) diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index ec184cd..ec0bc57 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,5 +1,11 @@ 1999-06-21 Tom Tromey + * Makefile.in: Rebuilt. + * Makefile.am (toolexeclibdir): Define as libdir when + appropriate. + * configure: Rebuilt. + * configure.in (USE_LIBDIR): New conditional. + * configure: Rebuilt. * configure.in: Recognize all forms of alpha. diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am index cd18abb..48d5211 100644 --- a/boehm-gc/Makefile.am +++ b/boehm-gc/Makefile.am @@ -14,8 +14,14 @@ MULTISUBDIR = MULTIDO = true MULTICLEAN = true +## Install a library built with a cross compiler in tooldir, not +## libdir. +if USE_LIBDIR +toolexeclibdir = $(libdir) +else toolexecdir = $(exec_prefix)/$(target_alias) toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) +endif toolexeclib_LTLIBRARIES = $(target_all) EXTRA_LTLIBRARIES = libgcjgc.la diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in index 0e9525f..1980313 100644 --- a/boehm-gc/Makefile.in +++ b/boehm-gc/Makefile.in @@ -98,9 +98,12 @@ MULTIDIRS = MULTISUBDIR = MULTIDO = true MULTICLEAN = true - -toolexecdir = $(exec_prefix)/$(target_alias) -toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) +@USE_LIBDIR_TRUE@toolexeclibdir = \ +@USE_LIBDIR_TRUE@$(libdir) +@USE_LIBDIR_FALSE@toolexeclibdir = \ +@USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) +@USE_LIBDIR_FALSE@toolexecdir = \ +@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) toolexeclib_LTLIBRARIES = $(target_all) EXTRA_LTLIBRARIES = libgcjgc.la diff --git a/boehm-gc/configure b/boehm-gc/configure index 9fb2597..e75e17b 100755 --- a/boehm-gc/configure +++ b/boehm-gc/configure @@ -2827,6 +2827,16 @@ EOF fi + + +if test -z "$with_cross_host"; then + USE_LIBDIR_TRUE= + USE_LIBDIR_FALSE='#' +else + USE_LIBDIR_TRUE='#' + USE_LIBDIR_FALSE= +fi + if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" else @@ -3026,6 +3036,8 @@ s%@INCLUDES@%$INCLUDES%g s%@CXXINCLUDES@%$CXXINCLUDES%g s%@addobjs@%$addobjs%g s%@MY_CFLAGS@%$MY_CFLAGS%g +s%@USE_LIBDIR_TRUE@%$USE_LIBDIR_TRUE%g +s%@USE_LIBDIR_FALSE@%$USE_LIBDIR_FALSE%g CEOF EOF diff --git a/boehm-gc/configure.in b/boehm-gc/configure.in index f94c437..f14a677 100644 --- a/boehm-gc/configure.in +++ b/boehm-gc/configure.in @@ -202,6 +202,8 @@ if test -n "${with_cross_host}"; then AC_DEFINE(SMALL_CONFIG) fi +AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host") + if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" else diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 274760d..269f7e3 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +1999-06-21 Tom Tromey + + * Makefile.in: Rebuilt. + * Makefile.am (toolexeclibdir): Define as libdir when + appropriate. + * configure: Rebuilt. + * configure.in (USE_LIBDIR): New conditional. + 1999-06-18 Bryce McKinlay * java/net/natInetAddress.cc (lookup): Preserve caller-supplied diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 687f831..067f49b 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -12,8 +12,14 @@ endif ## What gets installed, and where. ## +## Install a library built with a cross compiler in tooldir, not +## libdir. +if USE_LIBDIR +toolexeclibdir = $(libdir) +else toolexecdir = $(exec_prefix)/$(target_alias) toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) +endif toolexeclib_LTLIBRARIES = libgcj.la toolexeclib_DATA = libgcj.spec diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 3b74ef5..d883671 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -108,9 +108,12 @@ AUTOMAKE_OPTIONS = foreign no-installinfo @TESTSUBDIR_TRUE@SUBDIRS = \ @TESTSUBDIR_TRUE@testsuite - -toolexecdir = $(exec_prefix)/$(target_alias) -toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) +@USE_LIBDIR_TRUE@toolexeclibdir = \ +@USE_LIBDIR_TRUE@$(libdir) +@USE_LIBDIR_FALSE@toolexeclibdir = \ +@USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) +@USE_LIBDIR_FALSE@toolexecdir = \ +@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) toolexeclib_LTLIBRARIES = libgcj.la toolexeclib_DATA = libgcj.spec diff --git a/libjava/configure b/libjava/configure index 183a064..53e0324 100755 --- a/libjava/configure +++ b/libjava/configure @@ -4345,6 +4345,15 @@ else fi +if test -z "$with_cross_host"; then + USE_LIBDIR_TRUE= + USE_LIBDIR_FALSE='#' +else + USE_LIBDIR_TRUE='#' + USE_LIBDIR_FALSE= +fi + + # Determine gcj version number. if test "$GCJ" = ""; then if test -z "${with_multisubdir}"; then @@ -4369,17 +4378,17 @@ for ac_hdr in unistd.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sy do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4373: checking for $ac_hdr" >&5 +echo "configure:4382: 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:4383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4392: \"$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* @@ -4409,17 +4418,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:4413: checking for $ac_hdr" >&5 +echo "configure:4422: 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:4423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4432: \"$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* @@ -4447,16 +4456,16 @@ done echo $ac_n "checking whether struct sockaddr_in6 is in netinet/in.h""... $ac_c" 1>&6 -echo "configure:4451: checking whether struct sockaddr_in6 is in netinet/in.h" >&5 +echo "configure:4460: 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:4460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_INET6 1 @@ -4472,16 +4481,16 @@ fi rm -f conftest* echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6 -echo "configure:4476: checking for socklen_t in sys/socket.h" >&5 +echo "configure:4485: checking for socklen_t in sys/socket.h" >&5 cat > conftest.$ac_ext < int main() { socklen_t x = 5; ; return 0; } EOF -if { (eval echo configure:4485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_SOCKLEN_T 1 @@ -4497,16 +4506,16 @@ fi rm -f conftest* echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:4501: checking for tm_gmtoff in struct tm" >&5 +echo "configure:4510: 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:4510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define STRUCT_TM_HAS_GMTOFF 1 @@ -4519,16 +4528,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:4523: checking for global timezone variable" >&5 +echo "configure:4532: checking for global timezone variable" >&5 cat > conftest.$ac_ext < int main() { long z2 = timezone; ; return 0; } EOF -if { (eval echo configure:4532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIMEZONE 1 @@ -4548,19 +4557,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:4552: checking for working alloca.h" >&5 +echo "configure:4561: 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:4564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4573: \"$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 @@ -4581,12 +4590,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:4585: checking for alloca" >&5 +echo "configure:4594: 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:4627: \"$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 @@ -4646,12 +4655,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:4650: checking whether alloca needs Cray hooks" >&5 +echo "configure:4659: 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:4680: checking for $ac_func" >&5 +echo "configure:4689: 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:4717: \"$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 @@ -4731,7 +4740,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:4735: checking stack direction for C alloca" >&5 +echo "configure:4744: 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 @@ -4739,7 +4748,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:4771: \"$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 @@ -4785,7 +4794,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:4789: checking for $ac_word" >&5 +echo "configure:4798: 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 @@ -5044,6 +5053,8 @@ 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%@USE_LIBDIR_TRUE@%$USE_LIBDIR_TRUE%g +s%@USE_LIBDIR_FALSE@%$USE_LIBDIR_FALSE%g s%@EH_COMMON_INCLUDE@%$EH_COMMON_INCLUDE%g s%@AM_RUNTESTFLAGS@%$AM_RUNTESTFLAGS%g s%@ALLOCA@%$ALLOCA%g diff --git a/libjava/configure.in b/libjava/configure.in index e7a7b0c..4e7b63b 100644 --- a/libjava/configure.in +++ b/libjava/configure.in @@ -443,6 +443,7 @@ AC_SUBST(ZINCS) AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes) AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes) AM_CONDITIONAL(NATIVE, test "$CANADIAN" = no || test "$NULL_TARGET" = yes) +AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host") AC_SUBST(EH_COMMON_INCLUDE) # Determine gcj version number. diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj index 931a80e..a6b1c9d 100644 --- a/zlib/ChangeLog.gcj +++ b/zlib/ChangeLog.gcj @@ -1,3 +1,11 @@ +1999-06-21 Tom Tromey + + * Makefile.in: Rebuilt. + * Makefile.am (toolexeclibdir): Define as libdir when + appropriate. + * configure: Rebuilt. + * configure.in (USE_LIBDIR): New conditional. + 1999-05-10 Tom Tromey * configure, Makefile.in: Rebuilt. diff --git a/zlib/Makefile.am b/zlib/Makefile.am index cf27582..f00bc78 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -10,8 +10,14 @@ MULTISUBDIR = MULTIDO = true MULTICLEAN = true +## Install a library built with a cross compiler in tooldir, not +## libdir. +if USE_LIBDIR +toolexeclibdir = $(libdir) +else toolexecdir = $(exec_prefix)/$(target_alias) toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) +endif ## We don't use `libz.la' because we don't want to conflict with a ## system library of that name. diff --git a/zlib/Makefile.in b/zlib/Makefile.in index ac34d65..d10b4df 100644 --- a/zlib/Makefile.in +++ b/zlib/Makefile.in @@ -91,9 +91,12 @@ MULTIDIRS = MULTISUBDIR = MULTIDO = true MULTICLEAN = true - -toolexecdir = $(exec_prefix)/$(target_alias) -toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) +@USE_LIBDIR_TRUE@toolexeclibdir = \ +@USE_LIBDIR_TRUE@$(libdir) +@USE_LIBDIR_FALSE@toolexeclibdir = \ +@USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) +@USE_LIBDIR_FALSE@toolexecdir = \ +@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) toolexeclib_LTLIBRARIES = @target_all@ EXTRA_LTLIBRARIES = libzgcj.la diff --git a/zlib/configure b/zlib/configure index 9289120..6c2ade1 100755 --- a/zlib/configure +++ b/zlib/configure @@ -2701,6 +2701,16 @@ fi done + + +if test -z "$with_cross_host"; then + USE_LIBDIR_TRUE= + USE_LIBDIR_FALSE='#' +else + USE_LIBDIR_TRUE='#' + USE_LIBDIR_FALSE= +fi + if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" else @@ -2895,6 +2905,8 @@ s%@LIBTOOL@%$LIBTOOL%g s%@COMPPATH@%$COMPPATH%g s%@CPP@%$CPP%g s%@target_all@%$target_all%g +s%@USE_LIBDIR_TRUE@%$USE_LIBDIR_TRUE%g +s%@USE_LIBDIR_FALSE@%$USE_LIBDIR_FALSE%g CEOF EOF diff --git a/zlib/configure.in b/zlib/configure.in index 4b63cb2..dc4d5c8 100644 --- a/zlib/configure.in +++ b/zlib/configure.in @@ -79,6 +79,8 @@ AC_SUBST(target_all) AC_CHECK_HEADERS(unistd.h) +AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host") + if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" else -- 2.7.4