brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[configure] Always execute the AM_CONDITIONAL call for X11_TESTS

Browse Source 
Automake gets upset if an AM_CONDITIONAL call is itself conditionally
executed.
This commit is contained in:
Neil Roberts 2009-05-29 14:23:16 +01:00
parent e565c1f1db
commit cfb9508465
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -397,6 +397,7 @@ AS_CASE([$imagebackend],
dnl === X11 checks, only for X11-based backends =============================== dnl === X11 checks, only for X11-based backends ===============================
X11_PC_FILES="" X11_PC_FILES=""
x11_tests=no
AS_IF([test "x$clutterbackend" = "xglx" || test "x$clutterbackend" = "xeglx"], 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 # X11-specific tests are enabled conditionally
AS_IF([test "x$have_xcomposite" = "xyes"], [x11_tests=yes], [x11_tests=no]) 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 ===================================================== dnl === JSON parser check =====================================================
# allow building clutter with an external dependency on json-glib # allow building clutter with an external dependency on json-glib