From 97759f62afba6a53eeb3d7d338816c3833015994 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Fri, 14 Nov 2014 13:46:08 +0000 Subject: USe the externally built conveniance utf8proc library --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 08766089f..f5a102f7a 100644 --- a/Makefile +++ b/Makefile @@ -487,16 +487,15 @@ CWARNFLAGS := -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs # Pull in the configuration include Makefile.defaults -# Build flags for libjpeg as it has no pkgconfig file +# libraries enabled by feature switch without pkgconfig file $(eval $(call feature_switch,JPEG,JPEG (libjpeg),-DWITH_JPEG,-ljpeg,-UWITH_JPEG,)) - -# Build flags for haru $(eval $(call feature_switch,HARU_PDF,PDF export (haru),-DWITH_PDF_EXPORT,-lhpdf -lpng,-UWITH_PDF_EXPORT,)) - -# Build flags for iconv $(eval $(call feature_switch,LIBICONV_PLUG,glibc internal iconv,-DLIBICONV_PLUG,,-ULIBICONV_PLUG,-liconv)) -# common libraries without pkg-config support +# Common libraries with pkgconfig +$(eval $(call pkg_config_find_and_add,libutf8proc,UTF8PROC)) + +# Common libraries without pkg-config support LDFLAGS += -lz # add top level and build directory to include search path -- cgit v1.2.3