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
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
do not autoprobe deps when we disabled them
--- GNUmakefile
+++ GNUmakefile
@@ -74,7 +74,10 @@ include $(BUILDDIR)/config.mk
PROG_SUBDIRS = converter analyzer editor generator other
PRODUCT_SUBDIRS = lib $(PROG_SUBDIRS)
-SUPPORT_SUBDIRS = urt icon buildtools test
+SUPPORT_SUBDIRS = icon buildtools test
+ifeq ($(URTLIB),$(BUNDLED_URTLIB))
+SUPPORT_SUBDIRS += urt
+endif
SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
--- converter/other/Makefile
+++ converter/other/Makefile
@@ -7,6 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
include $(BUILDDIR)/config.mk
+ifneq ($(XML2_LIBS),NONE)
TEST_PKGCONFIG_LIBXML2 = if pkg-config libxml-2.0; then echo exists; fi
ifneq ($(shell $(TEST_PKGCONFIG_LIBXML2)),)
@@ -22,6 +23,7 @@ else
XML2_CFLAGS=$(shell xml2-config --cflags)
endif
endif
+endif
SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg
ifneq ($(BUILD_FIASCO), N)
@@ -34,6 +36,7 @@ ifneq ($(TIFFLIB),NONE)
endif
endif
+ifneq ($(PNGLIB),NONE)
TEST_PKGCONFIG_LIBPNG = if pkg-config libpng$(PNGVER); then echo exists; fi
ifneq ($(shell $(TEST_PKGCONFIG_LIBPNG)),)
@@ -58,6 +61,7 @@ else
endif
endif
endif
+endif
ifneq ($(JPEGLIB),NONE)
ifneq ($(JPEGHDR_DIR)x,x)
--- other/pamx/Makefile
+++ other/pamx/Makefile
@@ -9,6 +9,7 @@ include $(BUILDDIR)/config.mk
EXTERN_INCLUDE =
+ifneq ($(X11LIB),NONE)
ifeq ($(shell pkg-config x11 --modversion --silence-errors),)
# Pkg-config has never heard of X11, or doesn't even exist
@@ -23,6 +24,7 @@ else
X11LIB = $(shell pkg-config x11 --libs)
EXTERN_INCLUDES += $(shell pkg-config x11 --cflags)
endif
+endif
ifeq ($(HAVE_X11LIB),Y)
PORTBINARIES += pamx
|
GitWeb
