Mercurial > vim

comparison src/configure.ac @ 17004:353ed7ef78df v8.1.1502

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1502: cannot play any sound commit https://github.com/vim/vim/commit/427f5b66ce0abe19daed9291b1693f6e8aae6552 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jun 9 13:43:51 2019 +0200 patch 8.1.1502: cannot play any sound Problem: Cannot play any sound. Solution: Use libcanberra if available. Add sound functions.
author Bram Moolenaar <Bram@vim.org>
date Sun, 09 Jun 2019 13:45:06 +0200
parents 15f787b7da56
children 70f424551938
comparison
equal deleted inserted replaced
17003:0363f6e9eac3 17004:353ed7ef78df
2700 2700
2701 AC_DEFUN([GNOME_INIT],[ 2701 AC_DEFUN([GNOME_INIT],[
2702 GNOME_INIT_HOOK([],fail) 2702 GNOME_INIT_HOOK([],fail)
2703 ]) 2703 ])
2704 2704
2705 if test "X$PKG_CONFIG" = "X"; then
2706 AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
2707 fi
2708
2705 2709
2706 dnl --------------------------------------------------------------------------- 2710 dnl ---------------------------------------------------------------------------
2707 dnl Check for GTK2. If it fails, then continue on for Motif as before... 2711 dnl Check for GTK2. If it fails, then continue on for Motif as before...
2708 dnl --------------------------------------------------------------------------- 2712 dnl ---------------------------------------------------------------------------
2709 if test -z "$SKIP_GTK2"; then 2713 if test -z "$SKIP_GTK2"; then
2713 , enable_gtktest=yes) 2717 , enable_gtktest=yes)
2714 if test "x$enable_gtktest" = "xyes" ; then 2718 if test "x$enable_gtktest" = "xyes" ; then
2715 AC_MSG_RESULT(gtk test enabled) 2719 AC_MSG_RESULT(gtk test enabled)
2716 else 2720 else
2717 AC_MSG_RESULT(gtk test disabled) 2721 AC_MSG_RESULT(gtk test disabled)
2718 fi
2719
2720 if test "X$PKG_CONFIG" = "X"; then
2721 AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
2722 fi 2722 fi
2723 2723
2724 if test "x$PKG_CONFIG" != "xno"; then 2724 if test "x$PKG_CONFIG" != "xno"; then
2725 dnl First try finding version 2.2.0 or later. The 2.0.x series has 2725 dnl First try finding version 2.2.0 or later. The 2.0.x series has
2726 dnl problems (bold fonts, --remote doesn't work). 2726 dnl problems (bold fonts, --remote doesn't work).
2765 , enable_gtktest=yes) 2765 , enable_gtktest=yes)
2766 if test "x$enable_gtktest" = "xyes" ; then 2766 if test "x$enable_gtktest" = "xyes" ; then
2767 AC_MSG_RESULT(gtk test enabled) 2767 AC_MSG_RESULT(gtk test enabled)
2768 else 2768 else
2769 AC_MSG_RESULT(gtk test disabled) 2769 AC_MSG_RESULT(gtk test disabled)
2770 fi
2771
2772 if test "X$PKG_CONFIG" = "X"; then
2773 AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
2774 fi 2770 fi
2775 2771
2776 if test "x$PKG_CONFIG" != "xno"; then 2772 if test "x$PKG_CONFIG" != "xno"; then
2777 AM_PATH_GTK(3.0.0, 2773 AM_PATH_GTK(3.0.0,
2778 [GUI_LIB_LOC="$GTK_LIBDIR" 2774 [GUI_LIB_LOC="$GTK_LIBDIR"
3752 AC_FUNC_FSEEKO 3748 AC_FUNC_FSEEKO
3753 3749
3754 dnl define _LARGE_FILES, _FILE_OFFSET_BITS and _LARGEFILE_SOURCE when 3750 dnl define _LARGE_FILES, _FILE_OFFSET_BITS and _LARGEFILE_SOURCE when
3755 dnl appropriate, so that off_t is 64 bits when needed. 3751 dnl appropriate, so that off_t is 64 bits when needed.
3756 AC_SYS_LARGEFILE 3752 AC_SYS_LARGEFILE
3753
3754
3755 if test "x$PKG_CONFIG" != "xno"; then
3756 canberra_lib=`$PKG_CONFIG --libs libcanberra 2>/dev/null`
3757 canberra_cflags=`$PKG_CONFIG --cflags libcanberra 2>/dev/null`
3758 fi
3759 if test "x$canberra_lib" = "x"; then
3760 canberra_lib=-lcanberra
3761 canberra_cflags=-D_REENTRANT
3762 fi
3763 AC_MSG_CHECKING(for libcanberra)
3764 ac_save_CFLAGS="$CFLAGS"
3765 ac_save_LIBS="$LIBS"
3766 CFLAGS="$CFLAGS $canberra_cflags"
3767 LIBS="$LIBS $canberra_lib"
3768 AC_TRY_LINK([
3769 # include <canberra.h>
3770 ], [
3771 ca_context *hello;
3772 ca_context_create(&hello);],
3773 AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CANBERRA),
3774 AC_MSG_RESULT(no); CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS")
3775
3757 3776
3758 dnl fstatfs() can take 2 to 4 arguments, try to use st_blksize if possible 3777 dnl fstatfs() can take 2 to 4 arguments, try to use st_blksize if possible
3759 AC_MSG_CHECKING(for st_blksize) 3778 AC_MSG_CHECKING(for st_blksize)
3760 AC_TRY_COMPILE( 3779 AC_TRY_COMPILE(
3761 [#include <sys/types.h> 3780 [#include <sys/types.h>