1
0
Fork 0

- fixed guessing of parent dir from value of $PWD

in script quick_quicklisp.sh (thanks mibofra!).
This commit is contained in:
cage 2022-02-20 12:21:33 +01:00
parent 6be8fac680
commit 081bc85272
4 changed files with 67 additions and 1 deletions

View File

@ -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@

58
configure vendored
View File

@ -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";

View File

@ -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

View File

@ -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