diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-10-14 12:45:01 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-10-15 13:09:49 (GMT) |
| commit | ce13b5f0472500e54afca638d6c6ef8e7090466e (patch) | |
| tree | c5f66cb63f808f8ed6da3feb7c5b24d29ce0de85 /m4 | |
| parent | 48d171b04730aff7beade684e9afd164f0204b0c (diff) | |
| download | hdf5-ce13b5f0472500e54afca638d6c6ef8e7090466e.zip hdf5-ce13b5f0472500e54afca638d6c6ef8e7090466e.tar.gz hdf5-ce13b5f0472500e54afca638d6c6ef8e7090466e.tar.bz2 | |
Update autotools files
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/libtool.m4 | 5 | ||||
| -rw-r--r-- | m4/ltsugar.m4 | 11 |
2 files changed, 4 insertions, 12 deletions
diff --git a/m4/libtool.m4 b/m4/libtool.m4 index a3bc337..a644432 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -2867,6 +2867,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -2875,7 +2878,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 index a14cd24..48bc934 100644 --- a/m4/ltsugar.m4 +++ b/m4/ltsugar.m4 @@ -1,14 +1,3 @@ -# -# Copyright by The HDF Group. -# All rights reserved. -# -# This file is part of HDF5. The full HDF5 copyright notice, including -# terms governing use, modification, and redistribution, is contained in -# the COPYING file, which can be found at the root of the source code -# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. -# If you do not have access to either file, you may request a copy from -# help@hdfgroup.org. - # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # # Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software |