diff options
author | Arwed von Merkatz | 2009-10-08 19:04:30 +0200 |
---|---|---|
committer | Eric Sandall | 2009-10-09 13:21:06 -0700 |
commit | 56650e67f8e9116baec7d597c913e149312386b6 (patch) | |
tree | 10c2f41868a1e92c4780fe8cd744682203b3e1f6 | |
parent | ff1b4136e55e4aacebc1e3d43a8408dd60d4d577 (diff) |
libcanberra: added sub dependency GTK
(cherry-picked from 44524ea)
-rwxr-xr-x | gnome2-libs/libcanberra/CONFIGURE | 2 | ||||
-rw-r--r-- | gnome2-libs/libcanberra/HISTORY | 7 | ||||
-rwxr-xr-x | gnome2-libs/libcanberra/PRE_SUB_DEPENDS | 6 | ||||
-rwxr-xr-x | gnome2-libs/libcanberra/REPAIR^none^PRE_SUB_DEPENDS | 6 | ||||
-rwxr-xr-x | gnome2-libs/libcanberra/SUB_DEPENDS | 7 |
5 files changed, 27 insertions, 1 deletions
diff --git a/gnome2-libs/libcanberra/CONFIGURE b/gnome2-libs/libcanberra/CONFIGURE index dca16b1ef3..02b3d9e9d9 100755 --- a/gnome2-libs/libcanberra/CONFIGURE +++ b/gnome2-libs/libcanberra/CONFIGURE @@ -1,6 +1,6 @@ config_query_option CANBERRA_OSS "Enable OSS support?" n \ "--enable-oss" "--disable-oss" && -config_query_option CANBERRA_NULL "Enable NULL backend?" n \ +config_query_option CANBERRA_NULL "Enable NULL backend?" y \ "--enable-null" "--disable-null" diff --git a/gnome2-libs/libcanberra/HISTORY b/gnome2-libs/libcanberra/HISTORY index 82ebf31ff7..df770dc5db 100644 --- a/gnome2-libs/libcanberra/HISTORY +++ b/gnome2-libs/libcanberra/HISTORY @@ -1,3 +1,10 @@ +2009-10-08 Arwed v. Merkatz <v.merkatz@gmx.net> + * SUB_DEPENDS, PRE_SUBDEPENDS, REPAIR^none^PRE_SUB_DEPENDS: + added sub dependency GTK + * CONFIGURE: default to building the null backend, otherwise + a default build on a clean system will fail due to no backend + being selected + 2009-09-10 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 0.16 diff --git a/gnome2-libs/libcanberra/PRE_SUB_DEPENDS b/gnome2-libs/libcanberra/PRE_SUB_DEPENDS new file mode 100755 index 0000000000..91ac72086c --- /dev/null +++ b/gnome2-libs/libcanberra/PRE_SUB_DEPENDS @@ -0,0 +1,6 @@ +case $THIS_SUB_DEPENDS in + GTK) is_depends_enabled $SPELL gtk+2 && return 0;; + *) echo "Eek, unknown subdependency requested!"; return 1;; +esac +return 1 + diff --git a/gnome2-libs/libcanberra/REPAIR^none^PRE_SUB_DEPENDS b/gnome2-libs/libcanberra/REPAIR^none^PRE_SUB_DEPENDS new file mode 100755 index 0000000000..91ac72086c --- /dev/null +++ b/gnome2-libs/libcanberra/REPAIR^none^PRE_SUB_DEPENDS @@ -0,0 +1,6 @@ +case $THIS_SUB_DEPENDS in + GTK) is_depends_enabled $SPELL gtk+2 && return 0;; + *) echo "Eek, unknown subdependency requested!"; return 1;; +esac +return 1 + diff --git a/gnome2-libs/libcanberra/SUB_DEPENDS b/gnome2-libs/libcanberra/SUB_DEPENDS new file mode 100755 index 0000000000..e80d179011 --- /dev/null +++ b/gnome2-libs/libcanberra/SUB_DEPENDS @@ -0,0 +1,7 @@ + +case $THIS_SUB_DEPENDS in +GTK) echo "GTK support requested, forcing gtk+2 dependency." && + depends gtk+2 '--enable-gtk' + ;; +*) echo unknown sub-depends!!! ; return 1 ;; +esac |