forked from enlightenment/enlightenment
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
This commit is contained in:
parent
625cafc28c
commit
5cd9d5a35a
|
@ -612,6 +612,11 @@ AC_SUBST(e_cflags)
|
||||||
AC_SUBST(e_configflags)
|
AC_SUBST(e_configflags)
|
||||||
AC_SUBST(requirements_e)
|
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"
|
profile="SLOW_PC"
|
||||||
AC_ARG_WITH(profile,
|
AC_ARG_WITH(profile,
|
||||||
AS_HELP_STRING([--with-profile=TARGET_PROFILE],
|
AS_HELP_STRING([--with-profile=TARGET_PROFILE],
|
||||||
|
|
|
@ -7,7 +7,7 @@ EXTRA_DIST += $(mixer_DATA)
|
||||||
mixerpkgdir = $(MDIR)/mixer/$(MODULE_ARCH)
|
mixerpkgdir = $(MDIR)/mixer/$(MODULE_ARCH)
|
||||||
mixerpkg_LTLIBRARIES = mixer/module.la
|
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_module_la_SOURCES = mixer/e_mod_main.c \
|
||||||
mixer/e_mod_main.h \
|
mixer/e_mod_main.h \
|
||||||
|
|
|
@ -14,6 +14,10 @@ find_rules(void)
|
||||||
{
|
{
|
||||||
int i = 0;
|
int i = 0;
|
||||||
const char *lstfiles[] = {
|
const char *lstfiles[] = {
|
||||||
|
#ifdef XKB_BASE
|
||||||
|
XKB_BASE "/rules/xorg.lst",
|
||||||
|
XKB_BASE "/rules/xfree86.lst",
|
||||||
|
#endif
|
||||||
#if defined __NetBSD__
|
#if defined __NetBSD__
|
||||||
"/usr/X11R7/lib/X11/xkb/rules/xorg.lst",
|
"/usr/X11R7/lib/X11/xkb/rules/xorg.lst",
|
||||||
#elif defined __OpenBSD__
|
#elif defined __OpenBSD__
|
||||||
|
|
Loading…
Reference in New Issue