Commit 71205e0b by Manfred Hollstein Committed by Manfred Hollstein

configure (skip-this-dir): Add handling for new shell script...

./ChangeLog:1998-11-26  Manfred Hollstein  <manfred@s-direktnet.de>
	* configure (skip-this-dir): Add handling for new shell script, which
	might be created by a sub-directory's configure to indicate, this particular
	directory is "unwanted".
	* Makefile.in ($(CONFIGURE_TARGET_MODULES)): Likewise.
./gcc/ChangeLog:1998-11-26  Manfred Hollstein  <manfred@s-direktnet.de>
	* Makefile.in (CONFIG_LANGUAGES): New macro taking all languages
	which can be configured.
	(LANGUAGES): Use $(CONFIG_LANGUAGES) instead of @all_languages@
	(Makefile): Pass actual LANGUAGES through the environment when
	re-configuring.
	(cstamp-h): Likewise.
	(config.status): Likewise.
	* configure.in (enable_languages): Add new configuration parameter
	"--enable-languages=lang1,lang2,...".
	(${srcdir}/*/config-lang.in): Change handling to configure only
	those directories, that the user might have enabled; default to
	"all" existing languages.
	* configure: Regenerate.
./libchill/ChangeLog:1998-11-26  Manfred Hollstein  <manfred@s-direktnet.de>
	* configure.in (compiler_name): Add check to detect if this
	language's compiler has been built.
	* configure: Regenerate.
./libf2c/ChangeLog:1998-11-26  Manfred Hollstein  <manfred@s-direktnet.de>
	* configure.in (compiler_name): Add check to detect if this
	language's compiler has been built.
	* configure: Regenerate.
./libio/ChangeLog:1998-11-26  Manfred Hollstein  <manfred@s-direktnet.de>
	* configure.in (compiler_name): Add check to detect if this
	language's compiler has been built.
./libobjc/ChangeLog:1998-11-26  Manfred Hollstein  <manfred@s-direktnet.de>
	* configure.in (compiler_name): Add check to detect if this
	language's compiler has been built.
	* configure: Regenerate.
./libstdc++/ChangeLog:1998-11-26  Manfred Hollstein  <manfred@s-direktnet.de>
	* configure.in (compiler_name): Add check to detect if this
	language's compiler has been built.

From-SVN: r23892
parent 7240472a
1998-11-26 Manfred Hollstein <manfred@s-direktnet.de>
* configure (skip-this-dir): Add handling for new shell script, which
might be created by a sub-directory's configure to indicate, this particular
directory is "unwanted".
* Makefile.in ($(CONFIGURE_TARGET_MODULES)): Likewise.
Thu Oct 22 10:55:25 1998 Robert Lipe <robertl@dgii.com> Thu Oct 22 10:55:25 1998 Robert Lipe <robertl@dgii.com>
* config.guess: Match any version of Unixware7. * config.guess: Match any version of Unixware7.
......
...@@ -1294,16 +1294,23 @@ $(CONFIGURE_TARGET_MODULES): ...@@ -1294,16 +1294,23 @@ $(CONFIGURE_TARGET_MODULES):
libsrcdir="$$s/$${dir}"; \ libsrcdir="$$s/$${dir}"; \
fi; \ fi; \
if [ -f $${libsrcdir}/configure ] ; then \ if [ -f $${libsrcdir}/configure ] ; then \
rm -f no-such-file; \ rm -f no-such-file skip-this-dir; \
CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
$(CONFIG_ARGUMENTS) $${srcdiroption} \ $(CONFIG_ARGUMENTS) $${srcdiroption} \
--with-target-subdir="$(TARGET_SUBDIR)"; \ --with-target-subdir="$(TARGET_SUBDIR)"; \
else \ else \
rm -f no-such-file; \ rm -f no-such-file skip-this-dir; \
CONFIG_SITE=no-such-file $(SHELL) $$s/configure \ CONFIG_SITE=no-such-file $(SHELL) $$s/configure \
$(CONFIG_ARGUMENTS) $${srcdiroption} \ $(CONFIG_ARGUMENTS) $${srcdiroption} \
--with-target-subdir="$(TARGET_SUBDIR)"; \ --with-target-subdir="$(TARGET_SUBDIR)"; \
fi; \ fi; \
if [ -f skip-this-dir ] ; then \
sh skip-this-dir; \
rm -f skip-this-dir; \
cd ..; rmdir $${dir} || true; \
else \
true; \
fi; \
else \ else \
true; \ true; \
fi; \ fi; \
......
...@@ -677,8 +677,24 @@ fi ...@@ -677,8 +677,24 @@ fi
### do common part of configure.in ### do common part of configure.in
# If the language specific compiler does not exist, but the "gcc" directory does,
# we will skip this directory; in this case the sub-directory's common part
# of configure.in will create a small shell script "skip-this-dir" containing
# commands to completely clean up any temporary or created files.
. ${tmpfile}.com . ${tmpfile}.com
if test -f skip-this-dir; then
# Perform the same cleanup as the trap handler, minus the "exit 1" of course,
# and reset the trap handler.
trap 0
rm -f Makefile* ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos
# Execute the final clean-up actions
${config_shell} skip-this-dir
# and stop configuring this directory.
exit 0
fi
# some sanity checks on configure.in # some sanity checks on configure.in
case "${srctrigger}" in case "${srctrigger}" in
"") "")
......
1998-11-26 Manfred Hollstein <manfred@s-direktnet.de>
* Makefile.in (CONFIG_LANGUAGES): New macro taking all languages
which can be configured.
(LANGUAGES): Use $(CONFIG_LANGUAGES) instead of @all_languages@
(Makefile): Pass actual LANGUAGES through the environment when
re-configuring.
(cstamp-h): Likewise.
(config.status): Likewise.
* configure.in (enable_languages): Add new configuration parameter
"--enable-languages=lang1,lang2,...".
(${srcdir}/*/config-lang.in): Change handling to configure only
those directories, that the user might have enabled; default to
"all" existing languages.
* configure: Regenerate.
Thu Nov 26 00:19:19 1998 Richard Henderson <rth@cygnus.com> Thu Nov 26 00:19:19 1998 Richard Henderson <rth@cygnus.com>
* rtlanal.c (regs_set_between_p): New function. * rtlanal.c (regs_set_between_p): New function.
......
...@@ -39,7 +39,8 @@ SUBDIRS =@subdirs@ ...@@ -39,7 +39,8 @@ SUBDIRS =@subdirs@
# Selection of languages to be made. # Selection of languages to be made.
# This is overridden by configure. # This is overridden by configure.
LANGUAGES = c proto gcov$(exeext) @all_languages@ CONFIG_LANGUAGES = @all_languages@
LANGUAGES = c proto gcov$(exeext) $(CONFIG_LANGUAGES)
# Selection of languages to be made during stage1 build. # Selection of languages to be made during stage1 build.
# This is overridden by configure. # This is overridden by configure.
...@@ -768,7 +769,7 @@ Makefile: $(srcdir)/Makefile.in config.status $(srcdir)/version.c \ ...@@ -768,7 +769,7 @@ Makefile: $(srcdir)/Makefile.in config.status $(srcdir)/version.c \
$(SHELL) $(srcdir)/configure.frag $(srcdir) "$(SUBDIRS)" \ $(SHELL) $(srcdir)/configure.frag $(srcdir) "$(SUBDIRS)" \
"$(xmake_file)" "$(tmake_file)" "$(xmake_file)" "$(tmake_file)"
cp config.status config.run cp config.status config.run
$(SHELL) config.run LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.run
rm -f config.run rm -f config.run
$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/configure: $(srcdir)/configure.in
...@@ -790,7 +791,7 @@ $(srcdir)/cstamp-h.in: $(srcdir)/configure.in $(srcdir)/acconfig.h ...@@ -790,7 +791,7 @@ $(srcdir)/cstamp-h.in: $(srcdir)/configure.in $(srcdir)/acconfig.h
echo timestamp > $(srcdir)/cstamp-h.in echo timestamp > $(srcdir)/cstamp-h.in
auto-host.h: cstamp-h ; @true auto-host.h: cstamp-h ; @true
cstamp-h: config.in config.status cstamp-h: config.in config.status
CONFIG_HEADERS=auto-host.h:config.in $(SHELL) config.status CONFIG_HEADERS=auto-host.h:config.in LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.status
# Really, really stupid make features, such as SUN's KEEP_STATE, may force # Really, really stupid make features, such as SUN's KEEP_STATE, may force
# a target to build even if it is up-to-date. So we must verify that # a target to build even if it is up-to-date. So we must verify that
...@@ -800,7 +801,7 @@ config.status: configure version.c ...@@ -800,7 +801,7 @@ config.status: configure version.c
echo You must configure gcc. Look at the INSTALL file for details.; \ echo You must configure gcc. Look at the INSTALL file for details.; \
false; \ false; \
else \ else \
$(SHELL) config.status --recheck; \ LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.status --recheck; \
fi fi
all.internal: start.encap rest.encap all.internal: start.encap rest.encap
......
...@@ -3832,6 +3832,16 @@ fi ...@@ -3832,6 +3832,16 @@ fi
AC_MSG_RESULT($gcc_cv_as_subsections) AC_MSG_RESULT($gcc_cv_as_subsections)
# Figure out what language subdirectories are present. # Figure out what language subdirectories are present.
# Look if the user specified --enable-languages="..."; if not, use
# the environment variable $LANGUAGES if defined. $LANGUAGES might
# go away some day.
if test x"${enable_languages+set}" != xset; then
if test x"${LANGUAGES+set}" = xset; then
enable_languages="`echo ${LANGUAGES} | tr ' ' ','`"
else
enable_languages=all
fi
fi
subdirs= subdirs=
for lang in ${srcdir}/*/config-lang.in .. for lang in ${srcdir}/*/config-lang.in ..
do do
...@@ -3840,13 +3850,39 @@ do ...@@ -3840,13 +3850,39 @@ do
# The odd quoting in the next line works around # The odd quoting in the next line works around
# an apparent bug in bash 1.12 on linux. # an apparent bug in bash 1.12 on linux.
changequote(,)dnl changequote(,)dnl
${srcdir}/ada/config-lang.in)
if test x$gnat = xyes ; then
subdirs="$subdirs `echo $lang | sed -e 's,^.*/\([^/]*\)/config-lang.in$,\1,'`"
fi
;;
${srcdir}/[*]/config-lang.in) ;; ${srcdir}/[*]/config-lang.in) ;;
*) subdirs="$subdirs `echo $lang | sed -e 's,^.*/\([^/]*\)/config-lang.in$,\1,'`" ;; *)
lang_alias=`sed -n -e 's,^language=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^language=\([^ ]*\).*$,\1,p' $lang`
if test "x$lang_alias" = x
then
echo "$lang doesn't set \$language." 1>&2
exit 1
fi
if test x"${enable_languages}" = xall; then
add_this_lang=yes
else
case "${enable_languages}" in
${lang_alias} | "${lang_alias},"* | *",${lang_alias},"* | *",${lang_alias}" )
add_this_lang=yes
;;
* )
add_this_lang=no
;;
esac
fi
if test x"${add_this_lang}" = xyes; then
case $lang in
${srcdir}/ada/config-lang.in)
if test x$gnat = xyes ; then
subdirs="$subdirs `echo $lang | sed -e 's,^.*/\([^/]*\)/config-lang.in$,\1,'`"
fi
;;
*)
subdirs="$subdirs `echo $lang | sed -e 's,^.*/\([^/]*\)/config-lang.in$,\1,'`"
;;
esac
fi
;;
changequote([,])dnl changequote([,])dnl
esac esac
done done
......
1998-11-26 Manfred Hollstein <manfred@s-direktnet.de>
* configure.in (compiler_name): Add check to detect if this
language's compiler has been built.
* configure: Regenerate.
Mon Nov 23 16:48:39 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> Mon Nov 23 16:48:39 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* configure.in: Use AC_PREREQ(2.12.1). * configure.in: Use AC_PREREQ(2.12.1).
......
...@@ -35,6 +35,31 @@ dnl This is needed for a multilibbed build in the source tree so ...@@ -35,6 +35,31 @@ dnl This is needed for a multilibbed build in the source tree so
dnl that install-sh and config.sub get found. dnl that install-sh and config.sub get found.
AC_CONFIG_AUX_DIR($topsrcdir) 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.
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
])
AC_MSG_RESULT($chill_cv_compiler_exists)
if test x$chill_cv_compiler_exists = xno
then
rm -f Makefile conftest* confdefs* core
exit 0
fi
dnl Checks for programs. dnl Checks for programs.
# For chill we'll set CC to point at the built gcc, but this will get it into # For chill we'll set CC to point at the built gcc, but this will get it into
# the makefiles # the makefiles
......
1998-11-26 Manfred Hollstein <manfred@s-direktnet.de>
* configure.in (compiler_name): Add check to detect if this
language's compiler has been built.
* configure: Regenerate.
Mon Nov 23 16:52:22 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> Mon Nov 23 16:52:22 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* configure.in: Use AC_PREREQ(2.12.1). * configure.in: Use AC_PREREQ(2.12.1).
......
...@@ -35,6 +35,31 @@ dnl This is needed for a multilibbed build in the source tree so ...@@ -35,6 +35,31 @@ dnl This is needed for a multilibbed build in the source tree so
dnl that install-sh and config.sub get found. dnl that install-sh and config.sub get found.
AC_CONFIG_AUX_DIR($topsrcdir) 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.
compiler_name=f771
rm -f skip-this-dir
AC_MSG_CHECKING(if compiler $compiler_name has been built)
AC_CACHE_VAL(f77_cv_compiler_exists,
[f77_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
f77_cv_compiler_exists=no
echo "rm -f config.cache config.log multilib.out" > skip-this-dir
fi
fi
fi
])
AC_MSG_RESULT($f77_cv_compiler_exists)
if test x$f77_cv_compiler_exists = xno
then
rm -f Makefile conftest* confdefs* core
exit 0
fi
dnl Checks for programs. dnl Checks for programs.
# For g77 we'll set CC to point at the built gcc, but this will get it into # For g77 we'll set CC to point at the built gcc, but this will get it into
# the makefiles # the makefiles
......
1998-11-26 Manfred Hollstein <manfred@s-direktnet.de>
* configure.in (compiler_name): Add check to detect if this
language's compiler has been built.
1998-10-12 Alexandre Oliva <oliva@dcc.unicamp.br> 1998-10-12 Alexandre Oliva <oliva@dcc.unicamp.br>
* config.shared (depend.new): delete libc-lock.h from * config.shared (depend.new): delete libc-lock.h from
......
...@@ -2,6 +2,20 @@ ...@@ -2,6 +2,20 @@
# necessary for a configure script to process the program in # necessary for a configure script to process the program in
# this directory. For more information, look at ../configure. # this directory. For more information, look at ../configure.
# 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.
compiler_name=cc1plus
rm -f skip-this-dir
if test -n "$r"; then
if test -d "$r"/gcc; then
if test -f "$r"/gcc/$compiler_name; then
true
else
echo "rm -f multilib.out" > skip-this-dir
fi
fi
fi
if [ "${srcdir}" = "." ] ; then if [ "${srcdir}" = "." ] ; then
if [ "${with_target_subdir}" != "." ] ; then if [ "${with_target_subdir}" != "." ] ; then
topsrcdir=${with_multisrctop}../.. topsrcdir=${with_multisrctop}../..
......
1998-11-26 Manfred Hollstein <manfred@s-direktnet.de>
* configure.in (compiler_name): Add check to detect if this
language's compiler has been built.
* configure: Regenerate.
Mon Nov 23 16:50:28 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> Mon Nov 23 16:50:28 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* configure.in: Use AC_PREREQ(2.12.1). * configure.in: Use AC_PREREQ(2.12.1).
......
...@@ -553,12 +553,42 @@ ac_config_sub=$ac_aux_dir/config.sub ...@@ -553,12 +553,42 @@ ac_config_sub=$ac_aux_dir/config.sub
ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
# 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.
compiler_name=cc1obj
rm -f skip-this-dir
echo $ac_n "checking if compiler $compiler_name has been built""... $ac_c" 1>&6
echo "configure:562: checking if compiler $compiler_name has been built" >&5
if eval "test \"`echo '$''{'objc_cv_compiler_exists'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
objc_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
objc_cv_compiler_exists=no
echo "rm -f config.cache config.log multilib.out" > skip-this-dir
fi
fi
fi
fi
echo "$ac_t""$objc_cv_compiler_exists" 1>&6
if test x$objc_cv_compiler_exists = xno
then
rm -f Makefile conftest* confdefs* core
exit 0
fi
# For ObjC we'll set CC to point at the built gcc, but this will get it into # For ObjC we'll set CC to point at the built gcc, but this will get it into
# the makefiles # the makefiles
# Extract the first word of "gcc", so it can be a program name with args. # Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2 set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:562: checking for $ac_word" >&5 echo "configure:592: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -587,7 +617,7 @@ if test -z "$CC"; then ...@@ -587,7 +617,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args. # Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2 set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:591: checking for $ac_word" >&5 echo "configure:621: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -635,7 +665,7 @@ fi ...@@ -635,7 +665,7 @@ fi
fi fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
echo "configure:639: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 echo "configure:669: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
...@@ -645,11 +675,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS ...@@ -645,11 +675,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
cross_compiling=$ac_cv_prog_cc_cross cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 649 "configure" #line 679 "configure"
#include "confdefs.h" #include "confdefs.h"
main(){return(0);} main(){return(0);}
EOF EOF
if { (eval echo configure:653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo configure:683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
ac_cv_prog_cc_works=yes ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler. # If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then if (./conftest; exit) 2>/dev/null; then
...@@ -669,12 +699,12 @@ if test $ac_cv_prog_cc_works = no; then ...@@ -669,12 +699,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
echo "configure:673: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "configure:703: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
echo "configure:678: checking whether we are using GNU C" >&5 echo "configure:708: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -683,7 +713,7 @@ else ...@@ -683,7 +713,7 @@ else
yes; yes;
#endif #endif
EOF EOF
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes ac_cv_prog_gcc=yes
else else
ac_cv_prog_gcc=no ac_cv_prog_gcc=no
...@@ -698,7 +728,7 @@ if test $ac_cv_prog_gcc = yes; then ...@@ -698,7 +728,7 @@ if test $ac_cv_prog_gcc = yes; then
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
CFLAGS= CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
echo "configure:702: checking whether ${CC-cc} accepts -g" >&5 echo "configure:732: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -734,7 +764,7 @@ else ...@@ -734,7 +764,7 @@ else
# Extract the first word of "ranlib", so it can be a program name with args. # Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2 set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:738: checking for $ac_word" >&5 echo "configure:768: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -773,7 +803,7 @@ fi ...@@ -773,7 +803,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:777: checking for a BSD compatible install" >&5 echo "configure:807: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -827,7 +857,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ...@@ -827,7 +857,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
# Sanity check for the cross-compilation case: # Sanity check for the cross-compilation case:
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:831: checking how to run the C preprocessor" >&5 echo "configure:861: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory. # On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then if test -n "$CPP" && test -d "$CPP"; then
CPP= CPP=
...@@ -842,13 +872,13 @@ else ...@@ -842,13 +872,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser, # On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. # not just through cpp.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 846 "configure" #line 876 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out` ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
...@@ -859,13 +889,13 @@ else ...@@ -859,13 +889,13 @@ else
rm -rf conftest* rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp" CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 863 "configure" #line 893 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out` ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
...@@ -889,17 +919,17 @@ echo "$ac_t""$CPP" 1>&6 ...@@ -889,17 +919,17 @@ echo "$ac_t""$CPP" 1>&6
ac_safe=`echo "stdio.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "stdio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for stdio.h""... $ac_c" 1>&6 echo $ac_n "checking for stdio.h""... $ac_c" 1>&6
echo "configure:893: checking for stdio.h" >&5 echo "configure:923: checking for stdio.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 898 "configure" #line 928 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out` ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -927,12 +957,12 @@ fi ...@@ -927,12 +957,12 @@ fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
echo "configure:931: checking for ANSI C header files" >&5 echo "configure:961: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 936 "configure" #line 966 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
...@@ -940,7 +970,7 @@ else ...@@ -940,7 +970,7 @@ else
#include <float.h> #include <float.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out` ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -957,7 +987,7 @@ rm -f conftest* ...@@ -957,7 +987,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI. # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 961 "configure" #line 991 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <string.h> #include <string.h>
EOF EOF
...@@ -975,7 +1005,7 @@ fi ...@@ -975,7 +1005,7 @@ fi
if test $ac_cv_header_stdc = yes; then if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 979 "configure" #line 1009 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
EOF EOF
...@@ -996,7 +1026,7 @@ if test "$cross_compiling" = yes; then ...@@ -996,7 +1026,7 @@ if test "$cross_compiling" = yes; then
: :
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1000 "configure" #line 1030 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
...@@ -1007,7 +1037,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); ...@@ -1007,7 +1037,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); } exit (0); }
EOF EOF
if { (eval echo configure:1011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null if { (eval echo configure:1041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then then
: :
else else
...@@ -1041,7 +1071,7 @@ else ...@@ -1041,7 +1071,7 @@ else
fi fi
echo $ac_n "checking for thread file""... $ac_c" 1>&6 echo $ac_n "checking for thread file""... $ac_c" 1>&6
echo "configure:1045: checking for thread file" >&5 echo "configure:1075: checking for thread file" >&5
if eval "test \"`echo '$''{'objc_cv_thread_file'+set}'`\" = set"; then if eval "test \"`echo '$''{'objc_cv_thread_file'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
......
...@@ -36,6 +36,31 @@ dnl This is needed for a multilibbed build in the source tree so ...@@ -36,6 +36,31 @@ dnl This is needed for a multilibbed build in the source tree so
dnl that install-sh and config.sub get found. dnl that install-sh and config.sub get found.
AC_CONFIG_AUX_DIR($topsrcdir) 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.
compiler_name=cc1obj
rm -f skip-this-dir
AC_MSG_CHECKING(if compiler $compiler_name has been built)
AC_CACHE_VAL(objc_cv_compiler_exists,
[objc_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
objc_cv_compiler_exists=no
echo "rm -f config.cache config.log multilib.out" > skip-this-dir
fi
fi
fi
])
AC_MSG_RESULT($objc_cv_compiler_exists)
if test x$objc_cv_compiler_exists = xno
then
rm -f Makefile conftest* confdefs* core
exit 0
fi
dnl Checks for programs. dnl Checks for programs.
# For ObjC we'll set CC to point at the built gcc, but this will get it into # For ObjC we'll set CC to point at the built gcc, but this will get it into
# the makefiles # the makefiles
......
1998-11-26 Manfred Hollstein <manfred@s-direktnet.de>
* configure.in (compiler_name): Add check to detect if this
language's compiler has been built.
1998-11-23 Ulrich Drepper <drepper@cygnus.com> 1998-11-23 Ulrich Drepper <drepper@cygnus.com>
* std/bastring.cc (operator>>): Cast new character to char before * std/bastring.cc (operator>>): Cast new character to char before
......
...@@ -2,6 +2,20 @@ ...@@ -2,6 +2,20 @@
# necessary for a configure script to process the program in # necessary for a configure script to process the program in
# this directory. For more information, look at ../configure. # this directory. For more information, look at ../configure.
# 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.
compiler_name=cc1plus
rm -f skip-this-dir
if test -n "$r"; then
if test -d "$r"/gcc; then
if test -f "$r"/gcc/$compiler_name; then
true
else
echo "rm -f multilib.out" > skip-this-dir
fi
fi
fi
if [ "${srcdir}" = "." ] ; then if [ "${srcdir}" = "." ] ; then
if [ "${with_target_subdir}" != "." ] ; then if [ "${with_target_subdir}" != "." ] ; then
topsrcdir=${with_multisrctop}../.. topsrcdir=${with_multisrctop}../..
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment