Attachment #387788 for bug #523934

Lines 184-190 $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) Link Here

(-)a/Makefile.fetch (-1 / +1 lines)
184	$(call fetch_Optional,NSS,NSS_TARBALL) \	184	$(call fetch_Optional,NSS,NSS_TARBALL) \
185	$(call fetch_Optional_pack,NUMBERTEXT_EXTENSION_PACK) \	185	$(call fetch_Optional_pack,NUMBERTEXT_EXTENSION_PACK) \
186	$(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \	186	$(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \
187	$(call fetch_Optional,COLLADA2GLTF,OPENCOLLADA_TARBALL) \	187	$(call fetch_Optional,OPENCOLLADA,OPENCOLLADA_TARBALL) \
188	$(call fetch_Optional,OPENLDAP,OPENLDAP_TARBALL) \	188	$(call fetch_Optional,OPENLDAP,OPENLDAP_TARBALL) \
189	$(call fetch_Optional,OPENSSL,OPENSSL_TARBALL) \	189	$(call fetch_Optional,OPENSSL,OPENSSL_TARBALL) \
190	$(call fetch_Optional,ORCUS,ORCUS_TARBALL) \	190	$(call fetch_Optional,ORCUS,ORCUS_TARBALL) \

Lines 3371-3376 endif # SYSTEN_LIBGLTF Link Here

(-)a/RepositoryExternal.mk (+16 lines)
3371		3371
3372	ifeq ($(ENABLE_COLLADA),TRUE)	3372	ifeq ($(ENABLE_COLLADA),TRUE)
3373		3373
		3374	ifeq ($(SYSTEM_OPENCOLLADA),TRUE)
		3375
		3376	define gb_LinkTarget__use_opencollada_parser
		3377	$(call gb_LinkTarget_set_include,$(1),\
		3378	$$(INCLUDE) \
		3379	$(OPENCOLLADA_CFLAGS) \
		3380	)
		3381
		3382	$(call gb_LinkTarget_add_libs,$(1),$(OPENCOLLADA_LIBS))
		3383
		3384	endef
		3385
		3386	else # !SYSTEM_OPENCOLLADA
		3387
3374	define gb_LinkTarget__use_opencollada_parser	3388	define gb_LinkTarget__use_opencollada_parser
3375	$(call gb_LinkTarget_set_include,$(1),\	3389	$(call gb_LinkTarget_set_include,$(1),\
3376	-I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \	3390	-I$(call gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \
Lines 3385-3390 $(call gb_LinkTarget_use_static_libraries,$(1),\ Link Here
3385	)	3399	)
3386	endef	3400	endef
3387		3401
		3402	endif # SYSTEM_OPENCOLLADA
		3403
3388	define gb_LinkTarget__use_collada2gltf	3404	define gb_LinkTarget__use_collada2gltf
3389	$(call gb_LinkTarget_set_include,$(1),\	3405	$(call gb_LinkTarget_set_include,$(1),\
3390	-I$(call gb_UnpackedTarball_get_dir,collada2gltf) \	3406	-I$(call gb_UnpackedTarball_get_dir,collada2gltf) \

Lines 1641-1646 AC_ARG_WITH(system-ucpp, Link Here

(-)a/configure.ac (+35 lines)
1641	[Use ucpp already on system.]),,	1641	[Use ucpp already on system.]),,
1642	[])	1642	[])
1643		1643
		1644	AC_ARG_WITH(system-opencollada,
		1645	AS_HELP_STRING([--with-system-opencollada],
		1646	[Use openCOLLADA already on system.]),,
		1647	[with_system_opencollada=no])
		1648
1644	AC_ARG_WITH(system-openldap,	1649	AC_ARG_WITH(system-openldap,
1645	AS_HELP_STRING([--with-system-openldap],	1650	AS_HELP_STRING([--with-system-openldap],
1646	[Use the OpenLDAP LDAP SDK already on system.]),,	1651	[Use the OpenLDAP LDAP SDK already on system.]),,
Lines 10342-10352 if test "$enable_collada" != "no" -a "$ENABLE_GLTF" = "TRUE"; then Link Here
10342	AC_MSG_RESULT([yes])	10347	AC_MSG_RESULT([yes])
10343	ENABLE_COLLADA=TRUE	10348	ENABLE_COLLADA=TRUE
10344	AC_DEFINE(HAVE_FEATURE_COLLADA,1)	10349	AC_DEFINE(HAVE_FEATURE_COLLADA,1)
		10350	AC_MSG_CHECKING([which OPENCOLLADA to use])
		10351	if test "$with_system_opencollada" = "yes"; then
		10352	AC_MSG_RESULT([external])
		10353	SYSTEM_OPENCOLLADA=TRUE
		10354	AS_IF([test -n "$OPENCOLLADA_CFLAGS"],[],[AC_MSG_ERROR([export OPENCOLLADA_CFLAGS])])
		10355	AS_IF([test -n "$OPENCOLLADA_LIBS"],[],[AC_MSG_ERROR([export OPENCOLLADA_LIBS])])
		10356	AC_LANG_PUSH([C++])
		10357	save_CXXFLAGS=$CXXFLAGS
		10358	save_CPPFLAGS=$CPPFLAGS
		10359	CXXFLAGS="$CXXFLAGS $OPENCOLLADA_CFLAGS"
		10360	CPPFLAGS="$CPPFLAGS $OPENCOLLADA_CFLAGS"
		10361	AC_CHECK_HEADERS(
		10362	COLLADABU.h \
		10363	COLLADAFW.h \
		10364	COLLADASaxFWLLoader.h \
		10365	GeneratedSaxParser.h,
		10366	[],
		10367	[AC_MSG_ERROR([openCOLLADA headers not found. Install openCOLLADA])],
		10368	[])
		10369	CXXFLAGS=$save_CXXFLAGS
		10370	CPPFLAGS=$save_CPPFLAGS
		10371	AC_LANG_POP([C++])
		10372	OPENCOLLADA_CFLAGS=$(printf '%s' "$OPENCOLLADA_CFLAGS" \| sed -e "s/-I/${ISYSTEM?}/g")
		10373	else
		10374	AC_MSG_RESULT([internal])
		10375	BUILD_TYPE="$BUILD_TYPE OPENCOLLADA"
		10376	fi
10345	BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF"	10377	BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF"
10346	else	10378	else
10347	AC_MSG_RESULT([no])	10379	AC_MSG_RESULT([no])
10348	fi	10380	fi
10349	AC_SUBST(ENABLE_COLLADA)	10381	AC_SUBST(ENABLE_COLLADA)
		10382	AC_SUBST([OPENCOLLADA_CFLAGS])
		10383	AC_SUBST([OPENCOLLADA_LIBS])
		10384	AC_SUBST([SYSTEM_OPENCOLLADA])
10350		10385
10351	# pdf import?	10386	# pdf import?
10352	AC_MSG_CHECKING([whether to build the PDF import feature])	10387	AC_MSG_CHECKING([whether to build the PDF import feature])

Lines 75-81 $(eval $(call gb_Module_add_moduledirs,external,\ Link Here

(-)a/external/Module_external.mk (-2 / +1 lines)
75	$(call gb_Helper_optional,NEON,neon) \	75	$(call gb_Helper_optional,NEON,neon) \
76	$(call gb_Helper_optional,NSS,nss) \	76	$(call gb_Helper_optional,NSS,nss) \
77	$(call gb_Helper_optional,ODFGEN,libodfgen) \	77	$(call gb_Helper_optional,ODFGEN,libodfgen) \
78	$(call gb_Helper_optional,COLLADA2GLTF,opencollada) \	78	$(call gb_Helper_optional,OPENCOLLADA,opencollada) \
79	$(call gb_Helper_optional,OPENLDAP,openldap) \	79	$(call gb_Helper_optional,OPENLDAP,openldap) \
80	$(call gb_Helper_optional,OPENSSL,openssl) \	80	$(call gb_Helper_optional,OPENSSL,openssl) \
81	$(call gb_Helper_optional,ORCUS,liborcus) \	81	$(call gb_Helper_optional,ORCUS,liborcus) \
82	-

Return to bug 523934

Lines 431-437 export OOOP_SAMPLES_PACK=@OOOP_SAMPLES_PACK@ Link Here

(-)a/config_host.mk.in (-1 / +3 lines)
431	export OOOP_TEMPLATES_PACK=@OOOP_TEMPLATES_PACK@	431	export OOOP_TEMPLATES_PACK=@OOOP_TEMPLATES_PACK@
432	export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@	432	export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@
433	export OOO_VENDOR=@OOO_VENDOR@	433	export OOO_VENDOR=@OOO_VENDOR@
434	export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@	434	export OPENCOLLADA_CFLAGS=$(gb_SPACE)@OPENCOLLADA_CFLAGS@
		435	export OPENCOLLADA_LIBS=$(gb_SPACE)@OPENCOLLADA_LIBS@
435	export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@	436	export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@
436	export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@	437	export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@
437	export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@	438	export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@
Lines 558-563 export SYSTEM_NPAPI_HEADERS=@SYSTEM_NPAPI_HEADERS@ Link Here
558	export SYSTEM_NSS=@SYSTEM_NSS@	559	export SYSTEM_NSS=@SYSTEM_NSS@
559	export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@	560	export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@
560	export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@	561	export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@
		562	export SYSTEM_OPENCOLLADA=@SYSTEM_OPENCOLLADA@
561	export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@	563	export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@
562	export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@	564	export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@
563	export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@	565	export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@