From b1df0a57aa0024ccbef406d04673260b8924e76c Mon Sep 17 00:00:00 2001 From: Pedro Vicente Nunes Date: Fri, 10 Dec 2004 16:20:00 -0500 Subject: [svn-r9650] Purpose: added support for the hl library int the c++ examples Description: Solution: Platforms tested: linux Misc. update: --- c++/examples/Makefile.in | 2 +- c++/src/h5c++.in | 8 +++++++- 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 -- cgit v0.12