mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r1951] Tweaks to detect the shared libraries on NCSA's systems, so that Albert's

Browse Source 
automated tests will work correctly on arabica.
This commit is contained in:
Quincey Koziol 2000-01-29 19:37:28 -05:00
parent 43ddb0f2c4
commit 0fd1ac6740
4 changed files with 721 additions and 624 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/commence.in
View File

@ -9,7 +9,7 @@
.SUFFIXES: .c .o .lo
@SET_MAKE@
## Directories to serch
## Directories to search
@SEARCH@
## Programs
@ -26,6 +26,7 @@ CP=cp
INSTALL=@INSTALL@
INSTALL_PROGRAM=@INSTALL_PROGRAM@
INSTALL_DATA=@INSTALL_DATA@
NCSA_LT_LINK_EXE=@NCSA_LT_LINK_EXE@
RUNSERIAL=@RUNSERIAL@
RUNPARALLEL=@RUNPARALLEL@
RUNTEST=$(RUNSERIAL)
@ -44,7 +45,7 @@ PUB_LIB=$(LIB)
LT=$(top_builddir)/libtool
LT_COMPILE=$(LT) --mode=compile $(CC)
LT_LINK_LIB=$(LT) --mode=link $(CC) -rpath $(libdir)
LT_LINK_EXE=$(LT) --mode=link $(CC) -rpath $(bindir)
LT_LINK_EXE=$(LT) --mode=link $(CC) -rpath $(bindir) $(NCSA_LT_LINK_EXE)
LT_RUN=$(LT) --mode=execute
LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)

1330
configure vendored
View File

File diff suppressed because it is too large Load Diff

6
configure.in
View File

@ -412,6 +412,12 @@ dnl NCSA keeps hdf4 in a funny place, but for most sites we don't want these.
test -d /usr/ncsa/include && CPPFLAGS="$CPPFLAGS -I/usr/ncsa/include"
test -d /usr/ncsa/lib && LDFLAGS="$LDFLAGS -L/usr/ncsa/lib"
AC_SUBST(NCSA_LT_LINK_EXE)
NCSA_LT_LINK_EXE=
if test -d /usr/ncsa/lib; then
NCSA_LT_LINK_EXE="$NCSA_LT_LINK_EXE -rpath /usr/ncsa/lib"
fi
AC_ARG_WITH(hdf4,[ --with-hdf4=INC,LIB Use the HDF4 library],,withval=yes)
case $withval in
yes)

4
src/Makefile.in
View File

@ -51,10 +51,10 @@ PRIVATE_HDR=H5private.h H5Aprivate.h H5Apkg.h H5ACprivate.h H5Bprivate.h \
## Number format detection
H5Tinit.c: H5detect
$(RUNSERIAL) ./H5detect >H5Tinit.c
$(LT_RUN) ./H5detect >H5Tinit.c
## no $(LIB) in the action below since that's being made now.
H5detect: H5detect.o
$(CC) $(CFLAGS) -o $@ H5detect.o $(LDFLAGS) $(LIBS)
$(LT_LINK_EXE) $(CFLAGS) -o $@ H5detect.o $(LDFLAGS) $(LIBS)
@CONCLUDE@