summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2004-12-10 21:20:00 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2004-12-10 21:20:00 (GMT)
commitb1df0a57aa0024ccbef406d04673260b8924e76c (patch)
tree6096b100166e65e57fd5b5d75fad2dc485e4b194 /c++
parente7e76b687696151281874d9b89e03f79f97fff4b (diff)
downloadhdf5-b1df0a57aa0024ccbef406d04673260b8924e76c.zip
hdf5-b1df0a57aa0024ccbef406d04673260b8924e76c.tar.gz
hdf5-b1df0a57aa0024ccbef406d04673260b8924e76c.tar.bz2
[svn-r9650] Purpose:
added support for the hl library int the c++ examples Description: Solution: Platforms tested: linux Misc. update:
Diffstat (limited to 'c++')
-rw-r--r--c++/examples/Makefile.in2
-rwxr-xr-xc++/src/h5c++.in8
2 files changed, 8 insertions, 2 deletions
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index f91a610..e0a5b5e 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -25,7 +25,7 @@ HDF_CXX="yes"
## Replace building CC with the just installed h5cc
CXX=$(bindir)/h5c++
-CPPFLAGS=-I. -I$(srcdir)
+CPPFLAGS=-I. -I$(srcdir) -I$(top_srcdir)/hl/src
CFLAGS=
hdf5_srcdir=$(top_srcdir)/src
diff --git a/c++/src/h5c++.in b/c++/src/h5c++.in
index 516aa23..e9e1b86 100755
--- a/c++/src/h5c++.in
+++ b/c++/src/h5c++.in
@@ -27,6 +27,7 @@ prefix="@prefix@"
exec_prefix="@exec_prefix@"
libdir="@libdir@"
includedir="@includedir@"
+HL="@HL@"
############################################################################
## ##
@@ -237,7 +238,12 @@ if test "x$do_compile" = "xyes"; then
fi
if test "x$do_link" = "xyes"; then
- link_args="$link_args ${libdir}/libhdf5_cpp.a ${libdir}/libhdf5.a $LIBS"
+ # conditionnaly link with the hl library
+ if test "X$HL" = "Xhl"; then
+ link_args="$link_args ${libdir}/libhdf5_cpp.a ${libdir}/libhdf5.a ${libdir}/libhdf5_hl.a $LIBS"
+ else
+ link_args="$link_args ${libdir}/libhdf5_cpp.a ${libdir}/libhdf5.a $LIBS"
+ fi
$SHOW $CXXLINKER -I$includedir $CPPFLAGS $CXXFLAGS $LDFLAGS $clibpath $link_objs $link_args
status=$?
fi