[kaffe] CVS kaffe (jim): Don't use old versions of ALSA
Kaffe CVS
cvs-commits at kaffe.org
Sun Jan 11 14:24:02 PST 2004
PatchSet 4324
Date: 2004/01/11 22:06:46
Author: jim
Branch: HEAD
Tag: (none)
Log:
Don't use old versions of ALSA
Members:
ChangeLog:1.1911->1.1912
Makefile.in:1.125->1.126
THIRDPARTY:1.6->1.7
aclocal.m4:1.86->1.87
configure:1.272->1.273
configure.in:1.237->1.238
config/Makefile.in:1.106->1.107
config/config.h.in:1.83->1.84
include/Makefile.in:1.131->1.132
kaffe/Makefile.in:1.92->1.93
kaffe/jvmpi/Makefile.in:1.13->1.14
kaffe/kaffe/Makefile.in:1.106->1.107
kaffe/kaffeh/Makefile.in:1.89->1.90
kaffe/kaffevm/Makefile.in:1.123->1.124
kaffe/kaffevm/gcj/Makefile.in:1.72->1.73
kaffe/kaffevm/intrp/Makefile.in:1.78->1.79
kaffe/kaffevm/jit/Makefile.in:1.84->1.85
kaffe/kaffevm/jit3/Makefile.in:1.54->1.55
kaffe/kaffevm/systems/Makefile.in:1.80->1.81
kaffe/kaffevm/systems/beos-native/Makefile.in:1.71->1.72
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.77->1.78
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.80->1.81
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.50->1.51
kaffe/man/Makefile.in:1.78->1.79
kaffe/scripts/Makefile.in:1.115->1.116
kaffe/scripts/bat/Makefile.in:1.71->1.72
kaffe/scripts/compat/Makefile.in:1.96->1.97
kaffe/xprof/Makefile.in:1.46->1.47
libraries/Makefile.in:1.75->1.76
libraries/clib/Makefile.in:1.83->1.84
libraries/clib/awt/Makefile.in:1.88->1.89
libraries/clib/awt/X/Makefile.in:1.78->1.79
libraries/clib/awt/qt/Makefile.in:1.33->1.34
libraries/clib/io/Makefile.in:1.81->1.82
libraries/clib/management/Makefile.in:1.90->1.91
libraries/clib/math/Makefile.in:1.86->1.87
libraries/clib/native/Makefile.in:1.113->1.114
libraries/clib/net/Makefile.in:1.94->1.95
libraries/clib/nio/Makefile.in:1.7->1.8
libraries/clib/security/Makefile.in:1.54->1.55
libraries/clib/zip/Makefile.in:1.88->1.89
libraries/extensions/Makefile.in:1.66->1.67
libraries/extensions/comm/Makefile.in:1.61->1.62
libraries/extensions/comm/javalib/Makefile.in:1.61->1.62
libraries/extensions/microsoft/Makefile.in:1.53->1.54
libraries/extensions/microsoft/clib/Makefile.in:1.56->1.57
libraries/extensions/microsoft/javalib/Makefile.in:1.54->1.55
libraries/extensions/pjava/Makefile.in:1.61->1.62
libraries/extensions/pjava/javalib/Makefile.in:1.61->1.62
libraries/extensions/servlet/Makefile.in:1.61->1.62
libraries/extensions/servlet/javalib/Makefile.in:1.61->1.62
libraries/extensions/sound/Makefile.in:1.29->1.30
libraries/extensions/sound/alsa/Makefile.in:1.31->1.32
libraries/extensions/sound/common/Makefile.in:1.31->1.32
libraries/extensions/sound/esd/Makefile.in:1.31->1.32
libraries/javalib/Makefile.am:1.156->1.157
libraries/javalib/Makefile.in:1.208->1.209
m4/alsa.m4:INITIAL->1.1
replace/Makefile.in:1.25->1.26
test/Makefile.in:1.81->1.82
test/internal/Makefile.in:1.39->1.40
test/regression/Makefile.in:1.148->1.149
test/regression/compile_time/Makefile.in:1.9->1.10
test/regression/run_time/Makefile.in:1.10->1.11
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1911 kaffe/ChangeLog:1.1912
--- kaffe/ChangeLog:1.1911 Sun Jan 11 21:31:06 2004
+++ kaffe/ChangeLog Sun Jan 11 22:06:46 2004
@@ -1,3 +1,78 @@
+2004-01-11 Jim Pick <jim at kaffe.org>
+
+ * m4/alsa.m4:
+ From http://cvs.sourceforge.net/viewcvs.py/*checkout*/alsa/alsa-lib/utils/alsa.m4?rev=1.22
+
+ Used to detect ALSA version.
+
+ * configure.in:
+ Don't use ALSA earlier than 1.0.1.
+
+ * THIRDPARTY:
+ Mention alsa.m4
+
+ * configure,
+ aclocal.m4,
+ config/config.h.in,
+ Makefile.in,
+ config/Makefile.in,
+ include/Makefile.in,
+ kaffe/Makefile.in,
+ kaffe/jvmpi/Makefile.in,
+ kaffe/kaffe/Makefile.in,
+ kaffe/kaffeh/Makefile.in,
+ kaffe/kaffevm/Makefile.in,
+ kaffe/kaffevm/gcj/Makefile.in,
+ kaffe/kaffevm/intrp/Makefile.in,
+ kaffe/kaffevm/jit/Makefile.in,
+ kaffe/kaffevm/jit3/Makefile.in,
+ kaffe/kaffevm/systems/Makefile.in,
+ kaffe/kaffevm/systems/beos-native/Makefile.in,
+ kaffe/kaffevm/systems/oskit-pthreads/Makefile.in,
+ kaffe/kaffevm/systems/unix-jthreads/Makefile.in,
+ kaffe/kaffevm/systems/unix-pthreads/Makefile.in,
+ kaffe/man/Makefile.in,
+ kaffe/scripts/Makefile.in,
+ kaffe/scripts/bat/Makefile.in,
+ kaffe/scripts/compat/Makefile.in,
+ kaffe/xprof/Makefile.in,
+ libraries/Makefile.in,
+ libraries/clib/Makefile.in,
+ libraries/clib/awt/Makefile.in,
+ libraries/clib/awt/X/Makefile.in,
+ libraries/clib/awt/qt/Makefile.in,
+ libraries/clib/io/Makefile.in,
+ libraries/clib/management/Makefile.in,
+ libraries/clib/math/Makefile.in,
+ libraries/clib/native/Makefile.in,
+ libraries/clib/net/Makefile.in,
+ libraries/clib/nio/Makefile.in,
+ libraries/clib/security/Makefile.in,
+ libraries/clib/zip/Makefile.in,
+ libraries/extensions/Makefile.in,
+ libraries/extensions/comm/Makefile.in,
+ libraries/extensions/comm/javalib/Makefile.in,
+ libraries/extensions/microsoft/Makefile.in,
+ libraries/extensions/microsoft/clib/Makefile.in,
+ libraries/extensions/microsoft/javalib/Makefile.in,
+ libraries/extensions/pjava/Makefile.in,
+ libraries/extensions/pjava/javalib/Makefile.in,
+ libraries/extensions/servlet/Makefile.in,
+ libraries/extensions/servlet/javalib/Makefile.in,
+ libraries/extensions/sound/Makefile.in,
+ libraries/extensions/sound/alsa/Makefile.in,
+ libraries/extensions/sound/common/Makefile.in,
+ libraries/extensions/sound/esd/Makefile.in,
+ libraries/javalib/Makefile.am,
+ libraries/javalib/Makefile.in,
+ replace/Makefile.in,
+ test/Makefile.in,
+ test/internal/Makefile.in,
+ test/regression/Makefile.in,
+ test/regression/compile_time/Makefile.in,
+ test/regression/run_time/Makefile.in:
+ Regenerated.
+
2004-01-11 Dalibor Topic <robilad at kaffe.org>
Resynced with Jessie 0.9.6.
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.125 kaffe/Makefile.in:1.126
--- kaffe/Makefile.in:1.125 Fri Jan 2 17:39:57 2004
+++ kaffe/Makefile.in Sun Jan 11 22:06:46 2004
@@ -54,12 +54,12 @@
depcomp install-sh ltmain.sh missing mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnu-crypto.m4 \
- $(top_srcdir)/m4/gwqt.m4 $(top_srcdir)/m4/herrno.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/in6addr.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/sockaddrin6.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/alsa.m4 \
+ $(top_srcdir)/m4/gnu-crypto.m4 $(top_srcdir)/m4/gwqt.m4 \
+ $(top_srcdir)/m4/herrno.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/in6addr.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/sockaddrin6.m4 \
$(top_srcdir)/m4/sockinttypes.m4 $(top_srcdir)/m4/valist.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -93,6 +93,8 @@
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
Index: kaffe/THIRDPARTY
diff -u kaffe/THIRDPARTY:1.6 kaffe/THIRDPARTY:1.7
--- kaffe/THIRDPARTY:1.6 Tue Dec 9 12:37:26 2003
+++ kaffe/THIRDPARTY Sun Jan 11 22:06:46 2004
@@ -217,6 +217,10 @@
More information on GNU gettext is available from
http://www.gnu.org/software/gettext/.
+* m4/alsa.m4
+
+Autoconf/automake macros taken from ALSA CVS. Licensed under the GPL/LGPL.
+
* libraries/javalib/kjc.jar
Kopi Java Compiler 2.1B with kaffe specific patches and bugfixes. Kjc is
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.86 kaffe/aclocal.m4:1.87
--- kaffe/aclocal.m4:1.86 Wed Dec 24 19:06:50 2003
+++ kaffe/aclocal.m4 Sun Jan 11 22:06:47 2004
@@ -953,6 +953,7 @@
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
+m4_include([m4/alsa.m4])
m4_include([m4/gnu-crypto.m4])
m4_include([m4/gwqt.m4])
m4_include([m4/herrno.m4])
Index: kaffe/configure
diff -u kaffe/configure:1.272 kaffe/configure:1.273
--- kaffe/configure:1.272 Fri Jan 2 17:39:57 2004
+++ kaffe/configure Sun Jan 11 22:06:47 2004
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for Kaffe OpenVM 1.1.x-cvs.
+# Generated by GNU Autoconf 2.59 for Kaffe 1.1.x-cvs.
#
# Report bugs to <kaffe at kaffe.org>.
#
@@ -421,10 +421,10 @@
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME='Kaffe OpenVM'
+PACKAGE_NAME='Kaffe'
PACKAGE_TARNAME='kaffe'
PACKAGE_VERSION='1.1.x-cvs'
-PACKAGE_STRING='Kaffe OpenVM 1.1.x-cvs'
+PACKAGE_STRING='Kaffe 1.1.x-cvs'
PACKAGE_BUGREPORT='kaffe at kaffe.org'
ac_unique_file="kaffe"
@@ -467,7 +467,7 @@
#endif"
ac_subdirs_all="$ac_subdirs_all libltdl"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE DNSJAVA_JAR HAVE_DNSJAVA_TRUE HAVE_DNSJAVA_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR JIKESPROG JIKES KAFFEVM_TRAMPOLINES_C KVER JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JIKES_TRUE HAVE_JIKES_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS VM_LIBS NET_LIBS ZIP_LIBS MATH_LIBS SECURITY_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS LIBICONV LTLIBICONV USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK AWT_DIR COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS GNU_CRYPTO_HOME GNU_CRYPTO_JAR JAVAX_CRYPTO_JAR JAVAX_SECURITY_JAR USER_WANT_GNU_CRYPTO_TRUE USER_WANT_GNU_CRYPTO_FALSE PROFILE USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG subdirs LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE DNSJAVA_JAR HAVE_DNSJAVA_TRUE HAVE_DNSJAVA_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR JIKESPROG JIKES KAFFEVM_TRAMPOLINES_C KVER JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JIKES_TRUE HAVE_JIKES_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS VM_LIBS NET_LIBS ZIP_LIBS MATH_LIBS SECURITY_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS LIBICONV LTLIBICONV USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK AWT_DIR ALSA_CFLAGS ALSA_LIBS COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS GNU_CRYPTO_HOME GNU_CRYPTO_JAR JAVAX_CRYPTO_JAR JAVAX_SECURITY_JAR USER_WANT_GNU_CRYPTO_TRUE USER_WANT_GNU_CRYPTO_FALSE PROFILE USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG subdirs LTLIBOBJS'
ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag'
# Initialize some variables set by options.
@@ -956,7 +956,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Kaffe OpenVM 1.1.x-cvs to adapt to many kinds of systems.
+\`configure' configures Kaffe 1.1.x-cvs to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1026,7 +1026,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Kaffe OpenVM 1.1.x-cvs:";;
+ short | recursive ) echo "Configuration of Kaffe 1.1.x-cvs:";;
esac
cat <<\_ACEOF
@@ -1054,6 +1054,7 @@
--enable-gcj Enable GCJ support
--disable-mips2 Disable MIPS II instructions
--disable-rpath do not hardcode runtime library paths
+ --disable-alsatest Do not try to compile and run a test Alsa program
--disable-sound Disable javax.sound support
--enable-pure-java-math Enable pure java java.math.* package [default=native]
@@ -1085,6 +1086,8 @@
--without-libiconv-prefix don't search for libiconv in includedir and libdir
--with-awt=GRAPHICSYS specify AWT engine (no, X, qt)
--with-qtdir=DIR Qt installation directory default=$QTDIR
+ --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)
+ --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)
--without-alsa Don't use ALSA for sound default is to use it if present
--without-esd Don't use esd for sound default is to use it if present
--with-extensions the extensions (like the servlet API) to include [default=none]
@@ -1210,7 +1213,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-Kaffe OpenVM configure 1.1.x-cvs
+Kaffe configure 1.1.x-cvs
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1224,7 +1227,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Kaffe OpenVM $as_me 1.1.x-cvs, which was
+It was created by Kaffe $as_me 1.1.x-cvs, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -4341,7 +4344,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4344 "configure"' > conftest.$ac_ext
+ echo '#line 4347 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5691,7 +5694,7 @@
# Provide some information about the compiler.
-echo "$as_me:5694:" \
+echo "$as_me:5697:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6728,11 +6731,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6731: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6734: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6735: \$? = $ac_status" >&5
+ echo "$as_me:6738: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6960,11 +6963,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6963: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6966: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6967: \$? = $ac_status" >&5
+ echo "$as_me:6970: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -7027,11 +7030,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7030: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7033: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7034: \$? = $ac_status" >&5
+ echo "$as_me:7037: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9145,7 +9148,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9148 "configure"
+#line 9151 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9243,7 +9246,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9246 "configure"
+#line 9249 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11399,11 +11402,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11402: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11405: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11406: \$? = $ac_status" >&5
+ echo "$as_me:11409: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -11466,11 +11469,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11469: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11472: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11473: \$? = $ac_status" >&5
+ echo "$as_me:11476: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12795,7 +12798,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12798 "configure"
+#line 12801 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12893,7 +12896,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12896 "configure"
+#line 12899 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13715,11 +13718,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13718: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13721: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13722: \$? = $ac_status" >&5
+ echo "$as_me:13725: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -13782,11 +13785,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13785: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13788: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13789: \$? = $ac_status" >&5
+ echo "$as_me:13792: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15748,11 +15751,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15751: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15754: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15755: \$? = $ac_status" >&5
+ echo "$as_me:15758: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15980,11 +15983,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15983: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15986: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15987: \$? = $ac_status" >&5
+ echo "$as_me:15990: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -16047,11 +16050,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16050: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16053: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16054: \$? = $ac_status" >&5
+ echo "$as_me:16057: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18165,7 +18168,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18168 "configure"
+#line 18171 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18263,7 +18266,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18266 "configure"
+#line 18269 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -44985,9 +44988,176 @@
-echo "$as_me:$LINENO: checking for snd_seq_open in -lasound" >&5
-echo $ECHO_N "checking for snd_seq_open in -lasound... $ECHO_C" >&6
-if test "${ac_cv_lib_asound_snd_seq_open+set}" = set; then
+alsa_save_CFLAGS="$CFLAGS"
+alsa_save_LDFLAGS="$LDFLAGS"
+alsa_save_LIBS="$LIBS"
+alsa_found=yes
+
+
+# Check whether --with-alsa-prefix or --without-alsa-prefix was given.
+if test "${with_alsa_prefix+set}" = set; then
+ withval="$with_alsa_prefix"
+ alsa_prefix="$withval"
+else
+ alsa_prefix=""
+fi;
+
+
+# Check whether --with-alsa-inc-prefix or --without-alsa-inc-prefix was given.
+if test "${with_alsa_inc_prefix+set}" = set; then
+ withval="$with_alsa_inc_prefix"
+ alsa_inc_prefix="$withval"
+else
+ alsa_inc_prefix=""
+fi;
+
+# Check whether --enable-alsatest or --disable-alsatest was given.
+if test "${enable_alsatest+set}" = set; then
+ enableval="$enable_alsatest"
+ enable_alsatest=no
+else
+ enable_alsatest=yes
+fi;
+
+echo "$as_me:$LINENO: checking for ALSA CFLAGS" >&5
+echo $ECHO_N "checking for ALSA CFLAGS... $ECHO_C" >&6
+if test "$alsa_inc_prefix" != "" ; then
+ ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix"
+ CFLAGS="$CFLAGS -I$alsa_inc_prefix"
+fi
+echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5
+echo "${ECHO_T}$ALSA_CFLAGS" >&6
+
+echo "$as_me:$LINENO: checking for ALSA LDFLAGS" >&5
+echo $ECHO_N "checking for ALSA LDFLAGS... $ECHO_C" >&6
+if test "$alsa_prefix" != "" ; then
+ ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
+ LDFLAGS="$LDFLAGS $ALSA_LIBS"
+fi
+
+ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"
+LIBS=`echo $LIBS | sed 's/-lm//'`
+LIBS=`echo $LIBS | sed 's/-ldl//'`
+LIBS=`echo $LIBS | sed 's/-lpthread//'`
+LIBS=`echo $LIBS | sed 's/ //'`
+LIBS="$ALSA_LIBS $LIBS"
+echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5
+echo "${ECHO_T}$ALSA_LIBS" >&6
+
+min_alsa_version=1.0.1
+echo "$as_me:$LINENO: checking for libasound headers version >= $min_alsa_version" >&5
+echo $ECHO_N "checking for libasound headers version >= $min_alsa_version... $ECHO_C" >&6
+no_alsa=""
+ alsa_min_major_version=`echo $min_alsa_version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+ alsa_min_minor_version=`echo $min_alsa_version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+ alsa_min_micro_version=`echo $min_alsa_version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include <alsa/asoundlib.h>
+
+int
+main ()
+{
+
+/* ensure backward compatibility */
+#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
+#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR
+#endif
+#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR)
+#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR
+#endif
+#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR)
+#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR
+#endif
+
+# if(SND_LIB_MAJOR > $alsa_min_major_version)
+ exit(0);
+# else
+# if(SND_LIB_MAJOR < $alsa_min_major_version)
+# error not present
+# endif
+
+# if(SND_LIB_MINOR > $alsa_min_minor_version)
+ exit(0);
+# else
+# if(SND_LIB_MINOR < $alsa_min_minor_version)
+# error not present
+# endif
+
+# if(SND_LIB_SUBMINOR < $alsa_min_micro_version)
+# error not present
+# endif
+# endif
+# endif
+exit(0);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ echo "$as_me:$LINENO: result: found." >&5
+echo "${ECHO_T}found." >&6
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: not present." >&5
+echo "${ECHO_T}not present." >&6
+
+ alsa_found=no
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+echo "$as_me:$LINENO: checking for snd_ctl_open in -lasound" >&5
+echo $ECHO_N "checking for snd_ctl_open in -lasound... $ECHO_C" >&6
+if test "${ac_cv_lib_asound_snd_ctl_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -45005,11 +45175,11 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char snd_seq_open ();
+char snd_ctl_open ();
int
main ()
{
-snd_seq_open ();
+snd_ctl_open ();
;
return 0;
}
@@ -45036,31 +45206,55 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_asound_snd_seq_open=yes
+ ac_cv_lib_asound_snd_ctl_open=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_asound_snd_seq_open=no
+ac_cv_lib_asound_snd_ctl_open=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_seq_open" >&5
-echo "${ECHO_T}$ac_cv_lib_asound_snd_seq_open" >&6
-if test $ac_cv_lib_asound_snd_seq_open = yes; then
- have_alsa=yes;
- echo "$as_me:$LINENO: result: Information: ALSA found" >&5
-echo "${ECHO_T}Information: ALSA found" >&6
-else
- have_alsa=no;
- echo "$as_me:$LINENO: result: Information: ALSA not found" >&5
-echo "${ECHO_T}Information: ALSA not found" >&6
+echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_ctl_open" >&5
+echo "${ECHO_T}$ac_cv_lib_asound_snd_ctl_open" >&6
+if test $ac_cv_lib_asound_snd_ctl_open = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBASOUND 1
+_ACEOF
+
+ LIBS="-lasound $LIBS"
+
+else
+
+ alsa_found=no
+
+fi
+
+
+if test "x$alsa_found" = "xyes" ; then
+ :
+ LIBS=`echo $LIBS | sed 's/-lasound//g'`
+ LIBS=`echo $LIBS | sed 's/ //'`
+ LIBS="-lasound $LIBS"
+fi
+if test "x$alsa_found" = "xno" ; then
+ echo "$as_me:$LINENO: result: Useable version of ALSA not found." >&5
+echo "${ECHO_T}Useable version of ALSA not found." >&6
+
+ CFLAGS="$alsa_save_CFLAGS"
+ LDFLAGS="$alsa_save_LDFLAGS"
+ LIBS="$alsa_save_LIBS"
+ ALSA_CFLAGS=""
+ ALSA_LIBS=""
fi
+
+
+
have_esd_h=no
if test "${ac_cv_header_esd_h+set}" = set; then
echo "$as_me:$LINENO: checking for esd.h" >&5
@@ -45294,7 +45488,7 @@
no)
;;
*)
- if test x"$have_alsa" = x"yes"; then
+ if test x"$alsa_found" = x"yes"; then
ALSA_DIR=alsa
ALSA_LIB="\$(top_builddir)/libraries/extensions/sound/alsa/libtritonusalsa.la"
fi
@@ -46901,7 +47095,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by Kaffe OpenVM $as_me 1.1.x-cvs, which was
+This file was extended by Kaffe $as_me 1.1.x-cvs, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -46964,7 +47158,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Kaffe OpenVM config.status 1.1.x-cvs
+Kaffe config.status 1.1.x-cvs
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -47395,6 +47589,8 @@
s, at QT_LDADD@,$QT_LDADD,;t t
s, at QT_GUILINK@,$QT_GUILINK,;t t
s, at AWT_DIR@,$AWT_DIR,;t t
+s, at ALSA_CFLAGS@,$ALSA_CFLAGS,;t t
+s, at ALSA_LIBS@,$ALSA_LIBS,;t t
s, at COND_SOUND_ALSA_TRUE@,$COND_SOUND_ALSA_TRUE,;t t
s, at COND_SOUND_ALSA_FALSE@,$COND_SOUND_ALSA_FALSE,;t t
s, at COND_SOUND_ESD_TRUE@,$COND_SOUND_ESD_TRUE,;t t
Index: kaffe/configure.in
diff -u kaffe/configure.in:1.237 kaffe/configure.in:1.238
--- kaffe/configure.in:1.237 Fri Jan 2 17:40:02 2004
+++ kaffe/configure.in Sun Jan 11 22:06:49 2004
@@ -1,4 +1,4 @@
-AC_INIT([Kaffe OpenVM],[1.1.x-cvs],[kaffe at kaffe.org],[kaffe])
+AC_INIT([Kaffe],[1.1.x-cvs],[kaffe at kaffe.org],[kaffe])
AC_CONFIG_SRCDIR([kaffe])
AM_INIT_AUTOMAKE(kaffe, 1.1.x-cvs)
AC_CONFIG_MACRO_DIR([m4])
@@ -1274,15 +1274,11 @@
dnl Configure sound backend
dnl -------------------------------------------------------------------------
-dnl Check for ALSA
+dnl Check for alsa
-AC_CHECK_LIB(
- asound,
- snd_seq_open,
- [have_alsa=yes;
- AC_MSG_RESULT(Information: ALSA found)],
- [have_alsa=no;
- AC_MSG_RESULT(Information: ALSA not found)],
+AM_PATH_ALSA(1.0.1,
+ ,
+ [AC_MSG_RESULT([Useable version of ALSA not found.])]
)
dnl Check for esd
@@ -1309,7 +1305,7 @@
no)
;;
*)
- if test x"$have_alsa" = x"yes"; then
+ if test x"$alsa_found" = x"yes"; then
ALSA_DIR=alsa
ALSA_LIB="\$(top_builddir)/libraries/extensions/sound/alsa/libtritonusalsa.la"
fi
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.106 kaffe/config/Makefile.in:1.107
--- kaffe/config/Makefile.in:1.106 Fri Jan 2 17:40:05 2004
+++ kaffe/config/Makefile.in Sun Jan 11 22:06:52 2004
@@ -50,12 +50,12 @@
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnu-crypto.m4 \
- $(top_srcdir)/m4/gwqt.m4 $(top_srcdir)/m4/herrno.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/in6addr.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/sockaddrin6.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/alsa.m4 \
+ $(top_srcdir)/m4/gnu-crypto.m4 $(top_srcdir)/m4/gwqt.m4 \
+ $(top_srcdir)/m4/herrno.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/in6addr.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/sockaddrin6.m4 \
$(top_srcdir)/m4/sockinttypes.m4 $(top_srcdir)/m4/valist.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -70,6 +70,8 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
Index: kaffe/config/config.h.in
diff -u kaffe/config/config.h.in:1.83 kaffe/config/config.h.in:1.84
--- kaffe/config/config.h.in:1.83 Sun Nov 23 17:46:39 2003
+++ kaffe/config/config.h.in Sun Jan 11 22:06:52 2004
@@ -196,6 +196,9 @@
/* Define to 1 if you have the `kill' function. */
#undef HAVE_KILL
+/* Define to 1 if you have the `asound' library (-lasound). */
+#undef HAVE_LIBASOUND
+
/* Define to 1 if you have the `Csup' library (-lCsup). */
#undef HAVE_LIBCSUP
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.131 kaffe/include/Makefile.in:1.132
--- kaffe/include/Makefile.in:1.131 Fri Jan 2 17:40:06 2004
+++ kaffe/include/Makefile.in Sun Jan 11 22:06:53 2004
@@ -50,12 +50,12 @@
$(pkginclude_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnu-crypto.m4 \
- $(top_srcdir)/m4/gwqt.m4 $(top_srcdir)/m4/herrno.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/in6addr.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/sockaddrin6.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/alsa.m4 \
+ $(top_srcdir)/m4/gnu-crypto.m4 $(top_srcdir)/m4/gwqt.m4 \
+ $(top_srcdir)/m4/herrno.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/in6addr.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/sockaddrin6.m4 \
$(top_srcdir)/m4/sockinttypes.m4 $(top_srcdir)/m4/valist.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -77,6 +77,8 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.92 kaffe/kaffe/Makefile.in:1.93
--- kaffe/kaffe/Makefile.in:1.92 Fri Jan 2 17:40:07 2004
+++ kaffe/kaffe/Makefile.in Sun Jan 11 22:06:54 2004
@@ -45,12 +45,12 @@
subdir = kaffe
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnu-crypto.m4 \
- $(top_srcdir)/m4/gwqt.m4 $(top_srcdir)/m4/herrno.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/in6addr.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/sockaddrin6.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/alsa.m4 \
+ $(top_srcdir)/m4/gnu-crypto.m4 $(top_srcdir)/m4/gwqt.m4 \
+ $(top_srcdir)/m4/herrno.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/in6addr.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/sockaddrin6.m4 \
$(top_srcdir)/m4/sockinttypes.m4 $(top_srcdir)/m4/valist.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -72,6 +72,8 @@
DIST_SUBDIRS = kaffeh kaffevm xprof jvmpi kaffe scripts man
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.13 kaffe/kaffe/jvmpi/Makefile.in:1.14
--- kaffe/kaffe/jvmpi/Makefile.in:1.13 Fri Jan 2 17:40:07 2004
+++ kaffe/kaffe/jvmpi/Makefile.in Sun Jan 11 22:06:54 2004
@@ -40,12 +40,12 @@
subdir = kaffe/jvmpi
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnu-crypto.m4 \
- $(top_srcdir)/m4/gwqt.m4 $(top_srcdir)/m4/herrno.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/in6addr.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/sockaddrin6.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/alsa.m4 \
+ $(top_srcdir)/m4/gnu-crypto.m4 $(top_srcdir)/m4/gwqt.m4 \
+ $(top_srcdir)/m4/herrno.m4 $(top_srcdir)/m4/iconv.m4 \
+ $(top_srcdir)/m4/in6addr.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/sockaddrin6.m4 \
$(top_srcdir)/m4/sockinttypes.m4 $(top_srcdir)/m4/valist.m4 \
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -79,6 +79,8 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.106 kaffe/kaffe/kaffe/Makefile.in:1.107
--- kaffe/kaffe/kaffe/Makefile.in:1.106 Fri Jan 2 17:40:08 2004
+++ kaffe/kaffe/kaffe/Makefile.in Sun Jan 11 22:06:55 2004
@@ -49,12 +49,12 @@
subdir = kaffe/kaffe
*** Patch too long, truncated ***
More information about the kaffe
mailing list