diff options
| author | Tim Josling <tej@melbpc.org.au> | 2002-06-09 23:33:49 +0000 |
|---|---|---|
| committer | Tim Josling <timjosling@gcc.gnu.org> | 2002-06-09 23:33:49 +0000 |
| commit | 02ef40d97cd6e94f95efd4e2319044bdf6eb0a1d (patch) | |
| tree | 12d9ee16fb6e73a3035502e975b7e43759c01afc | |
| parent | 37a4aa311ba8f5067a8779af9d1a79be655f7e9d (diff) | |
| download | gcc-02ef40d97cd6e94f95efd4e2319044bdf6eb0a1d.zip gcc-02ef40d97cd6e94f95efd4e2319044bdf6eb0a1d.tar.gz gcc-02ef40d97cd6e94f95efd4e2319044bdf6eb0a1d.tar.bz2 | |
Make configure.in check that languages specified were found.
From-SVN: r54418
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rwxr-xr-x | gcc/configure | 15 | ||||
| -rw-r--r-- | gcc/configure.in | 13 |
3 files changed, 30 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a6299b3..1d7f5b0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -8,6 +8,13 @@ update docs for -b option. 2002-06-10 Tim Josling <tej@melbpc.org.au> + + * configure.in (remaining_languages_check): + Added check that all languages specified were found. + Exit if not found. Previous behaviour was silent failure. + * configure: Regenerated. + +2002-06-10 Tim Josling <tej@melbpc.org.au> First steps to making treelang documentation compliant, based on instructions in sourcebuild.texi. Also add to gcc.c list of diff --git a/gcc/configure b/gcc/configure index bde5348a..2d18e73 100755 --- a/gcc/configure +++ b/gcc/configure @@ -7913,8 +7913,7 @@ if test x"${enable_languages+set}" != xset; then enable_languages=all fi else - if test x"${enable_languages}" = x || - test x"${enable_languages}" = xyes; + if test x"${enable_languages}" = x; then { echo "configure: error: --enable-languages needs at least one language argument" 1>&2; exit 1; } fi @@ -7952,6 +7951,7 @@ do esac done +remaining_languages=${enable_languages} subdirs= for lang in ${srcdir}/*/config-lang.in .. do @@ -7976,6 +7976,7 @@ do *) add_this_lang=no ;; esac if test x"${add_this_lang}" = xyes; then + remaining_languages=`echo $remaining_languages | sed -e s/${lang_alias}//g` case $lang in ${srcdir}/ada/config-lang.in) if test x$have_gnat = xyes ; then @@ -7991,6 +7992,14 @@ do esac done +remaining_languages_check=`echo $remaining_languages | sed -e 's/,//g' -e 's/^c$//'g` +if test "xxx$remaining_languages_check" != "xxx" -a "xxx$remaining_languages_check" != "xxxall" ; then + remaining_languages_clean=`echo $remaining_languages | sed -e 's/^c,//' -e 's/,c,/,/' -e 's/,c$//' -e 's/^c$//' -e 's/,,*/,/g' -e 's/^,//g' -e 's/,$//g' ` + echo "Language alias(es) not found: $remaining_languages_clean" + echo "Refer to the configure instructions in the doc directory" + exit 1 +fi + # Make gthr-default.h if we have a thread file. gthread_flags= if test $thread_file != single; then @@ -8035,7 +8044,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:8039: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:8048: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" diff --git a/gcc/configure.in b/gcc/configure.in index 664564e..c75b39e 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -2169,8 +2169,7 @@ if test x"${enable_languages+set}" != xset; then enable_languages=all fi else - if test x"${enable_languages}" = x || - test x"${enable_languages}" = xyes; + if test x"${enable_languages}" = x; then AC_MSG_ERROR([--enable-languages needs at least one language argument]) fi @@ -2210,6 +2209,7 @@ changequote([,])dnl esac done +remaining_languages=${enable_languages} subdirs= for lang in ${srcdir}/*/config-lang.in .. do @@ -2235,6 +2235,7 @@ changequote(,)dnl *) add_this_lang=no ;; esac if test x"${add_this_lang}" = xyes; then + remaining_languages=`echo $remaining_languages | sed -e s/${lang_alias}//g` case $lang in ${srcdir}/ada/config-lang.in) if test x$have_gnat = xyes ; then @@ -2251,6 +2252,14 @@ changequote([,])dnl esac done +remaining_languages_check=`echo $remaining_languages | sed -e 's/,//g' -e 's/^c$//'g` +if test "xxx$remaining_languages_check" != "xxx" -a "xxx$remaining_languages_check" != "xxxall" ; then + remaining_languages_clean=`echo $remaining_languages | sed -e 's/^c,//' -e 's/,c,/,/' -e 's/,c$//' -e 's/^c$//' -e 's/,,*/,/g' -e 's/^,//g' -e 's/,$//g' ` + echo "Language alias(es) not found: $remaining_languages_clean" + echo "Refer to the configure instructions in the doc directory" + exit 1 +fi + # Make gthr-default.h if we have a thread file. gthread_flags= if test $thread_file != single; then |