[Libreoffice-commits] .: configure.in

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Sep 26 04:33:27 PDT 2012


 configure.in |   16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

New commits:
commit bacc9ed75e4e290ed0909445dfd8ec1e659fde97
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Sep 26 13:29:24 2012 +0200

    configure.in: remove obsolete --with-mozilla-version...
    
    ...and bitrotted code to check for checking downloaded file names that
    has been broken by e24c2e106e76d9b50a923ed27f8f8fdd2db9b93a.
    
    Change-Id: I5acda4246b46f1d5d4a54fe64a77ceae69b45a05

diff --git a/configure.in b/configure.in
index a1e6529..75f9c88 100644
--- a/configure.in
+++ b/configure.in
@@ -1276,12 +1276,6 @@ AC_ARG_WITH(system-nss,
         [Use NSS/nspr libraries already on system.]),,
     [with_system_nss="$with_system_libs"])
 
-AC_ARG_WITH(mozilla-version,
-    AS_HELP_STRING([--with-mozilla-version],
-        [Choose which version of Mozilla to use while building Mozilla.
-         (default=1.7.5) Note that not all versions are supported.]),
-,)
-
 AC_ARG_WITH(mozilla-toolkit,
     AS_HELP_STRING([--with-mozilla-toolkit],
         [Choose which GUI toolkit to use while building Mozilla components. (default=gtk2)]),
@@ -8014,15 +8008,7 @@ else
     SYSTEM_MOZILLA=NO
     BUILD_TYPE="$BUILD_TYPE MOZ"
     MOZ_TARBALL=a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
-    if test -z "$with_mozilla_version"; then
-        MOZILLA_VERSION=
-    else
-        AC_MSG_CHECKING([which Mozilla version to build])
-        MOZILLA_VERSION=$with_mozilla_version
-        enable_build_mozilla=1
-        AC_MSG_RESULT([$MOZILLA_VERSION])
-    fi
-
+    MOZILLA_VERSION=1.1.14
     AC_SUBST(MOZILLA_VERSION)
 
     AC_MSG_CHECKING([for toolkit Mozilla should use])


More information about the Libreoffice-commits mailing list