summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Kendrick <rjek@netsurf-browser.org>2008-07-26 17:13:24 +0000
committerRob Kendrick <rjek@netsurf-browser.org>2008-07-26 17:13:24 +0000
commitc74b00445f80a9a24dd2905fd68fa4e13b22c67c (patch)
treef937ba4b35de757cf77e6fb45008836fef822cc1
parent789ab037d17893c49d00aecbf211880affc7d2ce (diff)
downloadnetsurf-c74b00445f80a9a24dd2905fd68fa4e13b22c67c.tar.gz
netsurf-c74b00445f80a9a24dd2905fd68fa4e13b22c67c.tar.bz2
Make using libpng only be enabled when NETSURF_USE_HARU_PDF is YES.
svn path=/trunk/netsurf/; revision=4749
-rw-r--r--Makefile4
-rw-r--r--Makefile.config2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index c389c416e..73305d277 100644
--- a/Makefile
+++ b/Makefile
@@ -153,9 +153,9 @@ else
LDFLAGS := $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl)
endif
# Common libraries without pkgconfig support:
-LDFLAGS += -lz -lm -lmng -ljpeg -lpng
+LDFLAGS += -lz -lm -lmng -ljpeg
ifeq ($(NETSURF_USE_HARU_PDF),YES)
-LDFLAGS += -lhpdf
+LDFLAGS += -lhpdf -lpng
CFLAGS += -DWITH_PDF_EXPORT
endif
endif
diff --git a/Makefile.config b/Makefile.config
index d89aa9520..d569738be 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -6,7 +6,7 @@
# Use libharu to enable PDF export and GTK printing support. There is no
# auto-detection available for this, as it does not have a pkg-config file.
-NETSURF_USE_HARU_PDF=YES
+NETSURF_USE_HARU_PDF=NO
# The following options are GTK-specific
ifeq ($(TARGET),gtk)