reorder configure scripts
Run last one of the scripts that can show the installation-directory information correctly.
This commit is contained in:
parent
3c4fa62e28
commit
e3f25a6159
|
@ -3350,3 +3350,6 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
|
|||
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
|
||||
fi
|
||||
|
||||
|
||||
# From "../ac/path.m4":
|
||||
show_path_results
|
||||
|
|
44
racket/src/configure
vendored
44
racket/src/configure
vendored
|
@ -55,29 +55,31 @@ if test "$use_cs" = "yes" ; then
|
|||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$use_racket" = "no" ; then
|
||||
if test "$supplied_racket" = "no" ; then
|
||||
echo $0: --enable-csonly needs --enable-racket=...
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# The "cs/c/configure" script doesn't report the installation
|
||||
# configuration, so we run it first and let "cfg-cs" or
|
||||
# "cfg-racket" report that information.
|
||||
|
||||
mkdir -p cs
|
||||
case "$dir" in
|
||||
/*)
|
||||
cd cs && "$dir/cs/c/configure" ${1+"$@"} && cd ..
|
||||
;;
|
||||
*)
|
||||
cd cs && "../$dir/cs/c/configure" ${1+"$@"} && cd ..
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test "$use_racket" = "no" ; then
|
||||
if test "$supplied_racket" = "no" ; then
|
||||
echo $0: --enable-csonly needs --enable-racket=...
|
||||
exit 1
|
||||
fi
|
||||
"$dir/cfg-cs" ${1+"$@"}
|
||||
mkdir -p cs
|
||||
# continue below
|
||||
elif test "$use_cs" = "no" ; then
|
||||
exec "$dir/cfg-racket" ${1+"$@"}
|
||||
exec "$dir/cfg-cs" ${1+"$@"}
|
||||
else
|
||||
"$dir/cfg-racket" ${1+"$@"}
|
||||
# continue below
|
||||
exec "$dir/cfg-racket" ${1+"$@"}
|
||||
fi
|
||||
|
||||
mkdir -p cs
|
||||
case "$dir" in
|
||||
/*)
|
||||
cd cs && exec "$dir/cs/c/configure" ${1+"$@"}
|
||||
;;
|
||||
*)
|
||||
cd cs && exec "../$dir/cs/c/configure" ${1+"$@"}
|
||||
;;
|
||||
esac
|
||||
|
|
3
racket/src/cs/c/configure
vendored
3
racket/src/cs/c/configure
vendored
|
@ -5724,6 +5724,3 @@ mkdir -p rktio
|
|||
abssrcdir=`(cd ${srcdir}; pwd)`
|
||||
echo "=== configuring in rktio (${abssrcdir}/../../rktio)"
|
||||
cd rktio; eval "${abssrcdir}/../../rktio/configure ${SUB_CONFIGURE_EXTRAS}"
|
||||
|
||||
# From "../ac/path.m4":
|
||||
show_path_results
|
||||
|
|
|
@ -35,3 +35,6 @@ AC_SUBST(RUN_RACKET_CGC)
|
|||
makefiles="Makefile"
|
||||
|
||||
AC_OUTPUT($makefiles)
|
||||
|
||||
# From "../ac/path.m4":
|
||||
show_path_results
|
||||
|
|
|
@ -428,6 +428,3 @@ mkdir -p rktio
|
|||
abssrcdir=`(cd ${srcdir}; pwd)`
|
||||
echo "=== configuring in rktio (${abssrcdir}/../../rktio)"
|
||||
cd rktio; eval "${abssrcdir}/../../rktio/configure ${SUB_CONFIGURE_EXTRAS}"
|
||||
|
||||
# From "../ac/path.m4":
|
||||
show_path_results
|
||||
|
|
Loading…
Reference in New Issue
Block a user