emacs: configure.in comparison

comparison configure.in @ 90428:a8190f7e546e

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 285-296) - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: admin/FOR-RELEASE: Update refcard section. * gnus--rel--5.10 (patch 102-104) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64

author	Miles Bader <miles@gnu.org>
date	Wed, 07 Jun 2006 18:05:10 +0000
parents	bf2bc4490b64 2b8661046f9e
children	8a8e69664178

comparison

equal deleted inserted replaced

-:ddb25860d044
+:a8190f7e546e
 AC_CONFIG_LIBOBJ_DIR(src)
 dnl Do this early because it can frob feature test macros for Unix-98 &c.
 AC_SYS_LARGEFILE
+dnl This function defintion taken from Gnome 2.0
+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+dnl also defines GSTUFF_PKG_ERRORS on error
+AC_DEFUN([PKG_CHECK_MODULES], [
+succeeded=no
+if test -z "$PKG_CONFIG"; then
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+fi
+if test "$PKG_CONFIG" = "no" ; then
+ifelse([$4], , [AC_MSG_ERROR([
+*** The pkg-config script could not be found. Make sure it is in your path, or give the full path to pkg-config with the PKG_CONFIG environment variable or --with-pkg-config-prog.  Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config.])], [$4])
+else
+PKG_CONFIG_MIN_VERSION=0.9.0
+if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+AC_MSG_CHECKING(for $2)
+if $PKG_CONFIG --exists "$2" ; then
+AC_MSG_RESULT(yes)
+succeeded=yes
+AC_MSG_CHECKING($1_CFLAGS)
+$1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+AC_MSG_RESULT($$1_CFLAGS)
+AC_MSG_CHECKING($1_LIBS)
+$1_LIBS=`$PKG_CONFIG --libs "$2"`
+AC_MSG_RESULT($$1_LIBS)
+else
+AC_MSG_RESULT(no)
+$1_CFLAGS=""
+$1_LIBS=""
+## If we have a custom action on failure, don't print errors, but
+## do set a variable so people can do so.
+$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ifelse([$4], ,echo $$1_PKG_ERRORS,)
+fi
+AC_SUBST($1_CFLAGS)
+AC_SUBST($1_LIBS)
+else
+echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+echo "*** See http://www.freedesktop.org/software/pkgconfig"
+fi
+fi
+if test $succeeded = yes; then
+ifelse([$3], , :, [$3])
+else
+ifelse([$4], , [AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.])], [$4])
+fi
+])
 if test "${with_sound}" != "no"; then
 # Sound support for GNU/Linux and the free BSDs.
 AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h soundcard.h)
 # Emulation library used on NetBSD.
 AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
 AC_SUBST(LIBSOUND)
+ALSA_REQUIRED=1.0.0
+ALSA_MODULES="alsa >= $ALSA_REQUIRED"
+dnl Check if --with-pkg-config-prog has been given.
+if test "X${with_pkg_config_prog}" != X; then
+PKG_CONFIG="${with_pkg_config_prog}"
+fi
+PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
+if test $HAVE_ALSA = yes; then
+LIBSOUND="$LIBSOUND $ALSA_LIBS"
+CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
+AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
+fi
+AC_SUBST(CFLAGS_SOUND)
 fi
 dnl checks for header files
 AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
 linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
 else
 HAVE_X11R5=no
 AC_MSG_RESULT(before 5)
 fi
 fi
-dnl This function defintion taken from Gnome 2.0
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN([PKG_CHECK_MODULES], [
-succeeded=no
-if test -z "$PKG_CONFIG"; then
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-fi
-if test "$PKG_CONFIG" = "no" ; then
-echo "*** The pkg-config script could not be found. Make sure it is"
-echo "*** in your path, or give the full path to pkg-config with"
-echo "*** the PKG_CONFIG environment variable or --with-pkg-config-prog."
-echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-else
-PKG_CONFIG_MIN_VERSION=0.9.0
-if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-AC_MSG_CHECKING(for $2)
-if $PKG_CONFIG --exists "$2" ; then
-AC_MSG_RESULT(yes)
-succeeded=yes
-AC_MSG_CHECKING($1_CFLAGS)
-$1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-AC_MSG_RESULT($$1_CFLAGS)
-AC_MSG_CHECKING($1_LIBS)
-$1_LIBS=`$PKG_CONFIG --libs "$2"`
-AC_MSG_RESULT($$1_LIBS)
-else
-$1_CFLAGS=""
-$1_LIBS=""
-## If we have a custom action on failure, don't print errors, but
-## do set a variable so people can do so.
-$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-ifelse([$4], ,echo $$1_PKG_ERRORS,)
-fi
-AC_SUBST($1_CFLAGS)
-AC_SUBST($1_LIBS)
-else
-echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-echo "*** See http://www.freedesktop.org/software/pkgconfig"
-fi
-fi
-if test $succeeded = yes; then
-ifelse([$3], , :, [$3])
-else
-ifelse([$4], , [AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.])], [$4])
-fi
-])
 HAVE_GTK=no
 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then
 AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]);
 #define HAVE_SOUND 1
 #endif
 #ifdef HAVE_SOUNDCARD_H
 #define HAVE_SOUND 1
 #endif
+#ifdef HAVE_ALSA
+#define HAVE_SOUND 1
+#endif
 #endif /* __FreeBSD__ || __NetBSD__ || __linux__  */
 /* If using GNU, then support inline function declarations. */
 /* Don't try to switch on inline handling as detected by AC_C_INLINE
 generally, because even if non-gcc compilers accept `inline', they

Mercurial > emacs

comparison configure.in @ 90428:a8190f7e546e