chiark
/
gitweb
/
~mdw
/
runlisp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
runlisp.conf.5.in: Fix end-of-sentence punctuataion.
[runlisp]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 042df98086735a839e7a4cdf6e457bbdba5d6184..aa865464543e59bafce01c7014179027aeabf70f 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-34,15
+34,26
@@
mdw_SILENT_RULES
AC_PROG_CC
AX_CFLAGS_WARN_ALL
AC_PROG_CC
AX_CFLAGS_WARN_ALL
+mdw_DECL_ENVIRON
+AC_CHECK_FUNC([strsignal])
+case $ac_cv_func_strsignal in no) AC_DECL_SYS_SIGLIST ;; esac
+
+AC_PROG_RANLIB
AC_CHECK_PROGS([AUTOM4TE], [autom4te])
dnl--------------------------------------------------------------------------
dnl Checking for Lisp implementations.
AC_CHECK_PROGS([AUTOM4TE], [autom4te])
dnl--------------------------------------------------------------------------
dnl Checking for Lisp implementations.
-imagedir=$localstatedir/$PACKAGE_NAME; AC_SUBST(imagedir)
+AC_ARG_WITH([imagedir],
+ [AS_HELP_STRING([--with-imagedir=DIR],
+ [store and look for custom Lisp images in DIR])],
+ [imagedir=$withval], [imagedir=$localstatedir/$PACKAGE_NAME])
+AC_SUBST(imagedir)
+
mdw_DEFINE_PATHS([
mdw_DEFINE_PATH([IMAGEDIR], [$imagedir])
mdw_DEFINE_PATHS([
mdw_DEFINE_PATH([IMAGEDIR], [$imagedir])
+ mdw_DEFINE_PATH([ETCDIR], [$sysconfdir/$PACKAGE_NAME])
mdw_DEFINE_PATH([DATADIR], [$datadir/$PACKAGE_NAME])])
AC_ARG_ENABLE([imagedump],
mdw_DEFINE_PATH([DATADIR], [$datadir/$PACKAGE_NAME])])
AC_ARG_ENABLE([imagedump],
@@
-55,8
+66,9
@@
AC_ARG_ENABLE([imagedump],
AC_DEFUN([mdw_CHECK_LISP],
[AC_CHECK_PROGS([$1], [$2])
AC_ARG_VAR([$1], [Path to the $1 Lisp system.])
AC_DEFUN([mdw_CHECK_LISP],
[AC_CHECK_PROGS([$1], [$2])
AC_ARG_VAR([$1], [Path to the $1 Lisp system.])
-case ,$enable_imagedump, in
- ,yes, | *,$2,*) dump=t ;;
+case $[]$1:,$enable_imagedump, in
+ :*) dump=nil ;;
+ *:,yes, | *:*,$2,*) dump=t ;;
*) dump=nil ;;
esac
AM_CONDITIONAL([DUMP_$1], [test $dump = t])])
*) dump=nil ;;
esac
AM_CONDITIONAL([DUMP_$1], [test $dump = t])])
@@
-85,12
+97,12
@@
if test "x$ECL" != x; then
gnu) AC_DEFINE([ECL_OPTIONS_GNU], [1],
[Define 1 if ECL uses GNU-style `--FOO' options]) ;;
esac
gnu) AC_DEFINE([ECL_OPTIONS_GNU], [1],
[Define 1 if ECL uses GNU-style `--FOO' options]) ;;
esac
+ case $mdw_ecl_opts in
+ gnu) ECLOPT=-- ;;
+ trad) ECLOPT=- ;;
+ *) AC_MSG_ERROR([internal error: unexpected value for `$mdw_ecl_opts']) ;;
+ esac
fi
fi
-case $mdw_ecl_opts in
- gnu) ECLOPT=-- ;;
- trad) ECLOPT=- ;;
- *) AC_MSG_ERROR([internal error: unexpected value for `$mdw_ecl_opts']) ;;
-esac
AC_SUBST([ECLOPT])
dnl--------------------------------------------------------------------------
AC_SUBST([ECLOPT])
dnl--------------------------------------------------------------------------