isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-29 19:40:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

configure: Fix the -o operator in a call to test

Browse Source 
The disjunction operator was misspelt as -O which tests whether the
following file is owned by the calling user. This doesn't take enough
arguments so bash was showing an error and the test was always
failing. This meant that NEED_XKB_UTILS was always false which should
have broken the build but the Makefile was mistakenly including
clutter-xkb-utils.c again if SUPPORT_WAYLAND is defined.

See 1b77565e for reference.

Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
This commit is contained in:
Neil Roberts 2012-03-23 16:34:17 +00:00
parent 4316a85c16
commit 04f2be34b2
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/Makefile.am
View File

@ -583,7 +583,7 @@ clutterevdev_include_HEADERS = $(evdev_h)
endif # SUPPORT_EVDEV endif # SUPPORT_EVDEV
if NEED_XKB_UTILS if NEED_XKB_UTILS
backend_source_c_priv += $(srcdir)/evdev/clutter-xkb-utils.c backend_source_c += $(srcdir)/evdev/clutter-xkb-utils.c
backend_source_h_priv += $(srcdir)/evdev/clutter-xkb-utils.h backend_source_h_priv += $(srcdir)/evdev/clutter-xkb-utils.h
endif endif
@ -623,7 +623,6 @@ egl_source_c = $(srcdir)/egl/clutter-backend-eglnative.c
# Wayland backend rules # Wayland backend rules
if SUPPORT_WAYLAND if SUPPORT_WAYLAND
backend_source_h_priv += \ backend_source_h_priv += \
$(srcdir)/evdev/clutter-xkb-utils.h \
$(srcdir)/wayland/clutter-backend-wayland.h \ $(srcdir)/wayland/clutter-backend-wayland.h \
$(srcdir)/wayland/clutter-stage-wayland.h \ $(srcdir)/wayland/clutter-stage-wayland.h \
$(srcdir)/wayland/clutter-event-wayland.h \ $(srcdir)/wayland/clutter-event-wayland.h \
@ -631,7 +630,6 @@ backend_source_h_priv += \
$(srcdir)/wayland/clutter-device-manager-wayland.h $(srcdir)/wayland/clutter-device-manager-wayland.h
backend_source_c += \ backend_source_c += \
$(srcdir)/evdev/clutter-xkb-utils.c \
$(srcdir)/wayland/clutter-backend-wayland.c \ $(srcdir)/wayland/clutter-backend-wayland.c \
$(srcdir)/wayland/clutter-stage-wayland.c \ $(srcdir)/wayland/clutter-stage-wayland.c \
$(srcdir)/wayland/clutter-event-wayland.c \ $(srcdir)/wayland/clutter-event-wayland.c \

2
configure.ac
View File

@ -487,7 +487,7 @@ AM_CONDITIONAL(USE_TSLIB, [test "x$have_tslib" = "xyes"])
AM_CONDITIONAL(USE_EVDEV, [test "x$have_evdev" = "xyes"]) AM_CONDITIONAL(USE_EVDEV, [test "x$have_evdev" = "xyes"])
AM_CONDITIONAL(USE_GLD, [test "x$have_gdl" = "xyes"]) AM_CONDITIONAL(USE_GLD, [test "x$have_gdl" = "xyes"])
AM_CONDITIONAL(NEED_XKB_UTILS, [test "x$have_evdev" = "xyes" -O "x$SUPPORT_WAYLAND" = "x1"]) AM_CONDITIONAL(NEED_XKB_UTILS, [test "x$have_evdev" = "xyes" -o "x$SUPPORT_WAYLAND" = "x1"])
dnl Instead of using AM_CFLAGS to ensure dnl Instead of using AM_CFLAGS to ensure
dnl COGL_ENABLE_EXPERIMENTAL_2_0_API is defined while compiling clutter dnl COGL_ENABLE_EXPERIMENTAL_2_0_API is defined while compiling clutter