diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2004-10-12 10:28:23 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2004-10-12 10:28:23 +0000 |
commit | f41cbc9b200bc8b805f0c6bb8ebe9f4114c5d46a (patch) | |
tree | 2d098e8766190b6ba90e35459c39bfa91a02f90f /m4 | |
parent | e7b1ff53a66a7ce9f18708a6185f770baa710b97 (diff) | |
download | ellinika-f41cbc9b200bc8b805f0c6bb8ebe9f4114c5d46a.tar.gz ellinika-f41cbc9b200bc8b805f0c6bb8ebe9f4114c5d46a.tar.bz2 |
Updated from xmltrans.
git-svn-id: file:///home/puszcza/svnroot/ellinika/trunk@213 941c8c0f-9102-463b-b60b-cd22ce0e6858
Diffstat (limited to 'm4')
-rw-r--r-- | m4/guile.m4 | 96 |
1 files changed, 58 insertions, 38 deletions
diff --git a/m4/guile.m4 b/m4/guile.m4 index 0934cc2..c0b237c 100644 --- a/m4/guile.m4 +++ b/m4/guile.m4 @@ -1,43 +1,57 @@ -dnl This file is part of GNU Radius. -dnl Copyright (C) 2001,2003 Free Software Foundation, Inc. +dnl This file is part of GNU mailutils. +dnl Copyright (C) 2001,2004 Free Software Foundation, Inc. dnl -dnl Written by Sergey Poznyakoff -dnl -dnl GNU Radius is free software; you can redistribute it and/or modify +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 2 of the License, or dnl (at your option) any later version. dnl -dnl GNU Radius is distributed in the hope that it will be useful, +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 GNU Radius; if not, write to the Free Software +dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl -AC_DEFUN([RA_CHECK_GUILE], +dnl MU_RESULT_ACTIONS -- generate shell code for the result of a test +dnl $1 -- CVAR -- cache variable to check +dnl $2 -- NAME -- if not empty, used to generate a default value TRUE: +dnl `AC_DEFINE(HAVE_NAME)' +dnl $2 -- TRUE -- what to do if the CVAR is not `no' +dnl $3 -- FALSE -- what to do otherwise; defaults to `:' +dnl +AC_DEFUN([MU_RESULT_ACTIONS], [ +[if test "$$1" != "" -a "$$1" != no; then + ]ifelse([$3], , + [AC_DEFINE(HAVE_]translit($2, [a-z ./<>], [A-Z___])[,1,[FIXME])], + [$3])[ +else + ]ifelse([$4], , [:], [$4])[ +fi]])dnl + +AC_DEFUN([MU_CHECK_GUILE], [ - if test "x$ra_cv_lib_guile" = x; then + if test "x$mu_cv_lib_guile" = x; then cached="" AC_PATH_PROG(GUILE_CONFIG, guile-config, no, $PATH) if test $GUILE_CONFIG = no; then - ra_cv_lib_guile=no + mu_cv_lib_guile=no else GUILE_INCLUDES=`guile-config compile` GUILE_LIBS=`guile-config link` fi if test $GUILE_CONFIG != no; then - AC_MSG_CHECKING(for guile version 1.4 or higher) + AC_MSG_CHECKING(for guile version 1.6 or higher) GUILE_VERSION=`($GUILE_CONFIG --version 2>&1; echo '')|sed -n 's/guile-config - Guile version \([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\).*/\1\2/p'` case "x$GUILE_VERSION" in x[[0-9]]*) - if test $GUILE_VERSION -lt 14; then + if test $GUILE_VERSION -lt 16; then AC_MSG_RESULT(Nope. Version number too low.) - ra_cv_lib_guile=no + mu_cv_lib_guile=no else AC_DEFINE_UNQUOTED(GUILE_VERSION, $GUILE_VERSION, [Guile version number: MAX*10 + MIN]) @@ -48,42 +62,48 @@ AC_DEFUN([RA_CHECK_GUILE], CFLAGS="$CFLAGS $GUILE_INCLUDES" AC_TRY_LINK([#include <libguile.h>], ifelse([$1], , scm_shell(0, NULL);, [$1]), - [ra_cv_lib_guile=yes], - [ra_cv_lib_guile=no]) + [mu_cv_lib_guile=yes], + [mu_cv_lib_guile=no]) LIBS=$save_LIBS CFLAGS=$save_CFLAGS fi ;; *) AC_MSG_RESULT(Nope. Unknown version number) - ra_cv_lib_guile=no;; + mu_cv_lib_guile=no;; esac fi else cached=" (cached) " - GUILE_INCLUDES=`guile-config compile` - GUILE_LIBS=`guile-config link` + GUILE_INCLUDES=`$GUILE_CONFIG compile` + GUILE_LIBS=`$GUILE_CONFIG link` fi AC_MSG_CHECKING(whether to build guile support) - RA_RESULT_ACTIONS([ra_cv_lib_guile],[LIBGUILE],[$2],[$3]) - AC_MSG_RESULT(${cached}$ra_cv_lib_guile) - if test $ra_cv_lib_guile = yes; then - if test $GUILE_VERSION -gt 14; then - LIBS="$LIBS $GUILE_LIBS" - CFLAGS="$CFLAGS $GUILE_INCLUDES" - AC_CHECK_FUNCS(scm_long2num scm_cell scm_list_1 scm_list_n scm_c_define\ - scm_c_lookup) - if test $ac_cv_func_scm_cell = no; then - AC_MSG_CHECKING(for inline scm_cell) - AC_TRY_LINK([#include <libguile.h>], - [scm_cell(SCM_EOL, SCM_EOL)], - [ac_cv_func_scm_cell=yes - AC_DEFINE(HAVE_SCM_CELL,1, - Define if you have scm_cell function)]) - AC_MSG_RESULT($ac_cv_func_scm_cell) - fi - CFLAGS=$save_CFLAGS - LIBS=$save_LIBS - fi + MU_RESULT_ACTIONS([mu_cv_lib_guile],[LIBGUILE],[$2],[$3]) + AC_MSG_RESULT(${cached}$mu_cv_lib_guile) + + if test $mu_cv_lib_guile = yes; then + AC_ARG_WITH([guiledir], + AC_HELP_STRING([--with-guiledir=DIR], + [Specify the directory to install guile modules to]), + [case $withval in + /*) GUILE_SITE=$withval;; + yes) GUILE_SITE=`$GUILE_CONFIG info pkgdatadir`;; + *) AC_MSG_ERROR([Argument to --with-guiledir must be an absolute directory name]);; + esac], + [GUILE_SITE=`$GUILE_CONFIG info pkgdatadir` + pfx=$prefix + test "x$pfx" = xNONE && pfx=$ac_default_prefix + case $GUILE_SITE in + $pfx/*) ;; # OK + *) AC_MSG_WARN([guile site directory "$GUILE_SITE" lies outside your current prefix ($pfx).]) + GUILE_SITE='$(datadir)/guile/site' + AC_MSG_WARN([Falling back to ${GUILE_SITE} instead. Use --with-guiledir to force using site directory.]) + ;; + esac]) fi + + AC_SUBST(GUILE_SITE) + AC_SUBST(GUILE_INCLUDES) + AC_SUBST(GUILE_LIBS) ]) |