Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
1,788 additions
and
1,707 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| https://github.com/vim/vim/issues/4531#issuecomment-502116548 | ||
|
|
||
| --- vim-8.1.1523-8d24104/src/configure.ac 2019-06-14 14:30:09.711036154 +0000 | ||
| +++ vim-8.1.1523-8d24104/src/configure.ac 2019-06-14 14:27:55.187933266 +0000 | ||
| @@ -3751,27 +3751,39 @@ dnl define _LARGE_FILES, _FILE_OFFSET_BI | ||
| dnl appropriate, so that off_t is 64 bits when needed. | ||
| AC_SYS_LARGEFILE | ||
|
|
||
| +AC_ARG_WITH(libcanberra, | ||
| + [ --with-libcanberra Enable sound support by using libcanberra], | ||
| + if test "x$withval" = xno; then | ||
| + want_libcanberra=no | ||
| + else | ||
| + want_libcanberra=yes | ||
| + fi, | ||
| + want_libcanberra=no) | ||
|
|
||
| -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` | ||
| +if test "x$want_libcanberra" = xyes; 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 | ||
| -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") | ||
|
|
||
|
|
||
| dnl fstatfs() can take 2 to 4 arguments, try to use st_blksize if possible |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.