[Libreoffice-commits] .: 2 commits - configure.in

[Tomáš Chvátal]

 configure.in |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 713ec115d5d7fb7cdab39bc55b5c0b97bba2313e
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Sat Sep 17 04:20:25 2011 +0200

    Enable some extensions by default, describe system-libs better.

diff --git a/configure.in b/configure.in
index 13f8244..8a4c4da 100755
--- a/configure.in
+++ b/configure.in
@@ -70,18 +70,18 @@ AC_ARG_ENABLE(ext-oooblogger,
 ,)
 
 AC_ARG_ENABLE(ext-pdfimport,
-    AS_HELP_STRING([--enable-ext-pdfimport],
-        [Enables the PDF Import extension and xpdf.]),
+    AS_HELP_STRING([--disable-ext-pdfimport],
+        [Disables the PDF Import extension.]),
 ,)
 
 AC_ARG_ENABLE(ext-presenter-console,
-    AS_HELP_STRING([--enable-ext-presenter-console],
-        [Enables the Presenter Console extension.]),
+    AS_HELP_STRING([--disable-ext-presenter-console],
+        [Disables the Presenter Console extension.]),
 ,)
 
 AC_ARG_ENABLE(ext-presenter-minimizer,
-    AS_HELP_STRING([--enable-ext-presenter-minimizer],
-        [Enables the Presentation Minimizer extension.]),
+    AS_HELP_STRING([--disable-ext-presenter-minimizer],
+        [Disables the Presentation Minimizer extension.]),
 ,)
 
 AC_ARG_ENABLE(ext-report-builder,
@@ -679,8 +679,8 @@ AC_ARG_WITH(external-thes-dir,
 
 AC_ARG_WITH(system-libs,
     AS_HELP_STRING([--with-system-libs],
-        [Use libs already on system -- enables all --with-system-* flags except
-         mozilla and odbc/sane/xrender-header(s).]),
+        [Use libraries already on system -- enables all --with-system-* flags except
+         mozilla, libvisio, libtextcat and translate-toolkit.]),
 ,)
 
 AC_ARG_WITH(system-headers,
commit 25b90c055a1f183dfad537ac59d1988faeac15cf
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Sat Sep 17 03:19:28 2011 +0200

    Check for hsqldb only if --with-java is passed.

diff --git a/configure.in b/configure.in
index 7f6a861..13f8244 100755
--- a/configure.in
+++ b/configure.in
@@ -5156,6 +5156,7 @@ fi
 dnl ===================================================================
 dnl Check for system hsqldb
 dnl ===================================================================
+if test "$with_java" != "no"; then
 AC_MSG_CHECKING([which hsqldb to use])
 if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \
        test "$with_system_hsqldb" != "no" && test "$with_system_jars" != "no"; then
@@ -5200,6 +5201,7 @@ else
 fi
 AC_SUBST(SYSTEM_HSQLDB)
 AC_SUBST(HSQLDB_JAR)
+fi
 
 dnl ===================================================================
 dnl Check for system beanshell