summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Allum <mallum@openedhand.com>2006-08-08 08:41:31 +0000
committerMatthew Allum <mallum@openedhand.com>2006-08-08 08:41:31 +0000
commit91e99388ebfd042fffa94008cb098aad493d933a (patch)
tree859fb1ce30c06f31fbf8737eaf1e9c88c6012248
parent1c6dd82bd8ea6d7d6e2107488557e5e339f223af (diff)
downloadpoky-91e99388ebfd042fffa94008cb098aad493d933a.tar.gz
Add gconf macro file so mb builds again with gconf dep
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@594 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/matchbox-wm/matchbox-wm/gconf-2.m439
-rw-r--r--meta/packages/matchbox-wm/matchbox-wm_1.1.bb5
2 files changed, 42 insertions, 2 deletions
diff --git a/meta/packages/matchbox-wm/matchbox-wm/gconf-2.m4 b/meta/packages/matchbox-wm/matchbox-wm/gconf-2.m4
new file mode 100644
index 0000000000..aca7c7da45
--- /dev/null
+++ b/meta/packages/matchbox-wm/matchbox-wm/gconf-2.m4
@@ -0,0 +1,39 @@
1dnl AM_GCONF_SOURCE_2
2dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
3dnl (i.e. pass to gconftool-2
4dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
5dnl you should install foo.schemas files
6dnl
7
8AC_DEFUN([AM_GCONF_SOURCE_2],
9[
10 if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
11 GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
12 else
13 GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
14 fi
15
16 AC_ARG_WITH(gconf-source,
17 [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
18
19 AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
20 AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
21
22 if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
23 GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
24 fi
25
26 AC_ARG_WITH(gconf-schema-file-dir,
27 [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
28
29 AC_SUBST(GCONF_SCHEMA_FILE_DIR)
30 AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
31
32 AC_ARG_ENABLE(schemas-install,
33 [ --disable-schemas-install Disable the schemas installation],
34 [case ${enableval} in
35 yes|no) ;;
36 *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
37 esac])
38 AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
39])
diff --git a/meta/packages/matchbox-wm/matchbox-wm_1.1.bb b/meta/packages/matchbox-wm/matchbox-wm_1.1.bb
index 4af6b0a4e0..05689d94ed 100644
--- a/meta/packages/matchbox-wm/matchbox-wm_1.1.bb
+++ b/meta/packages/matchbox-wm/matchbox-wm_1.1.bb
@@ -3,11 +3,12 @@ DESCRIPTION = "Matchbox window manager"
3LICENSE = "GPL" 3LICENSE = "GPL"
4DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat matchbox-common" 4DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat matchbox-common"
5RDEPENDS = "matchbox-common" 5RDEPENDS = "matchbox-common"
6PR="r0" 6PR="r1"
7 7
8 8
9SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/matchbox-window-manager-${PV}.tar.gz \ 9SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/matchbox-window-manager-${PV}.tar.gz \
10 file://kbdconfig" 10 file://kbdconfig \
11 file://gconf-2.m4"
11 12
12S = "${WORKDIR}/matchbox-window-manager-${PV}" 13S = "${WORKDIR}/matchbox-window-manager-${PV}"
13 14