diff --git a/Makefile.in b/Makefile.in index 2bb61a2..ff685c9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -279,6 +279,7 @@ CURL = @CURL@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +DIRNAME = @DIRNAME@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ diff --git a/configure b/configure index 368ebe9..1908d87 100755 --- a/configure +++ b/configure @@ -621,6 +621,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +DIRNAME CHMOD GIT OPENSSL @@ -7504,6 +7505,63 @@ if test "$CHMOD" = "no" ; then exit 1; fi +for ac_prog in dirname +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_DIRNAME+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $DIRNAME in + [\\/]* | ?:[\\/]*) + ac_cv_path_DIRNAME="$DIRNAME" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_DIRNAME="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DIRNAME=$ac_cv_path_DIRNAME +if test -n "$DIRNAME"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DIRNAME" >&5 +printf "%s\n" "$DIRNAME" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$DIRNAME" && break +done +test -n "$DIRNAME" || DIRNAME="no" + + +if test "$DIRNAME" = "no" ; then + as_fn_error $? "Can not find dirname executable." "$LINENO" 5 + exit 1; +fi + SBCL_MIN_VERSION="1.4.16"; diff --git a/configure.ac b/configure.ac index c29e86b..03504c7 100644 --- a/configure.ac +++ b/configure.ac @@ -107,6 +107,13 @@ if test "$CHMOD" = "no" ; then exit 1; fi +AC_PATH_PROGS([DIRNAME],[dirname],[no]) + +if test "$DIRNAME" = "no" ; then + AC_MSG_ERROR([Can not find dirname executable.]) + exit 1; +fi + AC_PROG_MKDIR_P dnl check sbcl version diff --git a/quick_quicklisp.sh.in b/quick_quicklisp.sh.in index 9da4e67..d5e1995 100644 --- a/quick_quicklisp.sh.in +++ b/quick_quicklisp.sh.in @@ -93,7 +93,7 @@ install_quicklisp () { --eval "(ql:add-to-init-file)" \ --eval "(sb-ext:quit)"; @MKDIR_P@ $LISP_SOURCE_REGISTRY_DIR - PAR_PWD="${PWD%/*}" + PAR_PWD=$(@DIRNAME@ "$PWD") echo "(:source-registry" > $LISP_SOURCE_REGISTRY_FILE echo " (:tree \"$PAR_PWD\")" >> $LISP_SOURCE_REGISTRY_FILE echo ":inherit-configuration)" >> $LISP_SOURCE_REGISTRY_FILE