diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.in | 5 | ||||
| -rw-r--r-- | test/testlibinfo.sh.in | 22 |
2 files changed, 7 insertions, 20 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index f2c5419..f196a24 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -456,14 +456,16 @@ AMTAR = @AMTAR@ # but which should not be exported to h5cc for building other programs. # AM_CFLAGS is an automake construct which should be used by Makefiles # instead of CFLAGS, as CFLAGS is reserved solely for the user to define. +# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well. AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@ AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ -AM_LDFLAGS = @AM_LDFLAGS@ +AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ +AS = @AS@ # Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. @@ -526,6 +528,7 @@ H5_CXXFLAGS = @H5_CXXFLAGS@ H5_CXX_SHARED = @H5_CXX_SHARED@ H5_FCFLAGS = @H5_FCFLAGS@ H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@ +H5_LDFLAGS = @H5_LDFLAGS@ H5_LONE_COLON = @H5_LONE_COLON@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ diff --git a/test/testlibinfo.sh.in b/test/testlibinfo.sh.in index 5bcd300..91eda16 100644 --- a/test/testlibinfo.sh.in +++ b/test/testlibinfo.sh.in @@ -74,27 +74,11 @@ fi # built too. if [ -n $Shared_Lib ]; then h5libdir=../src/.libs + shlib=$(grep dlname ../src/libhdf5.la | sed -e "s/dlname='//" -e "s/'//") else h5libdir=../src fi -# Different OS uses different naming for shared libs. -case `uname -s` in - Darwin) # MacOS - shlibsuffix=.dylib - break - ;; - AIX) # AIX .a is already a shared lib - # this is a temporary patch. - shlibsuffix=.a - break - ;; - *) # default - shlibsuffix=.so - break - ;; -esac - h5libsettings=../src/libhdf5.settings # Part 1: @@ -102,9 +86,9 @@ h5libsettings=../src/libhdf5.settings # libhdf5.settings file. # Check dynamic library file if built. if [ x-$Shared_Lib = x-yes ]; then - CHECK_LIBINFO ${h5libdir}/libhdf5${shlibsuffix} + CHECK_LIBINFO ${h5libdir}/${shlib} else - SKIP ${h5libdir}/libhdf5${shlibsuffix} + SKIP shlib fi # Though rare, libhdf5.a may not have been built. |