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

normalize values of SYSTEM_BLUEZ, SYSTEM_MESA_HEADERS

Browse Source 
Change-Id: I166de66dd8cd58a05e1a9e8d2f25bf95b98297fb
This commit is contained in:
Michael Stahl 2014-02-11 19:28:33 +01:00
parent ab586f14e0
commit 8555b37859
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
RepositoryExternal.mk
View File

@ -29,11 +29,11 @@
# External headers # External headers
ifeq ($(SYSTEM_MESA_HEADERS),YES) ifneq ($(SYSTEM_MESA_HEADERS),)
gb_LinkTarget__use_mesa_headers := gb_LinkTarget__use_mesa_headers :=
else else # !SYSTEM_MESA_HEADERS
define gb_LinkTarget__use_mesa_headers define gb_LinkTarget__use_mesa_headers
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
@ -43,7 +43,7 @@ $(call gb_LinkTarget_set_include,$(1),\
endef endef
endif endif # SYSTEM_MESA_HEADERS
ifneq ($(SYSTEM_NPAPI_HEADERS),) ifneq ($(SYSTEM_NPAPI_HEADERS),)
@ -159,7 +159,7 @@ gb_LinkTarget__use_sane_headers :=
endif endif
ifeq ($(SYSTEM_BLUEZ),YES) ifneq ($(SYSTEM_BLUEZ),)
gb_LinkTarget__use_bluez_bluetooth_headers := gb_LinkTarget__use_bluez_bluetooth_headers :=

20
configure.ac
View File

@ -10193,29 +10193,29 @@ 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 SYSTEM_BLUEZ=TRUE
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_BLUEZ=NO SYSTEM_BLUEZ=
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 SYSTEM_BLUEZ=
fi fi
else else
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_SDREMOTE_BLUETOOTH=TRUE ENABLE_SDREMOTE_BLUETOOTH=TRUE
SYSTEM_BLUEZ=NO SYSTEM_BLUEZ=
fi fi
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
ENABLE_SDREMOTE_BLUETOOTH= ENABLE_SDREMOTE_BLUETOOTH=
SYSTEM_BLUEZ=NO SYSTEM_BLUEZ=
fi fi
else else
ENABLE_SDREMOTE= ENABLE_SDREMOTE=
SYSTEM_BLUEZ=NO SYSTEM_BLUEZ=
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
AC_SUBST(ENABLE_SDREMOTE) AC_SUBST(ENABLE_SDREMOTE)
@ -10437,14 +10437,14 @@ elif test "$_os" = "Darwin"; then
ENABLE_OPENGL=TRUE ENABLE_OPENGL=TRUE
ENABLE_OPENGL_CANVAS= ENABLE_OPENGL_CANVAS=
add_warning "openGL canvas not adapted for Mac yet - disabling" add_warning "openGL canvas not adapted for Mac yet - disabling"
SYSTEM_MESA_HEADERS=YES SYSTEM_MESA_HEADERS=TRUE
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
elif test $_os = WINNT; then elif test $_os = WINNT; then
# Experimental: try to use OpenGL on Windows # Experimental: try to use OpenGL on Windows
ENABLE_OPENGL=TRUE ENABLE_OPENGL=TRUE
ENABLE_OPENGL_CANVAS=TRUE ENABLE_OPENGL_CANVAS=TRUE
# We need the internal "Mesa" headers. # We need the internal "Mesa" headers.
SYSTEM_MESA_HEADERS=NO SYSTEM_MESA_HEADERS=
BUILD_TYPE="$BUILD_TYPE MESA" BUILD_TYPE="$BUILD_TYPE MESA"
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
@ -10469,7 +10469,7 @@ else
AC_MSG_CHECKING([which Mesa headers to use]) AC_MSG_CHECKING([which Mesa headers to use])
if test "$with_system_mesa_headers" = "yes"; then if test "$with_system_mesa_headers" = "yes"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_MESA_HEADERS=YES SYSTEM_MESA_HEADERS=TRUE
AC_LANG_PUSH(C) AC_LANG_PUSH(C)
AC_CHECK_HEADER(GL/glxext.h, [], AC_CHECK_HEADER(GL/glxext.h, [],
[ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>]) [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
@ -10478,7 +10478,7 @@ else
AC_LANG_POP(C) AC_LANG_POP(C)
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_MESA_HEADERS=NO SYSTEM_MESA_HEADERS=
BUILD_TYPE="$BUILD_TYPE MESA" BUILD_TYPE="$BUILD_TYPE MESA"
fi fi
fi fi