[ooo-build-commit] .: 2 commits - configure.in Makefile.in ooo.lst set_soenv.in

[Petr Mladek]

 Makefile.in  |    1 +
 configure.in |   25 +++++++++++++------------
 ooo.lst      |    2 ++
 set_soenv.in |    3 ---
 4 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 2ea3ac86d3549ae73845e253b747fe2eb65c13f6
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Sep 21 16:33:40 2010 +0200

    Call fetch_tarballs.sh from make

diff --git a/Makefile.in b/Makefile.in
index 978e193..2b201b3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,6 +4,7 @@ SHELL=/bin/sh
 
 all:
 	. ./*[Ee]nv.[Ss]et.sh && \
+	./fetch_tarballs.sh ooo.lst && \
 	./bootstrap && \
 		cd instsetoo_native && ../solenv/bin/build.pl -P at BUILD_NCPUS@ --all -P at BUILD_MAX_JOBS@
 
diff --git a/set_soenv.in b/set_soenv.in
index 5b5ab4b..068389d 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -2118,9 +2118,6 @@ print "*********************************************************".
       "******************* $newline";
 
 print "\nTo build, do:\n";
-print "  \$ source $outfile.sh\n";
-print "  \$ ./bootstrap\n";
-print "  \$ ./fetch_tarballs.sh\n";
 print "  \$ make\n\n";
 print "Developer installation (after you have built):\n";
 print "  \$ make dev-install\n\n";
commit cfe2e76112b7a6489140140ecc5e6747359d2cc6
Author: Petr Mladek <pmladek at plop.suse.cz>
Date:   Tue Sep 21 15:08:03 2010 +0200

    better unowinreg.dll configure check
    
    There was dead-lock; configure did not pass without unowinreg.dll;
    fetch_tarballs.sh did not work without configure => always fetch
    unowinreg.dll; do not require it in configure; add --enable-build-unowinreg
    if you want to force rebuild

diff --git a/configure.in b/configure.in
index e18c46f..6dfa4dd 100644
--- a/configure.in
+++ b/configure.in
@@ -819,6 +819,12 @@ AC_ARG_WITH(zip-home,
 
                           Usage: --with-zip-home=<path to zip executable>
 ],,)
+AC_ARG_ENABLE(build-unowinreg,
+[  --enable-build-unowinreg Do not use the prebuilt unowinreg.dll. Build it instead.
+                          The MinGW C++ compiler is needed on Linux.
+
+                          Usage: --enable-build-unowinreg
+],,)
 AC_ARG_WITH(mingwin,
 [  --with-mingwin          For Windows users, use the mingwin32 compiler within
                           cygwin environment
@@ -3622,21 +3628,16 @@ AC_MSG_CHECKING([whether to build the ODK])
 if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then
    AC_MSG_RESULT([yes])
    if test "$WITH_JAVA" != "no"; then
-   AC_MSG_CHECKING([for external/unowinreg/unowinreg.dll])
-   if ! test -f "./external/unowinreg/unowinreg.dll"; then
-      HAVE_UNOWINREG_DLL=no
-   else
-      HAVE_UNOWINREG_DLL=yes
+   AC_MSG_CHECKING([whether to build unowinreg.dll])
+   if test "$_os" = "WINNT" -a "z$enable_build_unowinreg" = "z" ; then
+        # build on Win by default
+        enable_build_unowinreg=yes
    fi
-   if test "$HAVE_UNOWINREG_DLL" = "yes"; then
-      AC_MSG_RESULT([found])
+   if test "z$enable_build_unowinreg" = "z" -o "$enable_build_unowinreg" = "no"; then
+      AC_MSG_RESULT([no])
       BUILD_UNOWINREG=NO
    else
-      if test "$_os" = "WINNT"; then
-         AC_MSG_RESULT([not found, will be built])
-      else
-         AC_MSG_WARN([not found, will be cross-built using mingw32])
-      fi
+      AC_MSG_RESULT([yes])
       BUILD_UNOWINREG=YES
    fi
    if test "$_os" != "WINNT" && test "$BUILD_UNOWINREG" = "YES"; then
diff --git a/ooo.lst b/ooo.lst
index 8e047fc..3e379fa 100755
--- a/ooo.lst
+++ b/ooo.lst
@@ -80,3 +80,5 @@ http://download.go-oo.org/SRC680
 db556b750bf3eac8481a4cc5e29e5af1-libwpg-0.1.3.tar.gz
 http://download.go-oo.org/libwpd
 64d66018897d759358f454010b6e75d2-libwpd-0.8.14.tar.gz
+http://download.go-oo.org/extern
+185d60944ea767075d27247c3162b3bc-unowinreg.dll