diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-04-19 11:02:12 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-04-19 11:02:12 +0300 |
commit | 884c5ffde12904a7ccf394eb31c5e7cf13ce554c (patch) | |
tree | a1711a6950a79f59a2c179ece9df54c3f8975872 /am | |
parent | c5416aa2097f666cfc7701210872000871f65abb (diff) | |
download | anubis-884c5ffde12904a7ccf394eb31c5e7cf13ce554c.tar.gz anubis-884c5ffde12904a7ccf394eb31c5e7cf13ce554c.tar.bz2 |
Use GINT for integrating with Guile.
* gint: New module.
* Makefile.am, configure.ac: Use gint.
* bootstrap.conf: Initialize git submodules.
* src/Makefile.am: Include gint.mk
* am/guile.m4: Remove.
* src/guile.c (guile_safe_exec): Use scm_c_catch instead of
the deprecated scm_internal_lazy_catch.
Diffstat (limited to 'am')
-rw-r--r-- | am/guile.m4 | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/am/guile.m4 b/am/guile.m4 deleted file mode 100644 index 8841a6a..0000000 --- a/am/guile.m4 +++ /dev/null @@ -1,85 +0,0 @@ -dnl This file is part of GNU mailutils. -dnl Copyright (C) 2001, 2006, 2007, 2010 Free Software Foundation, Inc. -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 3 of the License, or -dnl (at your option) any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software Foundation, -dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -dnl - -dnl MU_CHECK_GUILE(minversion, [act-if-found], [ac-if-not-found]) -dnl $1 $2 $3 -AC_DEFUN([MU_CHECK_GUILE], -[ - AS_VAR_SET([mu_cv_guile], [no]) - AC_PATH_PROG(GUILE_CONFIG, guile-config, no, $PATH) - if test "$GUILE_CONFIG" = no; then - m4_if([$3],,[AC_MSG_ERROR(cannot find Guile)], [$3]) - else - AC_SUBST(GUILE_INCLUDES) - AC_SUBST(GUILE_LIBS) - AC_SUBST(GUILE_VERSION) - AC_SUBST(GUILE_VERSION_NUMBER) - - GUILE_INCLUDES=`$GUILE_CONFIG compile` - GUILE_LIBS=`$GUILE_CONFIG link` - GUILE_VERSION=`($GUILE_CONFIG --version 2>&1; echo '')|sed 's/guile-config [[^0-9]]* \([[0-9]][[0-9.]]*\)$/\1/'` - VEX=`echo $GUILE_VERSION | sed 's/\./ \\\\* 1000 + /;s/\./ \\\\* 100 + /'` - GUILE_VERSION_NUMBER=`eval expr "$VEX"` - - m4_if([$1],,,[ - VEX=`echo $1 | sed 's/\./ \\\\* 1000 + /;s/\./ \\\\* 100 + /'` - min=`eval expr "$VEX"` - if test $GUILE_VERSION_NUMBER -lt $min; then - m4_if([$3],, - [AC_MSG_ERROR([Guile version too old; required is at least ]$1)], - [$3]) - fi]) - - save_LIBS=$LIBS - save_CFLAGS=$CFLAGS - LIBS="$LIBS $GUILE_LIBS" - CFLAGS="$CFLAGS $GUILE_INCLUDES" - AC_TRY_LINK([#include <libguile.h>], - m4_if([$1], , scm_shell(0, NULL);, [$1]), - [AS_VAR_SET([mu_cv_guile], $GUILE_VERSION)]) - LIBS=$save_LIBS - CFLAGS=$save_CFLAGS - fi - - if test $mu_cv_guile = no; then - GUILE_INCLUDES= - GUILE_LIBS= - GUILE_VERSION= - GUILE_VERSION_NUMBER= - m4_if($3,,[AC_MSG_ERROR(required library libguile not found)], [$3]) - else - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libguile.h>]], - [SCM_DEVAL_P = 1; - SCM_BACKTRACE_P = 1; - SCM_RECORD_POSITIONS_P = 1; - SCM_RESET_DEBUG_MODE;])], - [mu_cv_guile_debug=yes], - [mu_cv_guile_debug=no]) - if test $mu_cv_guile_debug = yes; then - AC_DEFINE_UNQUOTED([GUILE_DEBUG_MACROS], 1, - [Define to 1 if SCM_DEVAL_P, SCM_BACKTRACE_P, SCM_RECORD_POSITIONS_P and SCM_RESET_DEBUG_MODE are defined]) - fi - AC_CHECK_TYPES([scm_t_off],[],[],[#include <libguile.h>]) - AC_DEFINE_UNQUOTED([GUILE_VERSION], "$GUILE_VERSION", - [Guile version number]) - AC_DEFINE_UNQUOTED([GUILE_VERSION_NUMBER], $GUILE_VERSION_NUMBER, - [Guile version number: MAX*10 + MIN]) - m4_if([$2],,,[$2]) - fi -]) - |