diff options
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | desktop/Executable_oosplash.mk | 2 | ||||
| -rw-r--r-- | vcl/Library_vclplug_gen.mk | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 13ac3dad3e20..ea22c007295f 100644 --- a/configure.ac +++ b/configure.ac @@ -11530,7 +11530,7 @@ if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; 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 # per default - USE_XINERAMA=YES + USE_XINERAMA=TRUE if test -z "$with_static_xinerama" -o -n "$with_system_libs"; then XINERAMA_LINK=dynamic else @@ -11538,23 +11538,23 @@ if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then fi elif test -e "$XINERAMALIB/libXinerama.so" -a ! -e "$XINERAMALIB/libXinerama.a"; then # we have only the dynamic version - USE_XINERAMA=YES + USE_XINERAMA=TRUE XINERAMA_LINK=dynamic elif test -e "$XINERAMALIB/libXinerama.a"; then # static version if echo $host_cpu | $GREP -E 'i[[3456]]86' 2>/dev/null >/dev/null; then - USE_XINERAMA=YES + USE_XINERAMA=TRUE XINERAMA_LINK=static else - USE_XINERAMA=NO + USE_XINERAMA= XINERAMA_LINK=none fi else # no Xinerama - USE_XINERAMA=NO + USE_XINERAMA= XINERAMA_LINK=none fi - if test "$USE_XINERAMA" = "YES"; then + if test "$USE_XINERAMA" = "TRUE"; then AC_MSG_RESULT([yes, with $XINERAMA_LINK linking]) AC_CHECK_HEADER(X11/extensions/Xinerama.h, [], [AC_MSG_ERROR(Xinerama header not found.)], []) @@ -11575,7 +11575,7 @@ if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then AC_MSG_RESULT([no, libXinerama not found or wrong architecture.]) fi else - USE_XINERAMA=NO + USE_XINERAMA= XINERAMA_LINK=none AC_MSG_RESULT([no]) fi diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index d3e375066ed9..3f49b2d4eabf 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Executable_add_cobjects,oosplash,\ desktop/unx/source/start \ )) -ifeq ($(USE_XINERAMA),YES) +ifneq ($(USE_XINERAMA),) $(eval $(call gb_Executable_add_defs,oosplash,\ -DUSE_XINERAMA \ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 64d2c0175606..51dd69224049 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -116,7 +116,7 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\ endif ## handle Xinerama -ifneq ($(USE_XINERAMA),NO) +ifneq ($(USE_XINERAMA),) ifneq ($(OS)$(USE_XINERAMA_VERSION),SOLARISXsun) # not Solaris/Xsun $(eval $(call gb_Library_add_defs,vclplug_gen,\ |