[Libreoffice-commits] core.git: config_host.mk.in configure.ac sd/Library_sd.mk

[Rene Engelhard]

 config_host.mk.in |    1 +
 configure.ac      |    8 +++++++-
 sd/Library_sd.mk  |    7 ++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 2c5faba2a34d5feb9a6ea9d4fd9bf94ce914a19d
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Oct 6 16:29:04 2013 +0200

    make system-bluez build not use -I$S/bluez_bluetooth/inc in sd...
    
    Change-Id: Icdd90a7aadf7cfbc464e11a1e0386576cbc5c06c

diff --git a/config_host.mk.in b/config_host.mk.in
index deb3e2f..4536c21 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -157,6 +157,7 @@ export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@
 export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@
 export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
 export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@
+export SYSTEM_BLUEZ=@SYSTEM_BLUEZ@
 export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@
 export ENABLE_SYMBOLS=@ENABLE_SYMBOLS@
 export ENABLE_SYSTRAY_GTK=@ENABLE_SYSTRAY_GTK@
diff --git a/configure.ac b/configure.ac
index 1cf6c53..c98b42c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10031,28 +10031,34 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
                     AC_MSG_RESULT([external])
                     AC_CHECK_HEADER(bluetooth/bluetooth.h, [],
                         [AC_MSG_ERROR(bluetooth.h not found. install bluez)], [])
+		    SYSTEM_BLUEZ=YES
                 else
                     AC_MSG_RESULT([internal])
-                    BUILD_TYPE="$BUILD_TYPE BLUEZ"
+	            SYSTEM_BLUEZ=NO
                 fi
             else
                 AC_MSG_RESULT([no, dbus disabled])
                 ENABLE_SDREMOTE_BLUETOOTH=
+                SYSTEM_BLUEZ=NO 
             fi
         else
             AC_MSG_RESULT([yes])
             ENABLE_SDREMOTE_BLUETOOTH=TRUE
+            SYSTEM_BLUEZ=NO
         fi
     else
         AC_MSG_RESULT([no])
         ENABLE_SDREMOTE_BLUETOOTH=
+        SYSTEM_BLUEZ=NO
     fi
 else
     ENABLE_SDREMOTE=
+    SYSTEM_BLUEZ=NO
     AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_SDREMOTE)
 AC_SUBST(ENABLE_SDREMOTE_BLUETOOTH)
+AC_SUBST(SYSTEM_BLUEZ)
 
 dnl ===================================================================
 dnl Check whether the gtk 2.0 libraries are available.
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 3ec4771..be29e38 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -38,13 +38,18 @@ $(eval $(call gb_Library_add_sdi_headers,sd,\
 
 $(eval $(call gb_Library_set_include,sd,\
 	$$(INCLUDE) \
-	-I$(SRCDIR)/bluez_bluetooth/inc \
 	-I$(SRCDIR)/sd/inc \
 	-I$(SRCDIR)/sd/source/ui/inc \
 	-I$(SRCDIR)/sd/source/ui/slidesorter/inc \
 	-I$(WORKDIR)/SdiTarget/sd/sdi \
 ))
 
+ifneq ($(SYSTEM_BLUEZ),YES)
+$(eval $(call gb_Library_add_cxxflags,sd,\
+	-I$(SRCDIR)/bluez_bluetooth/inc \
+))
+endif
+
 $(eval $(call gb_Library_add_defs,sd,\
 	-DSD_DLLIMPLEMENTATION \
 ))