From c266290f972e237c1e6836fe661b75e39f3928c0 Mon Sep 17 00:00:00 2001 From: law Date: Wed, 24 Mar 1999 21:46:18 +0000 Subject: =?UTF-8?q?=EF=BF=BD=20=20=20=20=20=20=20=20=20*=20configure.in=20?= =?UTF-8?q?(AC=5FPREREQ):=20Update=20to=202.13.=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?(AC=5FEXEEXT):=20Call=20to=20find=20possible=20file=20extension?= =?UTF-8?q?.=20=20=20=20=20=20=20=20=20(compiler=5Fname):=20Use.=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20*=20configure:=20Regenerate.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@25953 138bc75d-0d04-0410-961f-82ee72b054a4 --- libchill/ChangeLog | 7 +++++++ libchill/configure.in | 44 ++++++++++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 18 deletions(-) (limited to 'libchill') diff --git a/libchill/ChangeLog b/libchill/ChangeLog index 40439940fa4..bd03fb3b463 100644 --- a/libchill/ChangeLog +++ b/libchill/ChangeLog @@ -1,3 +1,10 @@ +Wed Mar 24 22:41:28 1999 Mumit Khan + + * configure.in (AC_PREREQ): Update to 2.13. + (AC_EXEEXT): Call to find possible file extension. + (compiler_name): Use. + * configure: Regenerate. + 1999-01-19 08:10 -0500 Zack Weinberg * Makefile.in: Fix typos in previous change. diff --git a/libchill/configure.in b/libchill/configure.in index afb9f67464e..ff5e62b3202 100644 --- a/libchill/configure.in +++ b/libchill/configure.in @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -# Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1995, 1997, 1998, 1999 Free Software Foundation, Inc. # Contributed by Dave Love (d.love@dl.ac.uk). # #This file is part of GNU CC. @@ -19,7 +19,7 @@ #the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #02111-1307, USA. -AC_PREREQ(2.12.1) +AC_PREREQ(2.13) AC_INIT(chillrt0.c) if test "${srcdir}" = "." ; then @@ -35,29 +35,37 @@ dnl This is needed for a multilibbed build in the source tree so dnl that install-sh and config.sub get found. AC_CONFIG_AUX_DIR($topsrcdir) -# If the language specific compiler does not exist, but the "gcc" directory does, -# we do not build anything. Note, $r is set by the top-level Makefile. +# We have to handle 3 cases -- native, cross and canadian cross -- and +# the extension returned from this macro needs to be treated as a possible +# scenario and not the only one. +AC_EXEEXT + +# If the language specific compiler does not exist, but the "gcc" directory +# does, we do not build anything. Note, $r is set by the top-level Makefile. +# Note that when we look for the compiler, we search both with and without +# extension to handle cross and canadian cross builds. compiler_name=cc1chill rm -f skip-this-dir AC_MSG_CHECKING(if compiler $compiler_name has been built) AC_CACHE_VAL(chill_cv_compiler_exists, - [chill_cv_compiler_exists=yes - if test -n "$r"; then - if test -d "$r"/gcc; then - if test -f "$r"/gcc/$compiler_name; then - true - else - chill_cv_compiler_exists=no - echo "rm -f config.cache config.log multilib.out" > skip-this-dir - fi - fi - fi - ]) +[chill_cv_compiler_exists=yes +if test -n "$r"; then + if test -d "$r"/gcc; then + if test -f "$r"/gcc/$compiler_name \ + || test -f "$r"/gcc/$compiler_name$EXEEXT; then + true + else + chill_cv_compiler_exists=no + echo "rm -f config.cache config.log multilib.out" > skip-this-dir + fi + fi +fi +]) AC_MSG_RESULT($chill_cv_compiler_exists) if test x$chill_cv_compiler_exists = xno then - rm -f Makefile conftest* confdefs* core - exit 0 + rm -f Makefile conftest* confdefs* core + exit 0 fi dnl Checks for programs. -- cgit v1.2.1