diff options
| author | Neil Roberts <neil@linux.intel.com> | 2012-03-23 16:34:17 +0000 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2012-03-23 17:38:39 +0000 |
| commit | 1c7bc5811bebd765f335b63ec6cef3a7a5b106b0 (patch) | |
| tree | 3078ac8a2325af176ae4b33037e91a4c06c5c76b | |
| parent | 43a87276f7984dd3f1d2b4a57d812d0d35f8b881 (diff) | |
| download | clutter-1c7bc5811bebd765f335b63ec6cef3a7a5b106b0.tar.gz | |
configure: Fix the -o operator in a call to test
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>
(cherry picked from commit 04f2be34b2cba22acdb497feb5ecbcc3233ccc6a)
| -rw-r--r-- | clutter/Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 0b4668036..e2c59f161 100644 --- a/clutter/Makefile.am +++ b/clutter/Makefile.am @@ -583,7 +583,7 @@ clutterevdev_include_HEADERS = $(evdev_h) endif # SUPPORT_EVDEV 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 endif @@ -623,7 +623,6 @@ egl_source_c = $(srcdir)/egl/clutter-backend-eglnative.c # Wayland backend rules if SUPPORT_WAYLAND backend_source_h_priv += \ - $(srcdir)/evdev/clutter-xkb-utils.h \ $(srcdir)/wayland/clutter-backend-wayland.h \ $(srcdir)/wayland/clutter-stage-wayland.h \ $(srcdir)/wayland/clutter-event-wayland.h \ @@ -631,7 +630,6 @@ backend_source_h_priv += \ $(srcdir)/wayland/clutter-device-manager-wayland.h backend_source_c += \ - $(srcdir)/evdev/clutter-xkb-utils.c \ $(srcdir)/wayland/clutter-backend-wayland.c \ $(srcdir)/wayland/clutter-stage-wayland.c \ $(srcdir)/wayland/clutter-event-wayland.c \ diff --git a/configure.ac b/configure.ac index e753b7e1b..3ddb48d1e 100644 --- a/configure.ac +++ b/configure.ac @@ -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_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 COGL_ENABLE_EXPERIMENTAL_2_0_API is defined while compiling clutter |