libcdr: move LCMS2_CFLAGS/LIBS setup to configure

Change-Id: I50f4396e6a8abf32d1a0f63cbfa93d2c59375326

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

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 \