Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mixer
Dir : e_modules/mixer Modified Files: configure.in Log Message: Some FreeBSD corrections for CodeWarrior to detect Alsa :) =================================================================== RCS file: /cvs/e/e_modules/mixer/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- configure.in 7 Sep 2006 14:20:07 -0000 1.4 +++ configure.in 12 Sep 2006 12:40:42 -0000 1.5 @@ -21,6 +21,11 @@ AC_SUBST(MODULE_ARCH) AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") +uname=`uname` + +AM_CONDITIONAL(BUILD_LINUX, test x$uname = xLinux) +AM_CONDITIONAL(BUILD_FREEBSD, test x$uname = xFreeBSD) + if test "x${bindir}" = 'x${exec_prefix}/bin'; then if test "x${exec_prefix}" = "xNONE"; then if test "x${prefix}" = "xNONE"; then @@ -147,13 +152,24 @@ [ enable_alsa=$enableval ], [ enable_alsa=default ]) if test "x$enable_alsa" = "xdefault" || test "x$enable_alsa" = "xyes"; then + if test "x$uname" = "xLinux"; then AM_PATH_ALSA(1.0.9, [ SOUND_CFLAGS="$ALSA_CFLAGS -DHAVE_ALSA $SOUND_CFLAGS" SOUND_LDFLAGS="$ALSA_LIBS $SOUND_LDFLAGS" ], [ if test "x$enable_alsa" = "xyes"; then AC_MSG_ERROR([alsa library >= 1.0.9 not found]) - fi ]) -fi + fi ]) + else + if test "x$uname" = "xFreeBSD"; then + PKG_CHECK_MODULES(ALSA, [alsa >= 1.0.9], + [ SOUND_CFLAGS="$ALSA_CFLAGS -DHAVE_ALSA $SOUND_CFLAGS" + SOUND_LDFLAGS="$ALSA_LIBS $SOUND_LDFLAGS" ], + [ if test "x$enable_alsa" = "xyes"; then + AC_MSG_ERROR([alsa library >= 1.0.9 not found]) + fi ]) + fi + fi +fi AC_SUBST(SOUND_CFLAGS) AC_SUBST(SOUND_LDFLAGS) ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs