alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fix 'make distcheck' for guile/, require guile version 2.0

Browse Source
This commit is contained in:
djcb
2011-12-30 15:00:15 +02:00
parent 8151fc21b0
commit 9d6d33be2a
3 changed files with 30 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
configure.ac
View File

@ -217,45 +217,33 @@ AM_CONDITIONAL(BUILD_WIDGETS, [test "x$have_webkit" = "xyes" -a "x$have_gio" = "
############################################################################### ###############################################################################
# check for guile & guile-snarf # check for guile 2.0 & guile-snarf
AC_PATH_PROG(GUILE_CONFIG, [guile-config], [], [$PATH]) PKG_CHECK_MODULES(GUILE,guile-2.0,[have_guile=yes],[have_guile=no])
AC_PATH_PROG(GUILE, [guile], [], [$PATH])
AS_IF([test "x$GUILE_CONFIG" != "x"],
[GUILE_CFLAGS=`$GUILE_CONFIG compile`;
GUILE_LIBS=`$GUILE_CONFIG link`;
GUILE_SITEDIR=`$GUILE -c '(write (%site-dir)) (newline)'`
AC_DEFINE_UNQUOTED([HAVE_GUILE],1,[Whether we have guile])])
AC_SUBST(GUILE_LIBS)
AC_SUBST(GUILE_CFLAGS) AC_SUBST(GUILE_CFLAGS)
AC_SUBST(GUILE_LIBS)
AS_IF([test "x$have_guile" = "xyes"],[
AC_PATH_PROG(GUILE_SNARF, [guile-snarf], [], [$PATH])
AS_IF([test "x$GUILE_SNARF" != "x"],
[AC_DEFINE_UNQUOTED([GUILE_SNARF], ["$GUILE_SNARF"],[Path to guile-snarf])
GUILE_SITEDIR="`${PKG_CONFIG} guile-2.0 --variable=sitedir`"],
[AC_MSG_WARN([cannot find guile-snarf])])])
AC_SUBST(GUILE_SITEDIR) AC_SUBST(GUILE_SITEDIR)
AC_PATH_PROG(GUILE_SNARF, [guile-snarf], [], [$PATH]) AS_IF([test "x$have_guile" = "xyes" -a "x$GUILE_SNARF" != "x"],
AS_IF([test "x$GUILE_SNARF" != "x"],[ [guile_version="`${PKG_CONFIG} --modversion guile-2.0`"
AC_DEFINE_UNQUOTED([GUILE_SNARF], ["$GUILE_SNARF"],[Path to guile-snarf])],[ AC_DEFINE_UNQUOTED([HAVE_GUILE],1,[Whether we have guile 2.0])])
AC_MSG_WARN([cannot find guile-snarf])])
AS_IF([test "x$GUILE_CONFIG" != "x"], AM_CONDITIONAL(HAVE_GUILE, [test "x$have_guile" = "xyes"])
[GUILE_VERSION="`$GUILE_CONFIG --version 2>&1 | sed 's/.*version //'`"; ###############################################################################
GUILE_MAJOR_VERSION="`echo "$GUILE_VERSION" | sed 's/\..*//'`"])
AS_IF([test "x$GUILE_MAJOR_VERSION" = "x0" -o "x$GUILE_MAJOR_VERSION" = "x1"],
[AC_DEFINE_UNQUOTED([HAVE_PRE2_GUILE],[1],[have pre-2.x guile])])
# for now, we require guile 2.x
AM_CONDITIONAL(HAVE_GUILE,[test "$xGUILE_CONFIG" != "x" \
-a "x$GUILE_SNARF" != "x" \
-a "x$GUILE_MAJOR_VERSION" != "0"])
AS_IF([test "x$GUILE_MAJOR_VERSION" = "x0" -o "x$GUILE_MAJOR_VERSION" = "x1"],
[AC_MSG_WARN([Only guile >= 2.x is supported]);
guile_too_old="yes"])
############################################################################### ###############################################################################
# check for makeinfo # check for makeinfo
AC_CHECK_PROG(have_makeinfo,makeinfo,yes,no) AC_CHECK_PROG(have_makeinfo,makeinfo,yes,no)
AM_CONDITIONAL(HAVE_MAKEINFO, test "$have_makeinfo" = yes) AM_CONDITIONAL(HAVE_MAKEINFO, [test "x$have_makeinfo" = "xyes"])
############################################################################### ###############################################################################
@ -330,8 +318,8 @@ if test "x$have_webkit" = "xyes"; then
echo "Webkit version : $webkit_version" echo "Webkit version : $webkit_version"
fi fi
if test "x$GUILE_CONFIG" != "x"; then if test "x$have_guile" = "xyes"; then
echo "Guile version : $GUILE_VERSION" echo "Guile version : $guile_version"
fi fi
echo echo

9
guile/Makefile.am
View File

@ -50,9 +50,11 @@ XFILES= \
mu-guile-msg.x \ mu-guile-msg.x \
mu-guile.x mu-guile.x
moduledir=$(GUILE_SITEDIR) # FIXME: GUILE_SITEDIR would be better, but that
# breaks 'make distcheck'
scmdir=${prefix}/share/guile/site/2.0/
module_DATA= \ scm_DATA= \
mu.scm mu.scm
BUILT_SOURCES=$(XFILES) BUILT_SOURCES=$(XFILES)
@ -67,5 +69,4 @@ MKDEP = $(CC) -M -MG $(snarfcppopts)
DISTCLEANFILES=$(XFILES) DISTCLEANFILES=$(XFILES)
EXTRA_DIST=$(module_DATA) EXTRA_DIST=$(scm_DATA)

11
guile/mu/Makefile.am
View File

@ -16,12 +16,11 @@
include $(top_srcdir)/gtest.mk include $(top_srcdir)/gtest.mk
moduledir=$(GUILE_SITEDIR)/mu # FIXME: GUILE_SITEDIR would be better, but that
# breaks 'make distcheck'
module_DATA= \ scmdir=${prefix}/share/guile/site/2.0/
scm_DATA= \
msg.scm \ msg.scm \
contact.scm contact.scm
EXTRA_DIST=$(module_DATA) EXTRA_DIST=$(scm_DATA)