Kaydet (Commit) 55407935 authored tarafından Michael Stahl's avatar Michael Stahl

normalize values of USE_XINERAMA

Change-Id: Iac70c0872b723f57a63b0df3759c3c6d38271eea
üst a957ec02
...@@ -11530,7 +11530,7 @@ if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then ...@@ -11530,7 +11530,7 @@ if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
if test -e "$XINERAMALIB/libXinerama.so" -a -e "$XINERAMALIB/libXinerama.a"; then if test -e "$XINERAMALIB/libXinerama.so" -a -e "$XINERAMALIB/libXinerama.a"; then
# we have both versions, let the user decide but use the dynamic one # we have both versions, let the user decide but use the dynamic one
# per default # per default
USE_XINERAMA=YES USE_XINERAMA=TRUE
if test -z "$with_static_xinerama" -o -n "$with_system_libs"; then if test -z "$with_static_xinerama" -o -n "$with_system_libs"; then
XINERAMA_LINK=dynamic XINERAMA_LINK=dynamic
else else
...@@ -11538,23 +11538,23 @@ if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then ...@@ -11538,23 +11538,23 @@ if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
fi fi
elif test -e "$XINERAMALIB/libXinerama.so" -a ! -e "$XINERAMALIB/libXinerama.a"; then elif test -e "$XINERAMALIB/libXinerama.so" -a ! -e "$XINERAMALIB/libXinerama.a"; then
# we have only the dynamic version # we have only the dynamic version
USE_XINERAMA=YES USE_XINERAMA=TRUE
XINERAMA_LINK=dynamic XINERAMA_LINK=dynamic
elif test -e "$XINERAMALIB/libXinerama.a"; then elif test -e "$XINERAMALIB/libXinerama.a"; then
# static version # static version
if echo $host_cpu | $GREP -E 'i[[3456]]86' 2>/dev/null >/dev/null; then if echo $host_cpu | $GREP -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
USE_XINERAMA=YES USE_XINERAMA=TRUE
XINERAMA_LINK=static XINERAMA_LINK=static
else else
USE_XINERAMA=NO USE_XINERAMA=
XINERAMA_LINK=none XINERAMA_LINK=none
fi fi
else else
# no Xinerama # no Xinerama
USE_XINERAMA=NO USE_XINERAMA=
XINERAMA_LINK=none XINERAMA_LINK=none
fi fi
if test "$USE_XINERAMA" = "YES"; then if test "$USE_XINERAMA" = "TRUE"; then
AC_MSG_RESULT([yes, with $XINERAMA_LINK linking]) AC_MSG_RESULT([yes, with $XINERAMA_LINK linking])
AC_CHECK_HEADER(X11/extensions/Xinerama.h, [], AC_CHECK_HEADER(X11/extensions/Xinerama.h, [],
[AC_MSG_ERROR(Xinerama header not found.)], []) [AC_MSG_ERROR(Xinerama header not found.)], [])
...@@ -11575,7 +11575,7 @@ if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then ...@@ -11575,7 +11575,7 @@ if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
AC_MSG_RESULT([no, libXinerama not found or wrong architecture.]) AC_MSG_RESULT([no, libXinerama not found or wrong architecture.])
fi fi
else else
USE_XINERAMA=NO USE_XINERAMA=
XINERAMA_LINK=none XINERAMA_LINK=none
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
......
...@@ -23,7 +23,7 @@ $(eval $(call gb_Executable_add_cobjects,oosplash,\ ...@@ -23,7 +23,7 @@ $(eval $(call gb_Executable_add_cobjects,oosplash,\
desktop/unx/source/start \ desktop/unx/source/start \
)) ))
ifeq ($(USE_XINERAMA),YES) ifneq ($(USE_XINERAMA),)
$(eval $(call gb_Executable_add_defs,oosplash,\ $(eval $(call gb_Executable_add_defs,oosplash,\
-DUSE_XINERAMA \ -DUSE_XINERAMA \
......
...@@ -116,7 +116,7 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\ ...@@ -116,7 +116,7 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\
endif endif
## handle Xinerama ## handle Xinerama
ifneq ($(USE_XINERAMA),NO) ifneq ($(USE_XINERAMA),)
ifneq ($(OS)$(USE_XINERAMA_VERSION),SOLARISXsun) ifneq ($(OS)$(USE_XINERAMA_VERSION),SOLARISXsun)
# not Solaris/Xsun # not Solaris/Xsun
$(eval $(call gb_Library_add_defs,vclplug_gen,\ $(eval $(call gb_Library_add_defs,vclplug_gen,\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment