Enlightenment CVS committal
Author : tsauerbeck
Project : misc
Module : eplayer
Dir : misc/eplayer
Modified Files:
ChangeLog Makefile.am configure.ac
Log Message:
Added ALSA and Solaris output plugins. An edb file is now used to control the evas
engine and output plugin to use etc
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ChangeLog 21 Oct 2003 17:53:38 -0000 1.10
+++ ChangeLog 22 Oct 2003 18:50:04 -0000 1.11
@@ -1,4 +1,11 @@
-$Id: ChangeLog,v 1.10 2003/10/21 17:53:38 tsauerbeck Exp $
+$Id: ChangeLog,v 1.11 2003/10/22 18:50:04 tsauerbeck Exp $
+
+2003-10-22 Tilman Sauerbeck <[EMAIL PROTECTED]>
+ * configure.ac: Fix OSS check, add checks for Solaris' audioio.h
+ and ALSA
+ * src/output/solaris: Added Solaris output plugin
+ * src/output/alsa: Added ALSA output plugin
+ * etc/Makefile.am, src/eplayer.c: We have a config file now
2003-10-21 Tilman Sauerbeck <[EMAIL PROTECTED]>
* configure.ac: check for sys/soundcard.h to determine whether
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 16 Oct 2003 17:25:40 -0000 1.3
+++ Makefile.am 22 Oct 2003 18:50:04 -0000 1.4
@@ -1,4 +1,4 @@
-SUBDIRS = data m4 src
+SUBDIRS = data etc m4 src
EXTRA_DIST = TODO
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- configure.ac 21 Oct 2003 17:53:38 -0000 1.5
+++ configure.ac 22 Oct 2003 18:50:04 -0000 1.6
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.5 2003/10/21 17:53:38 tsauerbeck Exp $
+# $Id: configure.ac,v 1.6 2003/10/22 18:50:04 tsauerbeck Exp $
AC_INIT(src/eplayer.c)
@@ -21,6 +21,10 @@
AC_DEFINE_UNQUOTED(PLUGIN_DIR, "$PLUGIN_DIR", [Directory to install plugins in])
AC_SUBST(PLUGIN_DIR)
+AC_EXPAND_DIR(SYSCONF_DIR, "$sysconfdir")
+AC_DEFINE_UNQUOTED(SYSCONF_DIR, "$SYSCONF_DIR", [Directory to install configuration
in])
+AC_SUBST(SYSCONF_DIR)
+
AC_ARG_ENABLE(debug,
[ --enable-debug debug build (default: no)], [
AC_DEFINE([DEBUG], [], [Define to 1 if you want debugging output])
@@ -61,25 +65,29 @@
AC_MSG_ERROR(Cannot find esmart: Is esmart-config in path?))
dnl Check for OSS
-AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h)
-
-if test "${ac_cv_header_sys_soundcard_h}" = "yes" || test
"${ac_cv_header_machine_soundcard_h}" = "yes"; then
- have_oss="yes"
-else
- have_oss="no"
-fi
-
+AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h, [have_oss="yes"; break],
have_oss="no")
AM_CONDITIONAL(HAVE_OSS, test "$have_oss" = "yes")
+dnl Check for ALSA
+PKG_CHECK_MODULES(ALSA, alsa >= 0.9, have_alsa="yes", have_alsa="no")
+AM_CONDITIONAL(HAVE_ALSA, test "x$have_alsa" = "xyes")
+
+dnl Check for Solaris audio stuff
+AC_CHECK_HEADER(sys/audioio.h, have_solaris="yes", have_solaris="no")
+AM_CONDITIONAL(HAVE_SOLARIS, test "$have_solaris" = "yes")
+
AC_OUTPUT([
Makefile
data/Makefile
data/fonts/Makefile
data/images/Makefile
+etc/Makefile
m4/Makefile
src/Makefile
src/output/Makefile
+src/output/alsa/Makefile
src/output/oss/Makefile
+src/output/solaris/Makefile
])
echo
@@ -87,5 +95,7 @@
echo
echo "Output Plugins"
echo
-echo "OSS...........: ${ac_cv_header_sys_soundcard_h}"
+echo "OSS...........: $have_oss"
+echo "ALSA..........: $have_alsa"
+echo "Solaris.......: $have_solaris"
echo
-------------------------------------------------------
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
