make libcmis build aginst internal cppunit

cppunit/makefile.mk

@@ -144,7 +144,7 @@ CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_FLAGS = install
 
-OUTDIR2INC = ooo-install/include/cppunit
+OUTDIR2INC = ooo-install/include/cppunit ooo-install/lib/pkgconfig
 
 OUT2BIN = ooo-install/bin/DllPlugInTester
 .IF "$(OS)" == "MACOSX"

cppunit/prj/d.lst

@@ -36,3 +36,6 @@ symlink: %_DEST%\lib\libcppunit-1.12.a %_DEST%\lib\libcppunit.a
 ..\%__SRC%\bin\DllPlugInTester %_DEST%\bin\DllPlugInTester
 ..\%__SRC%\bin\DllPlugInTester.exe %_DEST%\bin\DllPlugInTester.exe
 ..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin\DllPlugInTester_dll.exe
+
+mkdir: %_DEST%\lib\pkgconfig
+..\%__SRC%\inc\pkgconfig\cppunit.pc %_DEST%\lib\pkgconfig\cppunit.pc

solenv/gbuild/ExternalLib.mk

@@ -97,7 +97,7 @@ define gb_ExternalLib__command_autotools
 	mkdir -p $(call gb_ExternalLib_get_builddir,$(1)) && \
 	tar -x -C $(call gb_ExternalLib_get_builddir,$(1)) --strip-component=1 -f $< && \
 	pushd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$$p || exit 1; done && \
-	CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" ./configure --prefix=$(OUTDIR) $(T_CONF_ARGS) && \
+	CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" PKG_CONFIG_PATH="$(OUTDIR)/lib/pkgconfig" ./configure --prefix=$(OUTDIR) $(T_CONF_ARGS) && \
 	for p in $(T_POST_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$p || exit 1; done
 	#we don't want a deployed rpath pointing into our solver, to-do, set correct ORIGIN-foo ?
 	pushd $(call gb_ExternalLib_get_builddir,$(1)) && if test -e libtool ; then sed -i 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec="",g' libtool && sed -i 's,^runpath_var=LD_RUN_PATH,runpath_var=DIE_RPATH_DIE,g' libtool; fi