Kaydet (Commit) 25de5cfa authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt

autogen: Better check for USING_X11 instead of with_x in some cases

USING_X11 includes os defaults, while with_x is only the option explicitly set by the user

Change-Id: I7933b038805a87c418404b40f513c4491e11fd8f
Reviewed-on: https://gerrit.libreoffice.org/18919Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
üst 85f93697
...@@ -4341,7 +4341,6 @@ mingw*) ...@@ -4341,7 +4341,6 @@ mingw*)
;; ;;
*netbsd*) *netbsd*)
COM=GCC COM=GCC
USING_X11=TRUE USING_X11=TRUE
OS=NETBSD OS=NETBSD
...@@ -4401,7 +4400,6 @@ openbsd*) ...@@ -4401,7 +4400,6 @@ openbsd*)
;; ;;
solaris*) solaris*)
COM=GCC COM=GCC
USING_X11=TRUE USING_X11=TRUE
OS=SOLARIS OS=SOLARIS
...@@ -4679,13 +4677,12 @@ if test $_os != "WINNT" -a $_os != "Darwin"; then ...@@ -4679,13 +4677,12 @@ if test $_os != "WINNT" -a $_os != "Darwin"; then
fi fi
AC_SUBST(ENABLE_OOENV) AC_SUBST(ENABLE_OOENV)
if test "$with_x" = "no"; then if test "$USING_X11" != TRUE; then
# be sure to do not mess with uneeded stuff # be sure to do not mess with unneeded stuff
test_randr=no test_randr=no
test_xrender=no test_xrender=no
test_cups=no test_cups=no
test_dbus=no test_dbus=no
test_fontconfig=yes
test_gtk=no test_gtk=no
build_gstreamer_1_0=no build_gstreamer_1_0=no
build_gstreamer_0_10=no build_gstreamer_0_10=no
...@@ -9224,7 +9221,7 @@ AC_MSG_CHECKING([whether to use X11]) ...@@ -9224,7 +9221,7 @@ AC_MSG_CHECKING([whether to use X11])
dnl *************************************** dnl ***************************************
dnl testing for X libraries and includes... dnl testing for X libraries and includes...
dnl *************************************** dnl ***************************************
if test $USING_X11 = TRUE; then if test "$USING_X11" = TRUE; then
AC_DEFINE(HAVE_FEATURE_X11) AC_DEFINE(HAVE_FEATURE_X11)
fi fi
AC_MSG_RESULT([$USING_X11]) AC_MSG_RESULT([$USING_X11])
...@@ -10020,7 +10017,7 @@ dnl Test which vclplugs have to be built. ...@@ -10020,7 +10017,7 @@ dnl Test which vclplugs have to be built.
dnl =================================================================== dnl ===================================================================
R="" R=""
AC_MSG_CHECKING([which VCLplugs shall be built]) AC_MSG_CHECKING([which VCLplugs shall be built])
if test "$USING_X11" != TRUE -o "$with_x" = "no"; then if test "$USING_X11" != TRUE; then
enable_gtk=no enable_gtk=no
enable_gtk3=no enable_gtk3=no
fi fi
...@@ -10394,7 +10391,7 @@ elif test $_os = WINNT; then ...@@ -10394,7 +10391,7 @@ elif test $_os = WINNT; then
SYSTEM_MESA_HEADERS= SYSTEM_MESA_HEADERS=
BUILD_TYPE="$BUILD_TYPE MESA" BUILD_TYPE="$BUILD_TYPE MESA"
else else
if test "$with_x" != "no"; then if test "$USING_X11" = TRUE; then
ENABLE_OPENGL=TRUE ENABLE_OPENGL=TRUE
fi fi
ENABLE_OPENGL_CANVAS=TRUE ENABLE_OPENGL_CANVAS=TRUE
......
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