libcdr: remove boilerplate:

Define the various FOO_CFLAGS/FOO_LIBS used by libcdr in configure even
for the case of internal FOO, and then just pass those variables into
libcdr configure to get rid of SYSTEM_FOO conditionals.

Change-Id: I0edabc13f8a068cb13792a16499593b8c589da1a

config_host.mk.in

@@ -676,3 +676,5 @@ export XRENDER_CFLAGS=@XRENDER_CFLAGS@
 export XRENDER_LIBS=@XRENDER_LIBS@
 export XSLTML_TARBALL=@XSLTML_TARBALL@
 export XSLTPROC=@XSLTPROC@
+export ZLIB_CFLAGS=@ZLIB_CFLAGS@
+export ZLIB_LIBS=@ZLIB_LIBS@

configure.in

@@ -6687,7 +6687,11 @@ else
     SYSTEM_ZLIB=NO
     SYSTEM_MINIZIP=NO
     BUILD_TYPE="$BUILD_TYPE ZLIB"
+    ZLIB_CFLAGS="-I${OUTDIR}/inc/external/zlib"
+    ZLIB_LIBS="-L${OUTDIR}/lib"
 fi
+AC_SUBST(ZLIB_CFLAGS)
+AC_SUBST(ZLIB_LIBS)
 AC_SUBST(SYSTEM_ZLIB)
 AC_SUBST([SYSTEM_MINIZIP])
 AC_SUBST([MINGW_MINIZIP_DLL])
@@ -6872,6 +6876,8 @@ elif test $_os = iOS; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBWPD=NO
+    WPD_CFLAGS="-I${OUTDIR}/inc/external"
+    WPD_LIBS="-L${OUTDIR}/lib"
     WPD_TARBALL=e7f84e3199dfee9122949448cab3823f-libwpd-0.9.6.tar.bz2
 fi
 AC_SUBST(SYSTEM_LIBWPD)
@@ -6892,6 +6898,8 @@ else
     AC_MSG_RESULT([internal])
     SYSTEM_LCMS2=NO
     BUILD_TYPE="$BUILD_TYPE LCMS2"
+    LCMS2_CFLAGS="-I${OUTDIR}/inc/lcms2"
+    LCMS2_LIBS="-L${OUTDIR}/lib"
 fi
 AC_SUBST(SYSTEM_LCMS2)
 AC_SUBST(LCMS2_CFLAGS)
@@ -6945,6 +6953,8 @@ elif test $_os = iOS; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBWPS=NO
+    WPS_CFLAGS="-I${OUTDIR}/inc/external"
+    WPS_LIBS="-L${OUTDIR}/lib"
     WPS_TARBALL=d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
 fi
 AC_SUBST(SYSTEM_LIBWPS)
@@ -6965,6 +6975,8 @@ elif test $_os = iOS; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBWPG=NO
+    WPG_CFLAGS="-I${OUTDIR}/inc/external"
+    WPG_LIBS="-L${OUTDIR}/lib"
     WPG_TARBALL=9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
 fi
 AC_SUBST(SYSTEM_LIBWPG)

libcdr/ExternalProject_libcdr.mk

@@ -33,61 +33,17 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
 
 else
 
-libcdr_cflags :=
-libcdr_libs :=
-
-ifeq ($(SYSTEM_LIBWPD),YES)
-
-libcdr_cflags += $(WPD_CFLAGS)
-libcdr_libs += $(WPD_LIBS)
-
-else # !SYSTEM_LIBWPD
-
-libcdr_cflags += -I$(OUTDIR)/inc/external
-libcdr_libs += $(SOLARLIB)
-
-endif # SYSTEM_LIBWPD
-
-
-ifeq ($(SYSTEM_LIBWPG),YES)
-
-libcdr_cflags += $(WPG_CFLAGS)
-libcdr_libs += $(WPG_LIBS)
-
-else # !SYSTEM_LIBWPG
-
-libcdr_cflags += -I$(OUTDIR)/inc/external
-libcdr_libs += $(SOLARLIB)
-
-endif # SYSTEM_LIBWPG
-
-
-ifeq ($(SYSTEM_LCMS2),YES)
-
-else # !SYSTEM_LCMS2
-
-libcdr_cflags += -I$(OUTDIR)/inc/lcms2
-libcdr_libs += $(SOLARLIB)
-
-endif # SYSTEM_LCMS2
-
-zlib_cflags :=
-zlib_libs :=
-
-ifneq ($(SYSTEM_ZLIB),YES)
-
-zlib_cflags += -I$(OUTDIR)/inc/external/zlib
-zlib_libs += $(SOLARLIB)
-
-endif # !SYSTEM_ZLIB
-
 $(call gb_ExternalProject_get_state_target,libcdr,build) :
 	cd $(EXTERNAL_WORKDIR) \
 	&& PKG_CONFIG="" \
-	LIBCDR_CFLAGS="$(libcdr_cflags)" \
-	LIBCDR_LIBS="$(libcdr_libs)" \
-	ZLIB_CFLAGS="$(zlib_cflags)" \
-	ZLIB_LIBS="$(zlib_libs)" \
+	WPD_CFLAGS="$(WPD_CFLAGS)" \
+	WPD_LIBS="$(WPD_LIBS)" \
+	WPG_CFLAGS="$(WPG_CFLAGS)" \
+	WPG_LIBS="$(WPG_LIBS)" \
+	LCMS2_CFLAGS="$(LCMS2_CFLAGS)" \
+	LCMS2_LIBS="$(LCMS2_LIBS)" \
+	ZLIB_CFLAGS="$(ZLIB_CFLAGS)" \
+	ZLIB_LIBS="$(ZLIB_LIBS)" \
 	./configure \
 		--with-pic \
 		--enable-static \

libcdr/UnpackedTarball_cdr.mk

@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
+	libcdr/libcdr-configure.patch.1 \
+))
+
 # vim: set noet sw=4 ts=4: