diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-02-21 00:21:47 -0600 |
|---|---|---|
| committer | David Ostrovsky <David.Ostrovsky@gmx.de> | 2013-02-21 12:31:09 +0000 |
| commit | 437b044caea90badab6f99dc609ea07e37dc5feb (patch) | |
| tree | 81d0d0fac8d0bd5405026744d572abfb33c59700 /configure.ac | |
| parent | cc7c1110b2ae099925430de8a8faf5f8abf258a7 (diff) | |
clean-up the output and simplify the MOZAB driver config
Change-Id: Iff63e4dd2471d5b5c0e7c52344d694a0e46ce6a0
Reviewed-on: https://gerrit.libreoffice.org/2305
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 40 |
1 files changed, 14 insertions, 26 deletions
diff --git a/configure.ac b/configure.ac index 25145caf5145..c58f320286f1 100644 --- a/configure.ac +++ b/configure.ac @@ -8277,30 +8277,15 @@ dnl =================================================================== dnl Check for mozilla ab connectivity for windows dnl =================================================================== -AC_MSG_CHECKING([whether to enable build of Mozilla addressbook connectivity driver for Windows]) -if test "$enable_win_mozab_driver" = "yes" -a "$_os" = "WINNT" -a "$WITH_MINGW" != "YES" ; then - AC_MSG_RESULT([yes]) - WITH_MOZAB4WIN=YES - BUILD_MOZAB=YES - if test "$enable_build_mozab" = "no" ; then - BUILD_MOZAB=NO - fi -else - AC_MSG_RESULT([no]) - WITH_MOZAB4WIN=NO -fi -AC_SUBST(WITH_MOZAB4WIN) -AC_SUBST(BUILD_MOZAB) - -if test "$_os" != "WINNT"; then -# on all other platforms Mozilla addressbook connectivity -# is unconditionally built -# new and shiny mork driver - AC_MSG_RESULT([yes (new mork driver)]) -else - if test "$WITH_MOZAB4WIN" = "NO"; then - AC_MSG_RESULT([no]) - else +if test "$_os" = "WINNT"; then + AC_MSG_CHECKING([whether to enable build of Mozilla addressbook connectivity driver for Windows]) + if test "$enable_win_mozab_driver" = "yes" -a "$WITH_MINGW" != "YES" ; then + AC_MSG_RESULT([yes]) + WITH_MOZAB4WIN=YES + BUILD_MOZAB=YES + if test "$enable_build_mozab" = "no" ; then + BUILD_MOZAB=NO + fi AC_MSG_RESULT([yes, internal (old windows mozab driver)]) BUILD_TYPE="$BUILD_TYPE MOZ" EXTMSV80=`cygpath -u "$SRC_ROOT/external/msvcp80"` @@ -8331,10 +8316,13 @@ else and relaunch ./autogen.sh]) fi fi + else + AC_MSG_RESULT([no]) + WITH_MOZAB4WIN=NO fi fi - - +AC_SUBST(WITH_MOZAB4WIN) +AC_SUBST(BUILD_MOZAB) AC_SUBST(MSVC80_DLL_DIR) AC_SUBST(MSVC80_MNFST) AC_SUBST(EXTMSV80) |