X-Git-Url: https://git.distorted.org.uk/~mdw/runlisp/blobdiff_plain/7b8ff279e7304e41b243459d78c3b6703bb8c3f5..60db9fabc6aca55ad76fc8aae5b01e61eac38715:/configure.ac

diff --git a/configure.ac b/configure.ac
index 66446f3..aa86546 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,15 +38,22 @@ 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.
 
-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_PATH([ETCDIR], [$sysconfdir])
+  mdw_DEFINE_PATH([ETCDIR], [$sysconfdir/$PACKAGE_NAME])
   mdw_DEFINE_PATH([DATADIR], [$datadir/$PACKAGE_NAME])])
 
 AC_ARG_ENABLE([imagedump],
@@ -59,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.])
-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])])
@@ -89,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
+  case $mdw_ecl_opts in
+    gnu) ECLOPT=-- ;;
+    trad) ECLOPT=- ;;
+    *) AC_MSG_ERROR([internal error: unexpected value for `$mdw_ecl_opts']) ;;
+  esac
 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--------------------------------------------------------------------------