Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e
Modified Files:
configure.in
Log Message:
Sound - Split loading and playing.
===================================================================
RCS file: /cvs/e/e16/e/configure.in,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -3 -r1.246 -r1.247
--- configure.in 14 Jan 2008 16:10:05 -0000 1.246
+++ configure.in 28 Jan 2008 21:20:09 -0000 1.247
@@ -30,6 +30,8 @@
AC_PROG_INSTALL
AC_PROG_LN_S
+PKG_PROG_PKG_CONFIG
+
AC_HEADER_STDC
define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
@@ -72,10 +74,6 @@
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.12.1])
-AC_ARG_ENABLE(sound,
- [ --enable-sound compile with sound support @<:@default=yes@:>@],,
- enable_sound=yes)
-
AC_ARG_ENABLE(hints-gnome,
[ --enable-hints-gnome compile with GNOME(<2.0) hints support
@<:@default=no@:>@],,
enable_hints_gnome=no)
@@ -85,16 +83,30 @@
fi
AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_hints_gnome" = "xyes")
+AC_ARG_ENABLE(sound,
+ [ --enable-sound compile with sound support @<:@default=yes@:>@],,
+ enable_sound=yes)
if test "x$enable_sound" = "xyes"; then
- AM_PATH_ESD(0.2.17,AC_DEFINE(HAVE_LIBESD, 1, [libesd.so]),[
- enable_sound=no
- AC_MSG_WARN([Sound support was requested but not found.])
+ AC_ARG_ENABLE(sound_esd,
+ [ --enable-sound-esd compile with EsounD sound support
@<:@default=yes@:>@],,
+ enable_sound_esd=yes)
+fi
+enable_sound=no
+
+if test "x$enable_sound_esd" = "xyes"; then
+ AM_PATH_ESD(0.2.17,,[
+ enable_sound_esd=no
+ AC_MSG_WARN([ESD Sound support was requested but not found.])
])
+ AC_CHECK_HEADERS(audiofile.h,, enable_sound_esd=no)
fi
-if test "x$enable_sound" = "xyes"; then
+if test "x$enable_sound_esd" = "xyes"; then
AC_DEFINE(HAVE_SOUND, 1, [Sound support])
+ AC_DEFINE(HAVE_SOUND_ESD, 1, [EsounD sound support])
+ AC_DEFINE(USE_SOUND_LOADER_AUDIOFILE, 1, [Use audiofile sound loader])
+ enable_sound=esd
fi
-AM_CONDITIONAL(USE_LIBESD, test "x$enable_sound" = "xyes")
+AM_CONDITIONAL(USE_LIBESD, test "x$enable_sound_esd" = "xyes")
CPPFLAGS="$X_CFLAGS $CPPFLAGS"
LDFLAGS="$X_LIBS $LDFLAGS -L$prefix/lib"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
