svn commit: r1389343 - /incubator/ooo/trunk/main/configure.in

[ar...@apache.org]

Author: arielch
Date: Mon Sep 24 12:52:06 2012
New Revision: 1389343

URL: http://svn.apache.org/viewvc?rev=1389343&view=rev
Log:
ATL/ActiveX configure fixes

Disable ActiveX when ATL is disabled.
Do not check ATL/MFC only when ATL is disabled, this will allow
configuring with --disable-activex and ATL enabled.

Modified:
    incubator/ooo/trunk/main/configure.in

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1389343&r1=1389342&r2=1389343&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Mon Sep 24 12:52:06 2012
@@ -1529,7 +1529,6 @@ if test "$_os" = "WINNT"; then
       DISABLE_ACTIVEX="TRUE"
       AC_MSG_RESULT([no])
    fi
-   AC_SUBST(DISABLE_ACTIVEX)
 
    AC_MSG_CHECKING([whether to use ATL])
    if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then
@@ -1537,9 +1536,13 @@ if test "$_os" = "WINNT"; then
       AC_MSG_RESULT([yes])
    else
       DISABLE_ATL="TRUE"
+      dnl ActiveX depends on ATL, it should be disabled
+      DISABLE_ACTIVEX="TRUE"
       AC_MSG_RESULT([no])
    fi
+
    AC_SUBST(DISABLE_ATL)
+   AC_SUBST(DISABLE_ACTIVEX)
 
 fi
 
@@ -5749,8 +5752,8 @@ dnl Check for ATL and MFC
 dnl ============================================
 if test \( "$_os" = "WINNT" \) ; then
     AC_MSG_CHECKING([for ATL and MFC])
-    if test "$DISABLE_ATL" = "TRUE" -o "$DISABLE_ACTIVEX" = "TRUE" ; then
-        AC_MSG_RESULT([ATL/MFC disabled])
+    if test "$DISABLE_ATL" = "TRUE"; then
+        AC_MSG_RESULT([ATL is disabled, nothing to check])
     else
         AC_MSG_NOTICE([testing ATL/MFC libs and includes])
         if test -z "$with_atl_include_dir"; then