diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-29 14:14:31 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2014-08-29 12:43:47 -0500 |
| commit | 6d239ee19a4b1d9068fbd04b5a692c859142f613 (patch) | |
| tree | 186bb849ebb5affe5c3e205c0af470327971aa00 /configure.ac | |
| parent | 2378f45d70c9ce4a093fd6b09216c1cd4563ebe2 (diff) | |
Handle collada libraries seperately: --disable-collada
Depends on gltf support.
(cherry picked from commit 191f0944fd8fc30493eda58c7adfdfa0b538f507)
Conflicts:
config_host.mk.in
sd/source/ui/func/fuinsert.cxx
Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca
Reviewed-on: https://gerrit.libreoffice.org/11193
Tested-by: Rene Engelhard <rene@debian.org>
Reviewed-by: Rene Engelhard <rene@debian.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 63e067bb4e9c..b6e81245bb91 100644 --- a/configure.ac +++ b/configure.ac @@ -1395,6 +1395,10 @@ AC_ARG_ENABLE(gltf, AS_HELP_STRING([--disable-gltf], [Determines whether to build libraries related to glTF 3D model rendering.])) +AC_ARG_ENABLE(collada, + AS_HELP_STRING([--disable-collada], + [Disable collada support (Rendering 3D models stored in *.dae and *.kmz format).])) + dnl =================================================================== dnl Optional Packages (--with/without-) dnl =================================================================== @@ -10572,10 +10576,6 @@ if test "x$enable_gltf" != "xno" -a $_os != Darwin -a $_os != iOS -a $_os != And else BUILD_TYPE="$BUILD_TYPE LIBGLTF" fi - # otherwise build fails in collada2gltf external because of std::shared_ptr - if test "$have_std_shared_ptr" = "yes"; then - BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF" - fi else AC_MSG_RESULT([no]) fi @@ -10584,6 +10584,21 @@ AC_SUBST(SYSTEM_LIBGLTF) AC_SUBST(LIBGLTF_CFLAGS) AC_SUBST(LIBGLTF_LIBS) +dnl =================================================================== +dnl Check whether to enable COLLADA support +dnl =================================================================== +AC_MSG_CHECKING([whether to enable COLLADA support]) +ENABLE_COLLADA= +if test "$enable_collada" != "no" -a "$ENABLE_GLTF" = "TRUE" -a "$have_std_shared_ptr" = "yes"; then + AC_MSG_RESULT([yes]) + ENABLE_COLLADA=TRUE + AC_DEFINE(HAVE_FEATURE_COLLADA,1) + BUILD_TYPE="$BUILD_TYPE COLLADA2GLTF" +else + AC_MSG_RESULT([no]) +fi +AC_SUBST(ENABLE_COLLADA) + # pdf import? AC_MSG_CHECKING([whether to build the PDF import feature]) ENABLE_PDFIMPORT= |