summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
Diffstat (limited to 'hl')
-rw-r--r--hl/Makefile.am6
-rwxr-xr-xhl/Makefile.in2
2 files changed, 6 insertions, 2 deletions
diff --git a/hl/Makefile.am b/hl/Makefile.am
index 4e6db6a..1f016b5 100644
--- a/hl/Makefile.am
+++ b/hl/Makefile.am
@@ -24,6 +24,10 @@ if BUILD_CXX_CONDITIONAL
CXX_DIR = c++
endif
-SUBDIRS=src test $(CXX_DIR) $(FORTRAN_DIR)
+## Don't recurse into any subdirectories if HDF5 is not configured to
+## use the HL library
+if BUILD_HDF5_HL_CONDITIONAL
+ SUBDIRS=src test $(CXX_DIR) $(FORTRAN_DIR)
+endif
include $(top_srcdir)/config/conclude.am
diff --git a/hl/Makefile.in b/hl/Makefile.in
index e7b01df..6f5cc45 100755
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -277,7 +277,7 @@ H5FC = $(bindir)/h5fc
H5FC_PP = $(bindir)/h5pfc
@BUILD_FORTRAN_CONDITIONAL_TRUE@FORTRAN_DIR = fortran
@BUILD_CXX_CONDITIONAL_TRUE@CXX_DIR = c++
-SUBDIRS = src test $(CXX_DIR) $(FORTRAN_DIR)
+@BUILD_HDF5_HL_CONDITIONAL_TRUE@SUBDIRS = src test $(CXX_DIR) $(FORTRAN_DIR)
# Automake needs to be taught how to build lib, progs, and tests targets.
# These will be filled in automatically for the most part (e.g.,