[Libreoffice-commits] .: Branch 'libreoffice-3-3' - configure.in

[Petr Mladek]

 configure.in |   28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

New commits:
commit a30dbfda2fc82d9c342c2c31a443a2ed42e021c0
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Nov 22 14:56:22 2010 +0100

    add --without-download configure options
    
    It disables check for wget and curl; They are not called when
    building packages in the Build Service and thus need not be
    in build requires.

diff --git a/configure.in b/configure.in
index 4724226..31f40ff 100755
--- a/configure.in
+++ b/configure.in
@@ -429,6 +429,13 @@ AC_ARG_WITH(split,
                           tarball or so.],
 ,with_split=yes)
 
+AC_ARG_WITH(download,
+[
+  --without-download      Do not check for wget or curl. It is useful to
+                          reduce package build requires. All files must be
+                          in the package sources out of box.],
+,)
+
 AC_ARG_WITH(srcdir,
 [
   --with-srcdir           Define the directory where to download the source
@@ -614,10 +621,17 @@ AC_SUBST(SPLIT)
 PIECE=$with_piece
 AC_SUBST(PIECE)
 
-# FIXME: We currently do not support starting build with already unpackaged
-# sources, so the following warning is always printed
-warn_use_download="        ./download
+AC_MSG_CHECKING( for explicitely disabled download )
+if test "z$with_download" = "zno"; then
+    ENABLE_DOWNLOAD=no
+    AC_MSG_RESULT([yes])
+else
+    ENABLE_DOWNLOAD=yes
+    warn_use_download="        ./download
 "
+    AC_MSG_RESULT([no])
+fi
+
 AC_MSG_CHECKING( for directory where to download sources )
 if test "z$with_srcdir" = "z"; then
     SRCDIR=$BASEDIR/src
@@ -1106,9 +1120,11 @@ fi
 AC_MSG_RESULT([$GNUTAR])
 AC_SUBST(GNUTAR)
 
-AC_PATH_PROGS(GET_CMD, [wget curl])
-if test -z "$GET_CMD" ; then
-    AC_MSG_ERROR([Neither "wget" nor "curl" found, but needed for download])
+if test "z$ENABLE_DOWNLOAD" = "zyes" ; then
+    AC_PATH_PROGS(GET_CMD, [wget curl])
+    if test -z "$GET_CMD" ; then
+        AC_MSG_ERROR([Neither "wget" nor "curl" found, but needed for download])
+    fi
 fi
 
 AC_MSG_CHECKING([for favourite drink])