diff options
| author | Petr Mladek <pmladek@plop.suse.cz> | 2010-09-21 15:08:03 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-09-21 16:59:12 +0200 |
| commit | 37cf85e2feaef2ddc9d1e7db66f5aca0d1d3fb84 (patch) | |
| tree | 1fab7178781740bcb9df94d0842911f0fd59b058 | |
| parent | 149d18600b6619a97b04f026afa84fb8a6d7a1e2 (diff) | |
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
| -rw-r--r-- | configure.in | 25 | ||||
| -rwxr-xr-x | ooo.lst | 2 |
2 files changed, 15 insertions, 12 deletions
diff --git a/configure.in b/configure.in index e18c46fe68e5..6dfa4dd6aea4 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 @@ -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 |