[Libreoffice-commits] .: Branch 'libreoffice-4-0' - configure.ac

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Dec 10 12:07:56 PST 2012


 configure.ac |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 491f8c5b2422a3ca7ff23e80ac4fb70a37cb8adb
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Dec 10 19:06:48 2012 +0100

    no need for wget/curl when not fetching anything
    
    Change-Id: I097675450a0eed87eccf90356c81657485609d13
    Reviewed-on: https://gerrit.libreoffice.org/1289
    Tested-by: Matúš Kukan <matus.kukan at gmail.com>
    Reviewed-by: Matúš Kukan <matus.kukan at gmail.com>

diff --git a/configure.ac b/configure.ac
index ad5e9f3..5d48f02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11493,6 +11493,10 @@ AC_SUBST(SCPDEFS)
 #
 WGET=
 MD5SUM=
+CURL=
+
+if test "$enable_fetch_external" != "no"; then
+
 CURL=`which curl 2>/dev/null`
 
 for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/wget /opt/local/bin/wget; do
@@ -11534,6 +11538,8 @@ if test -z "$MD5SUM"; then
     add_warning "no md5sum: found!"
 fi
 
+fi
+
 AC_SUBST(WGET)
 AC_SUBST(CURL)
 AC_SUBST(MD5SUM)


More information about the Libreoffice-commits mailing list