From ab659fd6de3f0e9068f9bb72dbb5bedff64cc220 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 18 Jul 1996 21:19:11 +0000 Subject: [PATCH] * configure.host: Set INSTALL_SHLIB. * configure.in: Call AC_SUBST (INSTALL_SHLIB). * configure: Rebuild. * Makefile.in (install): Use @INSTALL_SHLIB@. --- bfd/ChangeLog | 5 +++++ bfd/Makefile.in | 2 +- bfd/configure | 54 ++++++++++++++++++++++++++++-------------------------- bfd/configure.host | 3 +++ bfd/configure.in | 1 + 5 files changed, 38 insertions(+), 27 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 110729e..b17cd6e 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ Thu Jul 18 15:39:10 1996 Ian Lance Taylor + * configure.host: Set INSTALL_SHLIB. + * configure.in: Call AC_SUBST (INSTALL_SHLIB). + * configure: Rebuild. + * Makefile.in (install): Use @INSTALL_SHLIB@. + * config.bfd (mips*-*-irix6*): New target. * configure.host: Handle Irix 6 shared library like Irix 5. diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 128ab1e..b71b7a0 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -670,7 +670,7 @@ install: $(ALLLIBS) ts=lib`echo $(SHLIB) | sed -e 's/^lib//' | sed '$(program_transform_name)'`; \ ln -sf $$ts $(libdir)/$$tf; \ elif [ "$$f" = "$(SHLIB)" ]; then \ - $(INSTALL_PROGRAM) $$f $(libdir)/$$tf; \ + @INSTALL_SHLIB@ \ else \ $(INSTALL_DATA) $$f $(libdir)/$$tf; \ $(RANLIB) $(libdir)/$$tf; \ diff --git a/bfd/configure b/bfd/configure index ffb2480..fc1e3d4 100755 --- a/bfd/configure +++ b/bfd/configure @@ -1059,6 +1059,7 @@ fi + HOST_64BIT_LONG=0 if test "x${HOST_64BIT_TYPE}" = "xlong"; then HOST_64BIT_LONG=1 @@ -1074,11 +1075,11 @@ else ac_cv_c_cross=yes else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_c_cross=no else @@ -1116,13 +1117,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1131,13 +1132,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1165,12 +1166,12 @@ 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:1174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1202,12 +1203,12 @@ 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:1211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1236,7 +1237,7 @@ if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1246,7 +1247,7 @@ int t() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1272,7 +1273,7 @@ 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; }; then +if { (eval echo configure:1301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1333,7 +1334,7 @@ if eval "test \"`echo '$''{'bfd_cv_decl_needed_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1348,7 +1349,7 @@ int t() { char *(*pfn) = (char *(*)) malloc ; return 0; } EOF -if { (eval echo configure:1352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_malloc=no else @@ -1373,7 +1374,7 @@ if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1388,7 +1389,7 @@ int t() { char *(*pfn) = (char *(*)) free ; return 0; } EOF -if { (eval echo configure:1392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_free=no else @@ -1660,7 +1661,7 @@ EOF echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return 0; } @@ -1668,7 +1669,7 @@ int t() { prstatus_t t; ; return 0; } EOF -if { (eval echo configure:1672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_header_sys_procfs_h=yes else @@ -1961,7 +1962,7 @@ 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; }; then +if { (eval echo configure:1990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2015,7 +2016,7 @@ else ac_cv_func_mmap=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_func_mmap=yes else @@ -2109,7 +2110,7 @@ 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; }; then +if { (eval echo configure:2138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2309,6 +2310,7 @@ s%@SHLIB_CFLAGS@%$SHLIB_CFLAGS%g s%@COMMON_SHLIB@%$COMMON_SHLIB%g s%@PICLIST@%$PICLIST%g s%@SHLINK@%$SHLINK%g +s%@INSTALL_SHLIB@%$INSTALL_SHLIB%g s%@HOST_64BIT_LONG@%$HOST_64BIT_LONG%g s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g s%@CPP@%$CPP%g diff --git a/bfd/configure.host b/bfd/configure.host index b2b9e71..004873a 100644 --- a/bfd/configure.host +++ b/bfd/configure.host @@ -17,6 +17,7 @@ # ALLLIBS may be set to libraries to build # HLDFLAGS LDFLAGS specific to the host # RPATH_ENVVAR environment variable used to find shared libraries +# INSTALL_SHLIB install a shared library HDEFINES= host64=false @@ -54,6 +55,7 @@ HLDFLAGS= RPATH_ENVVAR=LD_LIBRARY_PATH SHLIB_CC='$(CC)' SHLIB_CFLAGS='-shared' +INSTALL_SHLIB='$(INSTALL_PROGRAM) $$f $(libdir)/$$tf;' if [ "${shared}" = "true" ]; then case "${host}" in hppa*-*-*) picfrag=${srcdir}/../config/mh-papic ;; @@ -80,6 +82,7 @@ if [ "${shared}" = "true" ]; then SHLIB_CFLAGS='-shared $(PICFLAG)' HLDFLAGS='-Wl,+s,+b,$(libdir)' RPATH_ENVVAR=SHLIB_PATH + INSTALL_SHLIB='$(INSTALL_PROGRAM) $$f $(libdir)/$$tf; chmod -w $(libdir)/$$tf;' ;; *-*-irix[56]*) # -fpic is not needed on Irix 5 or 6. diff --git a/bfd/configure.in b/bfd/configure.in index 21f3b60..7e265bd 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -109,6 +109,7 @@ fi AC_SUBST(COMMON_SHLIB) AC_SUBST(PICLIST) AC_SUBST(SHLINK) +AC_SUBST(INSTALL_SHLIB) HOST_64BIT_LONG=0 if test "x${HOST_64BIT_TYPE}" = "xlong"; then -- 2.7.4