shall we get configure checks right eh?

SVN revision: 51734
This commit is contained in:
Carsten Haitzler 2010-08-29 22:39:35 +00:00
parent e2c4df0689
commit 52b8fbaf4a
1 changed files with 99 additions and 98 deletions

View File

@ -294,10 +294,10 @@ AC_ARG_ENABLE([device-udev],
if test "x$e_cv_want_device_udev" = "xyes";then
PKG_CHECK_EXISTS([eeze >= 1.0.0],
[
[
device_backend=eeze
AC_DEFINE_UNQUOTED([HAVE_EEZE],[1],[enable udev support])
],[device_backend=ehal])
],[device_backend=ehal])
else
device_backend=ehal
fi
@ -410,7 +410,8 @@ AC_SUBST(requirements_e)
profile="SLOW_PC"
AC_ARG_WITH(profile,
AS_HELP_STRING([--with-profile=TARGET_PROFILE], [specify a target format profile of:
AS_HELP_STRING([--with-profile=TARGET_PROFILE],
[specify a target format profile of:
LOWRES_PDA, MEDIUMRES_PDA, HIRES_PDA, SLOW_PC, MEDIUM_PC, FAST_PC]),
[profile=$withval])
AC_MSG_NOTICE([Enlightenment build profile set to $profile])
@ -484,7 +485,7 @@ define([CHECK_MODULE_CONF_THEME],
AM_CONDITIONAL(HAVE_ALSA, false)
define([CHECK_MODULE_MIXER],
[
if test "x$enable_alsa" = "x" || test "x$enable_alsa" = "xdefault" || test "x$enable_alsa" = "xyes"; then
if test "x$enable_alsa" = "x" || test "x$enable_alsa" = "xdefault" || test "x$enable_alsa" = "xyes"; then
AC_E_CHECK_PKG(ALSA, [alsa >= 1.0.8],
[ SOUND_CFLAGS="$ALSA_CFLAGS -DHAVE_ALSA $SOUND_CFLAGS"
SOUND_LIBS="$ALSA_LIBS $SOUND_LDFLAGS"
@ -495,15 +496,15 @@ if test "x$enable_alsa" = "x" || test "x$enable_alsa" = "xdefault" || test "x$en
AC_MSG_WARN([alsa library development files not present. no alsa support.])
fi
])
else
else
have_alsa=no
fi
fi
if test "$have_alsa" = "yes"; then
if test "$have_alsa" = "yes"; then
AC_DEFINE(HAVE_ALSA, 1, [Define if the ALSA output plugin should be built])
else
else
have_alsa=no
fi
fi
])
AC_SUBST(SOUND_CFLAGS)
@ -512,7 +513,7 @@ AC_SUBST(SOUND_LIBS)
AM_CONDITIONAL(HAVE_ECONNMAN, false)
define([CHECK_MODULE_CONNMAN],
[
AC_E_CHECK_PKG(ECONNMAN, [edbus >= 1.0.0 econnman >= 1.0.0], [], [ECONNMAN=false])
AC_E_CHECK_PKG(ECONNMAN, [edbus >= 1.0.0 econnman >= 1.0.0], [], [CONNMAN=false])
])
AC_SUBST(ECONNMAN_CFLAGS)
AC_SUBST(ECONNMAN_LIBS)
@ -520,7 +521,7 @@ AC_SUBST(ECONNMAN_LIBS)
AM_CONDITIONAL(HAVE_EBLUEZ, false)
define([CHECK_MODULE_BLUEZ],
[
AC_E_CHECK_PKG(EBLUEZ, [edbus >= 1.0.0 ebluez >= 1.0.0], [], [EBLUEZ=false])
AC_E_CHECK_PKG(EBLUEZ, [edbus >= 1.0.0 ebluez >= 1.0.0], [], [BLUEZ=false])
])
AC_SUBST(EBLUEZ_CFLAGS)
AC_SUBST(EBLUEZ_LIBS)
@ -528,13 +529,13 @@ AC_SUBST(EBLUEZ_LIBS)
AM_CONDITIONAL(HAVE_EOFONO, false)
define([CHECK_MODULE_OFONO],
[
AC_E_CHECK_PKG(EOFONO, [edbus >= 1.0.0 eofono >= 1.0.0], [], [EOFONO=false])
AC_E_CHECK_PKG(EOFONO, [edbus >= 1.0.0 eofono >= 1.0.0], [], [OFONO=false])
])
AC_SUBST(EOFONO_CFLAGS)
AC_SUBST(EOFONO_LIBS)
#dnl Check enotify support for illume-indicator module so it can do dbus notifications or not
AC_E_CHECK_PKG(ENOTIFY, [enotify >= 1.0.0], [], [ENOTIFY=false])
# Check enotify support for illume-indicator module so it can do dbus notifications or not
AC_E_CHECK_PKG(ENOTIFY, [edbus >= 1.0.0 enotify >= 1.0.0], [], [ILLUME2=false])
AC_E_OPTIONAL_MODULE([ibar], true)
AC_E_OPTIONAL_MODULE([dropshadow], true)