diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-08-15 14:55:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-15 15:01:22 +0200 |
| commit | a1230334d42250f7376f0a887e5303fa218234bb (patch) | |
| tree | 8b8003d23e15df977f536d061545bfe69eb5292d /cairo | |
| parent | 1edb495a45fde1d788b409fd1a9a839bd370c426 (diff) | |
fdo#65244: cairo configure fails to detect libpng...
... unless there is _some_ libpng.pc on the system due to the weird way it
uses pkg-config. Work around that by setting an png_REQUIRES variable,
which lets it use the supplied png_CFLAGS and png_LIBS.
Change-Id: I3ec4b96551e3ce624748c05fe3ab9727b191ea78
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/ExternalProject_cairo.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk index 4ba9023677f4..1aac70226948 100644 --- a/cairo/ExternalProject_cairo.mk +++ b/cairo/ExternalProject_cairo.mk @@ -39,6 +39,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \ COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \ ZLIB3RDLIB=-lz \ + png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \ png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \ $(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \ $(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \ |