diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-09 14:20:42 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-09 17:37:01 +0100 |
| commit | cedd9ebdd260e99e74ad54391c0d0b1d1ebd9891 (patch) | |
| tree | ba383bf53ba0184c5c7810a5f829bf57f94dd867 /libcdr | |
| parent | 5f78685ebf4be192cbf5168424e5ca98bbe48d6f (diff) | |
configure: define FOO_CFLAGS/FOO_LIBS so that they are never empty
This allows us to simply pass the already exported variables to invoked
configures, where the non-empty values will override the detection logic
there.
Change-Id: I7353a313814c58922e34843aeae380e5afa442ca
Diffstat (limited to 'libcdr')
| -rw-r--r-- | libcdr/ExternalProject_libcdr.mk | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 007f2e0ac228..f575dd80132f 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -57,18 +57,12 @@ else $(call gb_ExternalProject_get_state_target,libcdr,build) : cd $(EXTERNAL_WORKDIR) \ && PKG_CONFIG="" \ - WPD_CFLAGS=" $(WPD_CFLAGS)" \ - WPD_LIBS=" $(WPD_LIBS)" \ - WPG_CFLAGS=" $(WPG_CFLAGS)" \ - WPG_LIBS=" $(WPG_LIBS)" \ $(if $(filter YES,$(SYSTEM_LCMS2)),\ LCMS2_CFLAGS=" $(LCMS2_CFLAGS)" \ LCMS2_LIBS=" $(LCMS2_LIBS)", \ LCMS2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,lcms2/include) \ $(if $(filter MACOSX,$(OS)),-Wno-long-long)" \ LCMS2_LIBS="-L$(OUTDIR)/lib -llcms2" ) \ - ZLIB_CFLAGS=" $(ZLIB_CFLAGS)" \ - ZLIB_LIBS=" $(ZLIB_LIBS)" \ ./configure \ --with-pic \ --enable-static \ |