1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
From: Teemu Ikonen <tpikonen@gmail.com>
Date: Tue, 9 Oct 2018 12:13:28 +0300
Subject: makefile-fix: Fix CBFLIB_DONT_USE_LOCAL_TIFF config var.
Makefile | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Makefile b/Makefile
index c1528b6..331008b 100644
@@ -300,12 +300,15 @@ PLY = ply-3.2
PYCIFRWFLAG = -DCBF_USE_PYCIFRW
endif
+CBFLIB_DONT_USE_LOCAL_TIFF ?= no
+ifneq ($(CBFLIB_DONT_USE_LOCAL_TIFF),yes)
#
# Definition to get a version of tifflib to support tiff2cbf
#
TIFF = tiff-4.0.6_rev_3Nov16
TIFF_PREFIX ?= $(PWD)
TIFF_INSTALL = $(TIFF)_INSTALL
+endif
#
@@ -1211,6 +1214,8 @@ $(REGEX)_INSTALL: $(REGEX)
(cd $(REGEX); make distclean; ./configure --prefix=$(CBF_PREFIX); make install)
@-cp $(CBF_PREFIX)/include/pcreposix.h $(CBF_PREFIX)/include/regex.h
+
+ifneq ($(CBFLIB_DONT_USE_LOCAL_TIFF),yes)
#
# TIFF
#
@@ -1227,6 +1232,7 @@ $(TIFF): build_tiff config.guess config.sub
(cd $(TIFF); ./configure --prefix=$(TIFF_PREFIX); make install)
$(TIFF)_INSTALL: $(TIFF)
(cd $(TIFF); make distclean; ./configure --prefix=$(CBF_PREFIX); make install)
+endif
ifneq ($(CBFLIB_DONT_USE_LOCAL_HDF5),yes)
|
