mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Icdd90a7aadf7cfbc464e11a1e0386576cbc5c06c
This commit is contained in:
Rene Engelhard 2013-10-06 16:29:04 +02:00
parent a781ae0bb8
commit 2c5faba2a3
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config_host.mk.in
View File

@ -157,6 +157,7 @@ export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@
export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@ export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@
export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@ export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@ export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@
export SYSTEM_BLUEZ=@SYSTEM_BLUEZ@
export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@ export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@
export ENABLE_SYMBOLS=@ENABLE_SYMBOLS@ export ENABLE_SYMBOLS=@ENABLE_SYMBOLS@
export ENABLE_SYSTRAY_GTK=@ENABLE_SYSTRAY_GTK@ export ENABLE_SYSTRAY_GTK=@ENABLE_SYSTRAY_GTK@

8
configure.ac
View File

@ -10031,28 +10031,34 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
AC_CHECK_HEADER(bluetooth/bluetooth.h, [], AC_CHECK_HEADER(bluetooth/bluetooth.h, [],
[AC_MSG_ERROR(bluetooth.h not found. install bluez)], []) [AC_MSG_ERROR(bluetooth.h not found. install bluez)], [])
SYSTEM_BLUEZ=YES
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE BLUEZ" SYSTEM_BLUEZ=NO
fi fi
else else
AC_MSG_RESULT([no, dbus disabled]) AC_MSG_RESULT([no, dbus disabled])
ENABLE_SDREMOTE_BLUETOOTH= ENABLE_SDREMOTE_BLUETOOTH=
SYSTEM_BLUEZ=NO
fi fi
else else
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_SDREMOTE_BLUETOOTH=TRUE ENABLE_SDREMOTE_BLUETOOTH=TRUE
SYSTEM_BLUEZ=NO
fi fi
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
ENABLE_SDREMOTE_BLUETOOTH= ENABLE_SDREMOTE_BLUETOOTH=
SYSTEM_BLUEZ=NO
fi fi
else else
ENABLE_SDREMOTE= ENABLE_SDREMOTE=
SYSTEM_BLUEZ=NO
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
AC_SUBST(ENABLE_SDREMOTE) AC_SUBST(ENABLE_SDREMOTE)
AC_SUBST(ENABLE_SDREMOTE_BLUETOOTH) AC_SUBST(ENABLE_SDREMOTE_BLUETOOTH)
AC_SUBST(SYSTEM_BLUEZ)
dnl =================================================================== dnl ===================================================================
dnl Check whether the gtk 2.0 libraries are available. dnl Check whether the gtk 2.0 libraries are available.

7
sd/Library_sd.mk
View File

@ -38,13 +38,18 @@ $(eval $(call gb_Library_add_sdi_headers,sd,\
$(eval $(call gb_Library_set_include,sd,\ $(eval $(call gb_Library_set_include,sd,\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(SRCDIR)/bluez_bluetooth/inc \
-I$(SRCDIR)/sd/inc \ -I$(SRCDIR)/sd/inc \
-I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/source/ui/inc \
-I$(SRCDIR)/sd/source/ui/slidesorter/inc \ -I$(SRCDIR)/sd/source/ui/slidesorter/inc \
-I$(WORKDIR)/SdiTarget/sd/sdi \ -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,\ $(eval $(call gb_Library_add_defs,sd,\
-DSD_DLLIMPLEMENTATION \ -DSD_DLLIMPLEMENTATION \
)) ))