diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-09 14:28:43 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-09 17:37:02 +0100 |
| commit | 691c8fc64ce0711e8be93f4c454c537e51b1163e (patch) | |
| tree | 8190a1af531b43af5a9347f0db7b1bf25131c444 | |
| parent | cedd9ebdd260e99e74ad54391c0d0b1d1ebd9891 (diff) | |
libcdr: move LCMS2_CFLAGS/LIBS setup to configure
Change-Id: I50f4396e6a8abf32d1a0f63cbfa93d2c59375326
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | libcdr/ExternalProject_libcdr.mk | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 2439053cfd54..059d6e0070d1 100644 --- a/configure.ac +++ b/configure.ac @@ -7014,6 +7014,11 @@ if test "$with_system_lcms2" = "yes"; then else AC_MSG_RESULT([internal]) SYSTEM_LCMS2=NO + LCMS2_LIBS="-L${OUTDIR}/lib -llcms2" + LCMS2_CFLAGS="-I${WORKDIR}/UnpackedTarball/lcms2/include" + if test "$GCC" = "yes"; then + LCMS2_CFLAGS="${LCMS2_CFLAGS} -Wno-long-long" + fi LCMS2_TARBALL="861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz" BUILD_TYPE="$BUILD_TYPE LCMS2" fi diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index f575dd80132f..f4dcab59efb3 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -57,12 +57,6 @@ else $(call gb_ExternalProject_get_state_target,libcdr,build) : cd $(EXTERNAL_WORKDIR) \ && PKG_CONFIG="" \ - $(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" ) \ ./configure \ --with-pic \ --enable-static \ |