[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure.in,v
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] Changes to emacs/configure.in,v |
Date: |
Wed, 20 Dec 2006 19:57:19 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Jan Djärv <jhd> 06/12/20 19:57:18
Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -b -r1.424 -r1.425
--- configure.in 19 Dec 2006 06:48:25 -0000 1.424
+++ configure.in 20 Dec 2006 19:57:18 -0000 1.425
@@ -1567,9 +1567,30 @@
fi
PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
if test $HAVE_ALSA = yes; then
+ SAVE_CFLAGS="$CFLAGS"
+ SAVE_LDFLAGS="$LDFLAGS"
+ CFLAGS="$ALSA_CFLAGS $CFLAGS"
+ LDFLAGS="$ALSA_LIBS $LDFLAGS"
+ AC_TRY_COMPILE([#include <asoundlib.h>], [snd_lib_error_set_handler (0);],
+ emacs_alsa_normal=yes,
+ emacs_alsa_normal=no)
+ if test "$emacs_alsa_normal" != yes; then
+ AC_TRY_COMPILE([#include <alsa/asoundlib.h>],
+ [snd_lib_error_set_handler (0);],
+ emacs_alsa_subdir=yes,
+ emacs_alsa_subdir=no)
+ if test "$emacs_alsa_subdir" != yes; then
+ AC_MSG_ERROR([pkg-config found alsa, but it does not compile. See
config.log for error messages.])
+ fi
+ ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
+ fi
+
+ CFLAGS="$SAVE_CFLAGS"
+ LDFLAGS="$SAVE_LDFLAGS"
LIBSOUND="$LIBSOUND $ALSA_LIBS"
CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
+ AC_SUBST()
fi
AC_SUBST(CFLAGS_SOUND)
fi
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2006/12/02
- [Emacs-diffs] Changes to emacs/configure.in,v, YAMAMOTO Mitsuharu, 2006/12/04
- [Emacs-diffs] Changes to emacs/configure.in,v, Chong Yidong, 2006/12/08
- [Emacs-diffs] Changes to emacs/configure.in,v, Andreas Schwab, 2006/12/10
- [Emacs-diffs] Changes to emacs/configure.in,v, Jan Djärv, 2006/12/19
- [Emacs-diffs] Changes to emacs/configure.in,v,
Jan Djärv <=
- [Emacs-diffs] Changes to emacs/configure.in,v, Eli Zaretskii, 2006/12/22
- [Emacs-diffs] Changes to emacs/configure.in,v, Richard M. Stallman, 2006/12/23