Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit cd389fb8 cd389fb8a477405be0a2d8ea2260ffc8d6eccdf7 by Sergey Poznyakoff
Options

Changed check for guile. Raised patchlevel to 0.1.1

1 parent 6d2a6f6d
Inline Side-by-side
Showing 1 changed file with 13 additions and 5 deletions
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 17 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18 # 18 #
19 19
20 AC_INIT([GNU Mailutils], [0.1], [bug-mailutils@gnu.org]) 20 AC_INIT([GNU Mailutils], [0.1.1], [bug-mailutils@gnu.org])
21 AC_CONFIG_SRCDIR([mailbox/mailbox.c]) 21 AC_CONFIG_SRCDIR([mailbox/mailbox.c])
22 AC_CANONICAL_TARGET([]) 22 AC_CANONICAL_TARGET([])
23 AM_INIT_AUTOMAKE 23 AM_INIT_AUTOMAKE
...@@ -457,15 +457,15 @@ esac ...@@ -457,15 +457,15 @@ esac
457 dnl Check for Guile 457 dnl Check for Guile
458 AC_SUBST(GUILE_INCLUDES) 458 AC_SUBST(GUILE_INCLUDES)
459 AC_SUBST(GUILE_LIBS) 459 AC_SUBST(GUILE_LIBS)
460 AC_SUBST(GUILE_SNARF_VERSION)
460 AC_SUBST(GUIMB) 461 AC_SUBST(GUIMB)
461 AC_SUBST(MU_SCM) 462 AC_SUBST(MU_SCM)
462 AC_SUBST(LIBMU_SCM) 463 AC_SUBST(LIBMU_SCM)
463 AC_SUBST(GUILE_PROCEDURES_TXT) 464 AC_SUBST(GUILE_PROCEDURES_TXT)
464 AC_SUBST(GUILE_BUILT_SOURCES) 465 AC_SUBST(GUILE_BUILT_SOURCES)
466
465 if test x"$useguile" = x"yes"; then 467 if test x"$useguile" = x"yes"; then
466 AC_PATH_PROG(GUILE_CONFIG, guile-config, no, $PATH) 468 MU_CHECK_GUILE(,[
467 AC_CHECK_HEADER(libguile.h, :, [GUILE_CONFIG=no])
468 if test x$GUILE_CONFIG != xno; then
469 AC_DEFINE(WITH_GUILE,1,[Enable Guile support]) 469 AC_DEFINE(WITH_GUILE,1,[Enable Guile support])
470 GUILE_INCLUDES=`guile-config compile` 470 GUILE_INCLUDES=`guile-config compile`
471 GUILE_LIBS=`guile-config link` 471 GUILE_LIBS=`guile-config link`
...@@ -474,7 +474,12 @@ if test x"$useguile" = x"yes"; then ...@@ -474,7 +474,12 @@ if test x"$useguile" = x"yes"; then
474 LIBMU_SCM=../libmu_scm/libmu_scm.a 474 LIBMU_SCM=../libmu_scm/libmu_scm.a
475 GUILE_PROCEDURES_TXT=guile-procedures.txt 475 GUILE_PROCEDURES_TXT=guile-procedures.txt
476 GUILE_BUILT_SOURCES='$(DOT_X_FILES) $(DOT_DOC_FILES)' 476 GUILE_BUILT_SOURCES='$(DOT_X_FILES) $(DOT_DOC_FILES)'
477 fi 477 case "$GUILE_VERSION" in
478 14) GUILE_SNARF_VERSION="1.4";;
479 16|17) GUILE_SNARF_VERSION="1.6";;
480 *) GUILE_SNARF_VERSION="1.6";;
481 esac
482 ],[useguile=no])
478 fi 483 fi
479 484
480 dnl Make sysconfdir available to the application 485 dnl Make sysconfdir available to the application
...@@ -519,6 +524,8 @@ AC_CONFIG_FILES([Makefile mailutils.spec ...@@ -519,6 +524,8 @@ AC_CONFIG_FILES([Makefile mailutils.spec
519 messages/Makefile 524 messages/Makefile
520 messages/testsuite/Makefile 525 messages/testsuite/Makefile
521 scripts/Makefile 526 scripts/Makefile
527 scripts/guile-1.4/Makefile
528 scripts/guile-1.6/Makefile
522 libmu_scm/Makefile 529 libmu_scm/Makefile
523 guimb/Makefile 530 guimb/Makefile
524 guimb/scm/Makefile 531 guimb/scm/Makefile
...@@ -528,6 +535,7 @@ AC_CONFIG_FILES([Makefile mailutils.spec ...@@ -528,6 +535,7 @@ AC_CONFIG_FILES([Makefile mailutils.spec
528 mail.local/Makefile 535 mail.local/Makefile
529 mail.remote/Makefile 536 mail.remote/Makefile
530 dotlock/Makefile 537 dotlock/Makefile
538 mh/Makefile
531 ]) 539 ])
532 AC_OUTPUT 540 AC_OUTPUT
533 541
......