mirror of
https://github.com/brl/mutter.git
synced 2024-11-12 17:27:03 -05:00
[configure] Always execute the AM_CONDITIONAL call for X11_TESTS
Automake gets upset if an AM_CONDITIONAL call is itself conditionally executed.
This commit is contained in:
parent
e565c1f1db
commit
cfb9508465
@ -397,6 +397,7 @@ AS_CASE([$imagebackend],
|
||||
|
||||
dnl === X11 checks, only for X11-based backends ===============================
|
||||
X11_PC_FILES=""
|
||||
x11_tests=no
|
||||
|
||||
AS_IF([test "x$clutterbackend" = "xglx" || test "x$clutterbackend" = "xeglx"],
|
||||
[
|
||||
@ -504,10 +505,11 @@ AS_IF([test "x$clutterbackend" = "xglx" || test "x$clutterbackend" = "xeglx"],
|
||||
|
||||
# X11-specific tests are enabled conditionally
|
||||
AS_IF([test "x$have_xcomposite" = "xyes"], [x11_tests=yes], [x11_tests=no])
|
||||
AM_CONDITIONAL(X11_TESTS, [test "x$x11_tests" = "xyes"])
|
||||
]
|
||||
)
|
||||
|
||||
AM_CONDITIONAL(X11_TESTS, [test "x$x11_tests" = "xyes"])
|
||||
|
||||
dnl === JSON parser check =====================================================
|
||||
|
||||
# allow building clutter with an external dependency on json-glib
|
||||
|
Loading…
Reference in New Issue
Block a user