[ooo-build-commit] .: bin/unpack configure.in download.in

[Petr Mladek]

 bin/unpack   |   10 ----------
 configure.in |   13 -------------
 download.in  |    6 ------
 3 files changed, 29 deletions(-)

New commits:
commit 4074940c7da69fd90d05d374e1e183a7e30624cb
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Sep 21 17:15:55 2010 +0200

    Get unowinreg.dll by bootstrap/fetch_tarballs.sh
    
    The fetched file name is 185d60944ea767075d27247c3162b3bc-unowinreg.dll.
    It is enough to keep it together with the other fetched files in the
    TARFILE_LOCATION

diff --git a/bin/unpack b/bin/unpack
index fb3618c..5504cae 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -355,16 +355,6 @@ if test "z$PIECE" = "z"; then
     fi
 fi
 
-# copy in unowinreg.dll if we need to
-# it is necessary in ODK
-# it can be built even on linux by mingw32, though
-if test "z$PIECE" = "z" ; then
-if test "$USE_PREBUILD_UNOWINREG_DLL" = "YES" ; then
-    mkdir -p $OOBUILDDIR/external/unowinreg/ || exit 1;
-    $GNUCP -f $SRCDIR/unowinreg.dll $OOBUILDDIR/external/unowinreg/ || exit 1;
-fi
-fi
-
 # copy in the prebuilt jsr173_1.0_api.jar if available
 # allows to build with JDK 1.4
 JSR_API_JAR=jsr173_1.0_api.jar
diff --git a/configure.in b/configure.in
index 9d224d2..1423448 100644
--- a/configure.in
+++ b/configure.in
@@ -1242,19 +1242,6 @@ else
 fi
 AC_SUBST(ENABLE_ODK)
 
-AC_MSG_CHECKING([whether to use prebuilt unowinreg.dll])
-if test "$ENABLE_ODK" = "TRUE" -a \
-        "$with_win32" != "yes" -a \
-        "$with_java" != "no" -a \
-        [ -z "$with_mingwin" -o "$with_mingwin" = "no" ] ; then
-    USE_PREBUILD_UNOWINREG_DLL=YES
-    AC_MSG_RESULT([yes])
-else
-    USE_PREBUILD_UNOWINREG_DLL=NO
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(USE_PREBUILD_UNOWINREG_DLL)
-
 AC_MSG_CHECKING([whether to enable graphite support])
 # if test -n "$enable_graphite" -o "$enable_graphite" != "no"; then
 if test -n "$enable_graphite" -a "$enable_graphite" != "no"; then
diff --git a/download.in b/download.in
index 39c8785..6b2eca0 100755
--- a/download.in
+++ b/download.in
@@ -154,8 +154,6 @@ sub download_tests_dependencies() {
     'wintools\.zip'                      => 'http://ftp.mozilla.org/pub/mozilla.org/mozilla/source/',
 # Prebuilt Mozilla bits
     'WNTMSCI.*\.zip'                     => 'http://tools.openoffice.org/moz_prebuild/OOo3.2',
-# SDK bits
-    'unowinreg\.dll'                     => 'http://tools.openoffice.org/unowinreg_prebuild/680/',
 # Windows .ico icons
     'ooo-windows-icons-0.2.tar.bz2'      => '@MIRROR@/OOO300',
 # Updated libwpd
@@ -512,10 +510,6 @@ if (!$SPLIT && ($download_all || '@ENABLE_BINFILTER@' eq 'TRUE')) {
     source_file_ooo( "binfilter" );
 }
 
-if ('@USE_PREBUILD_UNOWINREG_DLL@' eq 'YES') {
-    source_file( "unowinreg.dll" );
-}
-
 if ( $download_all || ( '@OOO_LANGS@' ne '' && '@OOO_LANGS@' ne 'en-US' ) || '@BUILD_WIN32@' ne '' ) {
     source_file_ooo( "l10n" );
 }