added check for conflicting configurations (srcdir vs not)
This commit is contained in:
parent
c9b0df66be
commit
8fd24008f7
10
ChangeLog
10
ChangeLog
|
@ -1,12 +1,12 @@
|
||||||
Tue Mar 10 21:49:18 1992 K. Richard Pixley (rich@mars.cygnus.com)
|
Tue Mar 10 21:49:18 1992 K. Richard Pixley (rich@mars.cygnus.com)
|
||||||
|
|
||||||
* configure: remove trailing slashes from srcdir. Otherwise emacs
|
|
||||||
gdb mode gets cranky.
|
|
||||||
|
|
||||||
* Makefile.in: drop flex. make stamp files work.
|
* Makefile.in: drop flex. make stamp files work.
|
||||||
|
|
||||||
* configure: use relative paths for configure and srcdir whenever
|
* configure: added test for conflicting configuration in srcdir,
|
||||||
possible.
|
remove trailing slashes from srcdir. Otherwise emacs gdb mode
|
||||||
|
gets cranky. use relative paths for configure and srcdir
|
||||||
|
whenever possible. Send some error messages to stderr that were
|
||||||
|
going to stdout.
|
||||||
|
|
||||||
Tue Mar 10 18:01:55 1992 Per Bothner (bothner@cygnus.com)
|
Tue Mar 10 18:01:55 1992 Per Bothner (bothner@cygnus.com)
|
||||||
|
|
||||||
|
|
|
@ -121,7 +121,7 @@ do
|
||||||
target_alias="${arg}"
|
target_alias="${arg}"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo '***' Can only configure for one target at a time.
|
echo '***' Can only configure for one target at a time. 1>&2
|
||||||
fatal=yes
|
fatal=yes
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -151,7 +151,7 @@ do
|
||||||
host_alias="`echo ${arg} | sed 's/^[-a-z]*=//'`"
|
host_alias="`echo ${arg} | sed 's/^[-a-z]*=//'`"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo '***' Can only configure for one host at a time.
|
echo '***' Can only configure for one host at a time. 1>&2
|
||||||
fatal=yes
|
fatal=yes
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -200,7 +200,7 @@ do
|
||||||
case "${target_alias}" in
|
case "${target_alias}" in
|
||||||
"") target_alias="`echo ${arg} | sed 's/^[-a-z]*=//'`" ;;
|
"") target_alias="`echo ${arg} | sed 's/^[-a-z]*=//'`" ;;
|
||||||
*)
|
*)
|
||||||
echo '***' Can only configure for one target at a time.
|
echo '***' Can only configure for one target at a time. 1>&2
|
||||||
fatal=yes
|
fatal=yes
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -235,7 +235,7 @@ do
|
||||||
undefs="${arg}"
|
undefs="${arg}"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo '***' Can only configure for one host and one target at a time.
|
echo '***' Can only configure for one host and one target at a time. 1>&2
|
||||||
fatal=yes
|
fatal=yes
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -264,10 +264,10 @@ case "${fatal}" in
|
||||||
### there were no unadorned args, then the hosts are also targets.
|
### there were no unadorned args, then the hosts are also targets.
|
||||||
|
|
||||||
if [ -n "${host_alias}" -a -n "${target_alias}" -a -n "${undefs}" ] ; then
|
if [ -n "${host_alias}" -a -n "${target_alias}" -a -n "${undefs}" ] ; then
|
||||||
echo '***' Can only configure for one host and one target at a time.
|
echo '***' Can only configure for one host and one target at a time. 1>&2
|
||||||
fatal=yes
|
fatal=yes
|
||||||
elif [ -z "${host_alias}" -a -z "${undefs}" ] ; then
|
elif [ -z "${host_alias}" -a -z "${undefs}" ] ; then
|
||||||
echo '***' You must tell me for which host you want to configure.
|
echo '***' You must tell me for which host you want to configure. 1>&2
|
||||||
fatal=yes
|
fatal=yes
|
||||||
else
|
else
|
||||||
case "${host_alias}" in
|
case "${host_alias}" in
|
||||||
|
@ -321,7 +321,7 @@ configsub=`echo ${progname} | sed 's/configure$/config.sub/'`
|
||||||
if ${configsub} `echo ${host_alias} | sed -e 's/ .*//'` >/dev/null 2>&1 ; then
|
if ${configsub} `echo ${host_alias} | sed -e 's/ .*//'` >/dev/null 2>&1 ; then
|
||||||
true
|
true
|
||||||
else
|
else
|
||||||
echo '***' cannot find config.sub.
|
echo '***' cannot find config.sub. 1>&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -333,7 +333,7 @@ case "${srcdir}" in
|
||||||
if [ -r ${progname}.in ] ; then
|
if [ -r ${progname}.in ] ; then
|
||||||
srcdir=`echo ${progname} | sed 's:/configure$::'`
|
srcdir=`echo ${progname} | sed 's:/configure$::'`
|
||||||
else
|
else
|
||||||
echo '***' "Can't find configure.in. Try using -srcdir=some_dir"
|
echo '***' "Can't find configure.in. Try using -srcdir=some_dir" 1>&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -341,6 +341,16 @@ case "${srcdir}" in
|
||||||
*) ;;
|
*) ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
### warn about some conflicting configurations.
|
||||||
|
|
||||||
|
case "${srcdir}" in
|
||||||
|
".") ;;
|
||||||
|
*)
|
||||||
|
if [ -f ${srcdir}/config.status ] ; then
|
||||||
|
echo '***' Cannot configure for ${PWD} when ${srcdir}/config.status exists. 1>&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
esac
|
||||||
|
|
||||||
# default exec_prefix
|
# default exec_prefix
|
||||||
case "${exec_prefix}" in
|
case "${exec_prefix}" in
|
||||||
|
@ -393,7 +403,7 @@ fi
|
||||||
# some sanity checks on configure.in
|
# some sanity checks on configure.in
|
||||||
case "${srctrigger}" in
|
case "${srctrigger}" in
|
||||||
"")
|
"")
|
||||||
echo '***' srctrigger not set in ${PWD}/configure.in.
|
echo '***' srctrigger not set in ${PWD}/configure.in. 1>&2
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
*) ;;
|
*) ;;
|
||||||
|
|
Loading…
Reference in New Issue