[Libreoffice-commits] .: 2 commits - configure.in solenv/gbuild

[David Tardon]

 configure.in                |   26 ++++++++++++--------------
 solenv/gbuild/LinkTarget.mk |    9 ++++++++-
 2 files changed, 20 insertions(+), 15 deletions(-)

New commits:
commit 09cd5c460704ddd99669a61ae335bfb2ce357140
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Jun 3 12:33:09 2012 +0200

    do not check for win-specific stuff on mingw
    
    Change-Id: I8316e1ce35d059938da35651c0fa1412b8648a7d

diff --git a/configure.in b/configure.in
index 911588f..ba797fd 100644
--- a/configure.in
+++ b/configure.in
@@ -2523,7 +2523,7 @@ AC_SUBST(MAC_OS_X_VERSION_MAX_ALLOWED)
 dnl ===================================================================
 dnl Windows specific tests and stuff
 dnl ===================================================================
-if test "$_os" = "WINNT"; then
+if test "$_os" = "WINNT" -a "$WITH_MINGW" != yes; then
     dnl Set the CL_X64 variable if we are building a 64-bit LibreOffice.
     AC_MSG_CHECKING([whether to build a 64-bit LibreOffice])
     if test "$enable_cl_x64" = "" -o "$enable_cl_x64" = "no"; then
@@ -2533,7 +2533,6 @@ if test "$_os" = "WINNT"; then
         CL_X64="TRUE"
         AC_MSG_RESULT([yes])
     fi
-    AC_SUBST(CL_X64)
 
     AC_MSG_CHECKING([whether to use DirectX])
     if test "$enable_directx" = "yes" -o "$enable_directx" = ""; then
@@ -2543,7 +2542,6 @@ if test "$_os" = "WINNT"; then
         ENABLE_DIRECTX=""
         AC_MSG_RESULT([no])
     fi
-    AC_SUBST(ENABLE_DIRECTX)
 
     AC_MSG_CHECKING([whether to use ActiveX])
     if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then
@@ -2554,27 +2552,27 @@ 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"; then
+    if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then
         DISABLE_ATL=""
         AC_MSG_RESULT([yes])
-    elif test "$enable_atl" = ""; then
-        if test "$WITH_MINGW" = "yes"; then
-            DISABLE_ATL="TRUE"
-            AC_MSG_RESULT([no])
-        else
-            DISABLE_ATL=""
-            AC_MSG_RESULT([yes])
-        fi
     else
         DISABLE_ATL="TRUE"
         AC_MSG_RESULT([no])
     fi
-    AC_SUBST(DISABLE_ATL)
+else
+    CL_X64=""
+    ENABLE_DIRECTX=""
+    DISABLE_ACTIVEX="TRUE"
+    DISABLE_ATL="TRUE"
 fi
 
+AC_SUBST(CL_X64)
+AC_SUBST(ENABLE_DIRECTX)
+AC_SUBST(DISABLE_ACTIVEX)
+AC_SUBST(DISABLE_ATL)
+
 dnl ===================================================================
 dnl  Test the gcc version
 dnl ===================================================================
commit 38b32390cd39c9179f1fb36f2523a2343e69646d
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Jun 3 12:10:20 2012 +0200

    use API headers from OUTDIR
    
    Change-Id: I77a647d7f24efa9159a85d0085e0306a8019e3da

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 1854aa4..e4185a0 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -630,8 +630,15 @@ $$(call gb_Output_error,\
  gb_LinkTarget_add_api: use gb_LinkTarget_use_api instead.)
 endef
 
+define gb_LinkTarget__use_api
+$(call gb_LinkTarget_get_target,$(1)) :| $(call gb_UnoApi_get_target,$(2))
+$(call gb_LinkTarget_use_package,$(1),$(2)_inc)
+$(call gb_LinkTarget__add_include,$(1),$(OUTDIR)/inc/$(2))
+
+endef
+
 define gb_LinkTarget_use_api
-$(foreach api,$(2),$(call gb_LinkTarget__use_internal_api_one,$(1),$(api)))
+$(foreach api,$(2),$(call gb_LinkTarget__use_api,$(1),$(api)))
 
 endef