blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the build with guile-3.0.0.

Browse Source 
v2: Update configure.ac too.

Signed-off-by: orbea <orbea@riseup.net>
This commit is contained in:
orbea 2020-01-21 06:54:23 -08:00 committed by Sébastien Helleu
parent d2dda92daf
commit 6d2d304136
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindGuile.cmake
View File

@ -33,7 +33,7 @@ endif()
find_package(PkgConfig) find_package(PkgConfig)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND)
pkg_search_module(GUILE guile-2.2 guile-2.0) pkg_search_module(GUILE guile-3.0 guile-2.2 guile-2.0)
if(GUILE_FOUND) if(GUILE_FOUND)
# check if variable "scm_install_gmp_memory_functions" exists # check if variable "scm_install_gmp_memory_functions" exists
set(CMAKE_REQUIRED_INCLUDES ${GUILE_INCLUDE_DIRS}) set(CMAKE_REQUIRED_INCLUDES ${GUILE_INCLUDE_DIRS})

2
configure.ac
View File

@ -730,7 +730,7 @@ if test "x$enable_guile" = "xyes" ; then
guile_found="no" guile_found="no"
AC_MSG_CHECKING(for Guile headers and libraries) AC_MSG_CHECKING(for Guile headers and libraries)
echo echo
for v in "2.2" "2.0" ; do for v in "3.0" "2.2" "2.0" ; do
pkgconfig_guile_found=`$PKGCONFIG --exists guile-$v 2>/dev/null` pkgconfig_guile_found=`$PKGCONFIG --exists guile-$v 2>/dev/null`
if test "x$?" = "x0" ; then if test "x$?" = "x0" ; then
GUILE_VERSION=`$PKGCONFIG --modversion guile-$v` GUILE_VERSION=`$PKGCONFIG --modversion guile-$v`

2
src/plugins/guile/weechat-guile-api.c
View File

@ -24,6 +24,8 @@
#include <libguile.h> #include <libguile.h>
#include <time.h> #include <time.h>
#include <stdio.h>
#include <string.h>
#include "../weechat-plugin.h" #include "../weechat-plugin.h"
#include "../plugin-script.h" #include "../plugin-script.h"

2
src/plugins/guile/weechat-guile.c
View File

@ -30,6 +30,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <libgen.h> #include <libgen.h>
#include <stdio.h>
#include <string.h>
#include "../weechat-plugin.h" #include "../weechat-plugin.h"
#include "../plugin-script.h" #include "../plugin-script.h"