aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Frydrych <tf@linux.intel.com>2008-02-20 08:25:39 +0000
committerTomas Frydrych <tf@linux.intel.com>2008-02-20 08:25:39 +0000
commit296d6e2b44e36b4c28a2979b9b685cf896671e34 (patch)
treeeabf8d35b2482cc1bcaabfccc18f712216fe23f5
parent9a4e47a2a2c46a38795fb7ddec2233e98bb9c4fa (diff)
downloadlibmatchboxwm2-296d6e2b44e36b4c28a2979b9b685cf896671e34.tar.gz
libmatchboxwm2-296d6e2b44e36b4c28a2979b9b685cf896671e34.tar.bz2
libmatchboxwm2-296d6e2b44e36b4c28a2979b9b685cf896671e34.zip
2008-02-20 Tomas Frydrych <tf@o-hand.com>
* configure.ac: Fixed the header dirctory for libmatchbox. * matchbox/core/mb-window-manager.c: Fixed stray #ifdef.
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac2
-rw-r--r--matchbox/core/mb-window-manager.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index aef6e9b..a4062d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-20 Tomas Frydrych <tf@o-hand.com>
+
+ * configure.ac:
+ Fixed the header dirctory for libmatchbox.
+
+ * matchbox/core/mb-window-manager.c:
+ Fixed stray #ifdef.
+
2008-02-19 Tomas Frydrych <tf@o-hand.com>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index b4d45ef..2d0289c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ AM_INIT_AUTOMAKE()
MBWM2_API_VERSION=mbwm2_api_version
AC_SUBST(MBWM2_API_VERSION)
-MBWM2_INCDIR=matchbox-wm-2/$MBWM2_API_VERSION
+MBWM2_INCDIR=matchbox-wm-2/$MBWM2_API_VERSION/matchbox
AC_SUBST(MBWM2_INCDIR)
AM_MAINTAINER_MODE
diff --git a/matchbox/core/mb-window-manager.c b/matchbox/core/mb-window-manager.c
index 0a2e27d..259a92d 100644
--- a/matchbox/core/mb-window-manager.c
+++ b/matchbox/core/mb-window-manager.c
@@ -30,7 +30,7 @@
#if ENABLE_COMPOSITE
# include "mb-wm-comp-mgr.h"
-# ifdef USE_CLUTTER
+# if USE_CLUTTER
# include <clutter/clutter-x11.h>
# include "mb-wm-comp-mgr-clutter.h"
# else