From 5cd9d5a35a64847fc4e510582839799900e172dc Mon Sep 17 00:00:00 2001
From: Joel Klinghed <the_jk@spawned.biz>
Date: Thu, 3 Jan 2013 11:26:14 +0000
Subject: [PATCH] From: Joel Klinghed <the_jk@spawned.biz> Subject: [E-devel]
 Alpha5: 7 patches and 1 bug

* enlightenment-0.17.0-alpha5-mixer-alsa.patch
Use cflags from pkg-config alsa-lib when using alsa headers.

* enlightenment-0.17.0-alpha5-xkb_base.patch
When searching for xkeyboard-config rules, before trying a long list of
guessed standard paths, check the one given by the pkg-config file if
it exists.



SVN revision: 82059
---
 configure.ac                        | 5 +++++
 src/modules/Makefile_mixer.am       | 2 +-
 src/modules/xkbswitch/e_mod_parse.c | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 2c0eca690..c6f1d4428 100644
--- a/configure.ac
+++ b/configure.ac
@@ -612,6 +612,11 @@ AC_SUBST(e_cflags)
 AC_SUBST(e_configflags)
 AC_SUBST(requirements_e)
 
+PKG_CHECK_EXISTS([xkeyboard-config],[
+  xkb_base=`$PKG_CONFIG --variable=xkb_base xkeyboard-config 2>/dev/null`
+  AC_DEFINE_UNQUOTED([XKB_BASE],["$xkb_base"],[Define to the base directory for X keyboard configuration data])
+])
+
 profile="SLOW_PC"
 AC_ARG_WITH(profile,
   AS_HELP_STRING([--with-profile=TARGET_PROFILE], 
diff --git a/src/modules/Makefile_mixer.am b/src/modules/Makefile_mixer.am
index 1002c6711..3858c12b6 100644
--- a/src/modules/Makefile_mixer.am
+++ b/src/modules/Makefile_mixer.am
@@ -7,7 +7,7 @@ EXTRA_DIST += $(mixer_DATA)
 mixerpkgdir = $(MDIR)/mixer/$(MODULE_ARCH)
 mixerpkg_LTLIBRARIES = mixer/module.la
 
-mixer_module_la_CFLAGS = $(AM_CFLAGS)
+mixer_module_la_CFLAGS = $(AM_CFLAGS) @SOUND_CFLAGS@
 
 mixer_module_la_SOURCES = mixer/e_mod_main.c \
 			  mixer/e_mod_main.h \
diff --git a/src/modules/xkbswitch/e_mod_parse.c b/src/modules/xkbswitch/e_mod_parse.c
index bf6be2f78..e3465051f 100644
--- a/src/modules/xkbswitch/e_mod_parse.c
+++ b/src/modules/xkbswitch/e_mod_parse.c
@@ -14,6 +14,10 @@ find_rules(void)
 {
    int i = 0;
    const char *lstfiles[] = {
+#ifdef XKB_BASE
+      XKB_BASE "/rules/xorg.lst",
+      XKB_BASE "/rules/xfree86.lst",
+#endif
 #if defined __NetBSD__
       "/usr/X11R7/lib/X11/xkb/rules/xorg.lst",
 #elif defined __OpenBSD__