diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-14 20:40:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-14 20:40:58 +0200 |
| commit | 21606676d9ebc6f159c56ee90733e5d5720ab3d7 (patch) | |
| tree | 9835823990627cdee4d4966eac28f359ff1f217a /src/configure.ac | |
| parent | b4086ffa32d97831f2d25a37f8c1340223dee5eb (diff) | |
| download | vim-git-21606676d9ebc6f159c56ee90733e5d5720ab3d7.tar.gz | |
patch 8.1.1529: libcanberra is linked with even when not usedv8.1.1529
Problem: Libcanberra is linked with even when not used.
Solution: Have configure check for libcanberra only when wanted.
(suggestions by Libor Bukata)
Diffstat (limited to 'src/configure.ac')
| -rw-r--r-- | src/configure.ac | 55 |
1 files changed, 36 insertions, 19 deletions
diff --git a/src/configure.ac b/src/configure.ac index 7e821e63b..dbf4f42b8 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -3751,27 +3751,44 @@ dnl define _LARGE_FILES, _FILE_OFFSET_BITS and _LARGEFILE_SOURCE when dnl appropriate, so that off_t is 64 bits when needed. AC_SYS_LARGEFILE - -if test "x$PKG_CONFIG" != "xno"; then - canberra_lib=`$PKG_CONFIG --libs libcanberra 2>/dev/null` - canberra_cflags=`$PKG_CONFIG --cflags libcanberra 2>/dev/null` +AC_MSG_CHECKING(--enable-canberra argument) +AC_ARG_ENABLE(canberra, + [ --disable-canberra Do not use libcanberra.], + , [enable_canberra="maybe"]) + +if test "$enable_canberra" = "maybe"; then + if test "$features" = "big" -o "$features" = "huge"; then + AC_MSG_RESULT(Defaulting to yes) + enable_canberra="yes" + else + AC_MSG_RESULT(Defaulting to no) + enable_canberra="no" + fi +else + AC_MSG_RESULT($enable_canberra) fi -if test "x$canberra_lib" = "x"; then - canberra_lib=-lcanberra - canberra_cflags=-D_REENTRANT +if test "$enable_canberra" = "yes"; then + if test "x$PKG_CONFIG" != "xno"; then + canberra_lib=`$PKG_CONFIG --libs libcanberra 2>/dev/null` + canberra_cflags=`$PKG_CONFIG --cflags libcanberra 2>/dev/null` + fi + if test "x$canberra_lib" = "x"; then + canberra_lib=-lcanberra + canberra_cflags=-D_REENTRANT + fi + AC_MSG_CHECKING(for libcanberra) + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $canberra_cflags" + LIBS="$LIBS $canberra_lib" + AC_TRY_LINK([ + # include <canberra.h> + ], [ + ca_context *hello; + ca_context_create(&hello);], + AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CANBERRA), + AC_MSG_RESULT(no); CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS") fi -AC_MSG_CHECKING(for libcanberra) -ac_save_CFLAGS="$CFLAGS" -ac_save_LIBS="$LIBS" -CFLAGS="$CFLAGS $canberra_cflags" -LIBS="$LIBS $canberra_lib" -AC_TRY_LINK([ -# include <canberra.h> - ], [ - ca_context *hello; - ca_context_create(&hello);], - AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CANBERRA), - AC_MSG_RESULT(no); CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS") dnl fstatfs() can take 2 to 4 arguments, try to use st_blksize if possible |