[TRIVIAL] kdelibs 3_1_BRANCH build fix against alsa-lib 1.0.0pre1
Sergio Visinoni
piffio at arklinux.org
Mon Nov 24 13:07:28 GMT 2003
Hi,
the attached patch should fix the problem (at least does here).
Generated against ARTS_1_1_BRANCH.
greetings,
sergio
-------------- next part --------------
--- arts/configure.in.in.alsa1x 2003-11-24 12:49:41.000000000 +0100
+++ arts/configure.in.in 2003-11-24 13:53:00.000000000 +0100
@@ -497,6 +497,26 @@
#include <alsa/asoundlib.h>
#endif
],[
+ #if (SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)
+ /* we have ALSA 1.x */
+ #else
+ #error not ALSA 1.x
+ #endif
+ ],
+ kde_has_alsa_1_0=yes,
+ kde_has_alsa_1_0=no)
+ fi
+
+ if test "x$kde_has_asoundlib" = "xyes"; then
+ AC_TRY_COMPILE([
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_ASOUNDLIB_H
+ #include <sys/asoundlib.h>
+ #endif
+ #ifdef HAVE_ALSA_ASOUNDLIB_H
+ #include <alsa/asoundlib.h>
+ #endif
+ ],[
#if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 5)
/* we have ALSA 0.5.x */
#else
@@ -523,6 +543,18 @@
AC_DEFINE(HAVE_SND_PCM_RESUME, 1,
[Define if libasound has snd_pcm_resume()])])
fi
+ if test "x$kde_has_alsa_1_0" = "xyes"; then
+ LIBASOUND="-lasound"
+ AC_DEFINE(HAVE_LIBASOUND2, 1,
+ [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)])
+ AC_DEFINE(ALSA_PCM_OLD_SW_PARAMS_API, 1,
+ [Define if you have alsa 1.x])
+ AC_DEFINE(ALSA_PCM_OLD_HW_PARAMS_API, 1,
+ [Define if you have alsa 1.x])
+ AC_CHECK_LIB(asound,snd_pcm_resume,[
+ AC_DEFINE(HAVE_SND_PCM_RESUME, 1,
+ [Define if libasound has snd_pcm_resume()])])
+ fi
])
fi
AC_SUBST(LIBASOUND)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20031124/a0cd9c42/attachment.sig>
More information about the kde-core-devel
mailing list