configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit b553b534575b2ef8e9dab96819c133414c4a0dc8
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Thu Sep 11 09:40:22 2014 +0200
untabify
Change-Id: I6a1abc2839de2c7b8508f7edabeec8016e67ba5c
diff --git a/configure.ac b/configure.ac
index d8bcb80..5b5ad1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10510,10 +10510,10 @@ if test "x$enable_gltf" != "xno" -a $_os != iOS -a
$_os != Android; then
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_FEATURE_GLTF,1)
if test "$with_system_libgltf" = "yes"; then
- SYSTEM_LIBGLTF=TRUE
- PKG_CHECK_MODULES( LIBGLTF, [libgltf-0.0 >= 0.0.1] )
+ SYSTEM_LIBGLTF=TRUE
+ PKG_CHECK_MODULES( LIBGLTF, [libgltf-0.0 >= 0.0.1] )
else
- BUILD_TYPE="$BUILD_TYPE LIBGLTF"
+ BUILD_TYPE="$BUILD_TYPE LIBGLTF"
fi
else
AC_MSG_RESULT([no])
commit 7860feb6ed1c8c2c60945a5c0b33595077228561
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Thu Sep 11 09:39:47 2014 +0200
system-gltf should follow system-libs
Change-Id: I123b6dd56c21cdecd218152396f8cb8366ef53b2
diff --git a/configure.ac b/configure.ac
index 561a15b..d8bcb80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1608,7 +1608,7 @@ AC_ARG_WITH(system-jpeg,
AC_ARG_WITH(system-libgltf,
AS_HELP_STRING([--with-system-libgltf],
[Use libgltf already on system.]),,
- [with_system_libgltf=auto])
+ [with_system_libgltf="$with_system_libs"])
AC_ARG_WITH(system-clucene,
AS_HELP_STRING([--with-system-clucene],
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
