From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25912 invoked by alias); 16 Mar 2004 22:17:16 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 25784 invoked from network); 16 Mar 2004 22:17:12 -0000 Received: from unknown (HELO ms-smtp-01.nyroc.rr.com) (24.24.2.55) by sources.redhat.com with SMTP; 16 Mar 2004 22:17:12 -0000 Received: from doctormoo (syr-24-59-115-225.twcny.rr.com [24.59.115.225]) by ms-smtp-01.nyroc.rr.com (8.12.10/8.12.10) with ESMTP id i2GMH9Xs027845; Tue, 16 Mar 2004 17:17:09 -0500 (EST) Received: by doctormoo (Postfix, from userid 1000) id 953654576A; Tue, 16 Mar 2004 17:17:21 -0500 (EST) Date: Fri, 19 Mar 2004 00:09:00 -0000 To: gcc-patches@gcc.gnu.org Cc: gdb-patches@sources.redhat.com, binutils@sources.redhat.com Subject: [committed] cleanups of top level configure.in (based on Paolo's) Message-ID: <20040316221721.GA15592@twcny.rr.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.5.1+cvs20040105i From: neroden@twcny.rr.com (Nathanael Nerode) X-Virus-Scanned: Symantec AntiVirus Scan Engine X-SW-Source: 2004-03/txt/msg00368.txt.bz2 Thanks to Paolo for the original version of the DEFAULT_YACC + company patch, although I modified it a little bit. Bootstrapped i686-pc-linux-gnu (with no in-tree yacc, lex, m4); it gives the same results as before. Committing to gcc and src. :-) 2004-03-15 Paolo Bonzini Nathanael Nerode * configure.in (DEFAULT_YACC, DEFAULT_M4, DEFAULT_LEX): Set with AC_CHECK_PROGS. * configure.in: Fix comment typo from last patch. * configure: Regenerate. Index: configure.in =================================================================== RCS file: /cvs/gcc/gcc/configure.in,v retrieving revision 1.276 diff -u -r1.276 configure.in --- configure.in 16 Mar 2004 00:03:30 -0000 1.276 +++ configure.in 16 Mar 2004 21:02:47 -0000 @@ -1070,7 +1070,7 @@ ACX_PROG_GNAT -# By default, C is the only stage 1 langauge. +# By default, C is the only stage 1 language. stage1_languages=c AC_SUBST(stage1_languages) @@ -1497,62 +1497,12 @@ tooldir='${exec_prefix}'/${target_alias} build_tooldir=${tooldir} -# Generate a default definition for YACC. This is used if the makefile can't -# locate bison or byacc in objdir. - -for prog in 'bison -y' byacc yacc -do - set dummy $prog; tmp=$2 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" - for dir in $PATH; do - test -z "$dir" && dir=. - if test -f $dir/$tmp; then - DEFAULT_YACC="$prog" - break - fi - done - IFS="$save_ifs" - - test -n "$DEFAULT_YACC" && break -done - -# Generate a default definition for M4. This is used if the makefile can't -# locate m4 in objdir. - -for prog in gm4 gnum4 m4 -do - set dummy $prog; tmp=$2 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" - for dir in $PATH; do - test -z "$dir" && dir=. - if test -f $dir/$tmp; then - DEFAULT_M4="$prog" - break - fi - done - IFS="$save_ifs" - - test -n "$DEFAULT_M4" && break -done - -# Generate a default definition for LEX. This is used if the makefile can't -# locate flex in objdir. - -for prog in flex lex -do - set dummy $prog; tmp=$2 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" - for dir in $PATH; do - test -z "$dir" && dir=. - if test -f $dir/$tmp; then - DEFAULT_LEX="$prog" - break - fi - done - IFS="$save_ifs" - - test -n "$DEFAULT_LEX" && break -done +# Generate default definitions for YACC, M4, LEX. These are used if the +# Makefile can't locate these programs in objdir. +MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing +AC_CHECK_PROGS([DEFAULT_YACC], ['bison -y' byacc yacc], [$MISSING bison]) +AC_CHECK_PROGS([DEFAULT_M4], [gm4 gnum4 m4], [$MISSING m4]) +AC_CHECK_PROGS([DEFAULT_LEX], [flex lex], [$MISSING flex]) # FIXME Should this be done recursively ??? (Useful for e.g. gdbtest) # Set up the list of links to be made. -- Make sure your vote will count. http://www.verifiedvoting.org/ From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25912 invoked by alias); 16 Mar 2004 22:17:16 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 25784 invoked from network); 16 Mar 2004 22:17:12 -0000 Received: from unknown (HELO ms-smtp-01.nyroc.rr.com) (24.24.2.55) by sources.redhat.com with SMTP; 16 Mar 2004 22:17:12 -0000 Received: from doctormoo (syr-24-59-115-225.twcny.rr.com [24.59.115.225]) by ms-smtp-01.nyroc.rr.com (8.12.10/8.12.10) with ESMTP id i2GMH9Xs027845; Tue, 16 Mar 2004 17:17:09 -0500 (EST) Received: by doctormoo (Postfix, from userid 1000) id 953654576A; Tue, 16 Mar 2004 17:17:21 -0500 (EST) Date: Tue, 16 Mar 2004 22:17:00 -0000 To: gcc-patches@gcc.gnu.org Cc: gdb-patches@sources.redhat.com, binutils@sources.redhat.com Subject: [committed] cleanups of top level configure.in (based on Paolo's) Message-ID: <20040316221721.GA15592@twcny.rr.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.5.1+cvs20040105i From: neroden@twcny.rr.com (Nathanael Nerode) X-Virus-Scanned: Symantec AntiVirus Scan Engine X-SW-Source: 2004-03.o/txt/msg00368.txt Message-ID: <20040316221700.B1_QllE3NzbQgofP93R_SKVLMneZCjhW40DddhRJTGI@z> Thanks to Paolo for the original version of the DEFAULT_YACC + company patch, although I modified it a little bit. Bootstrapped i686-pc-linux-gnu (with no in-tree yacc, lex, m4); it gives the same results as before. Committing to gcc and src. :-) 2004-03-15 Paolo Bonzini Nathanael Nerode * configure.in (DEFAULT_YACC, DEFAULT_M4, DEFAULT_LEX): Set with AC_CHECK_PROGS. * configure.in: Fix comment typo from last patch. * configure: Regenerate. Index: configure.in =================================================================== RCS file: /cvs/gcc/gcc/configure.in,v retrieving revision 1.276 diff -u -r1.276 configure.in --- configure.in 16 Mar 2004 00:03:30 -0000 1.276 +++ configure.in 16 Mar 2004 21:02:47 -0000 @@ -1070,7 +1070,7 @@ ACX_PROG_GNAT -# By default, C is the only stage 1 langauge. +# By default, C is the only stage 1 language. stage1_languages=c AC_SUBST(stage1_languages) @@ -1497,62 +1497,12 @@ tooldir='${exec_prefix}'/${target_alias} build_tooldir=${tooldir} -# Generate a default definition for YACC. This is used if the makefile can't -# locate bison or byacc in objdir. - -for prog in 'bison -y' byacc yacc -do - set dummy $prog; tmp=$2 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" - for dir in $PATH; do - test -z "$dir" && dir=. - if test -f $dir/$tmp; then - DEFAULT_YACC="$prog" - break - fi - done - IFS="$save_ifs" - - test -n "$DEFAULT_YACC" && break -done - -# Generate a default definition for M4. This is used if the makefile can't -# locate m4 in objdir. - -for prog in gm4 gnum4 m4 -do - set dummy $prog; tmp=$2 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" - for dir in $PATH; do - test -z "$dir" && dir=. - if test -f $dir/$tmp; then - DEFAULT_M4="$prog" - break - fi - done - IFS="$save_ifs" - - test -n "$DEFAULT_M4" && break -done - -# Generate a default definition for LEX. This is used if the makefile can't -# locate flex in objdir. - -for prog in flex lex -do - set dummy $prog; tmp=$2 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" - for dir in $PATH; do - test -z "$dir" && dir=. - if test -f $dir/$tmp; then - DEFAULT_LEX="$prog" - break - fi - done - IFS="$save_ifs" - - test -n "$DEFAULT_LEX" && break -done +# Generate default definitions for YACC, M4, LEX. These are used if the +# Makefile can't locate these programs in objdir. +MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing +AC_CHECK_PROGS([DEFAULT_YACC], ['bison -y' byacc yacc], [$MISSING bison]) +AC_CHECK_PROGS([DEFAULT_M4], [gm4 gnum4 m4], [$MISSING m4]) +AC_CHECK_PROGS([DEFAULT_LEX], [flex lex], [$MISSING flex]) # FIXME Should this be done recursively ??? (Useful for e.g. gdbtest) # Set up the list of links to be made. -- Make sure your vote will count. http://www.verifiedvoting.org/