From patchwork Tue Oct 20 14:56:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 9257 Received: (qmail 63080 invoked by alias); 20 Oct 2015 15:03:39 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 63010 invoked by uid 89); 20 Oct 2015 15:03:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com From: Gary Benson To: libc-alpha@sourceware.org Subject: [RFC][PATCH 20/22] Add ./configure checks for I8C and I8X Date: Tue, 20 Oct 2015 15:56:13 +0100 Message-Id: <1445352975-17844-21-git-send-email-gbenson@redhat.com> In-Reply-To: <1445352975-17844-1-git-send-email-gbenson@redhat.com> References: <1445352975-17844-1-git-send-email-gbenson@redhat.com> This commit adds ./configure checks for I8C (the Infinity note compiler) and I8X (the Infinity note execution environment, which is used by "make check"). --- config.make.in | 2 + configure | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 ++ 3 files changed, 96 insertions(+), 0 deletions(-) diff --git a/config.make.in b/config.make.in index a791922..438d147 100644 --- a/config.make.in +++ b/config.make.in @@ -109,6 +109,8 @@ AUTOCONF = @AUTOCONF@ OBJDUMP = @OBJDUMP@ OBJCOPY = @OBJCOPY@ READELF = @READELF@ +I8C = @I8C@ +I8X = @I8X@ # Installation tools. INSTALL = @INSTALL@ diff --git a/configure b/configure index 8aea992..aeb8ce9 100755 --- a/configure +++ b/configure @@ -590,6 +590,8 @@ ac_subst_vars='LTLIBOBJS LIBOBJS RELEASE VERSION +I8X +I8C mach_interface_list DEFINES static_nss @@ -6879,6 +6881,94 @@ $as_echo "$libc_cv_pie_default" >&6; } +# XXX +for ac_prog in i8c +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_I8C+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$I8C"; then + ac_cv_prog_I8C="$I8C" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_I8C="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +I8C=$ac_cv_prog_I8C +if test -n "$I8C"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $I8C" >&5 +$as_echo "$I8C" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$I8C" && break +done +test -n "$I8C" || I8C="no" + +for ac_prog in i8x +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_I8X+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$I8X"; then + ac_cv_prog_I8X="$I8X" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_I8X="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +I8X=$ac_cv_prog_I8X +if test -n "$I8X"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $I8X" >&5 +$as_echo "$I8X" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$I8X" && break +done +test -n "$I8X" || I8X="no" + + VERSION=`sed -n -e 's/^#define VERSION "\([^"]*\)"/\1/p' < $srcdir/version.h` RELEASE=`sed -n -e 's/^#define RELEASE "\([^"]*\)"/\1/p' < $srcdir/version.h` diff --git a/configure.ac b/configure.ac index e502aa5..ea368d9 100644 --- a/configure.ac +++ b/configure.ac @@ -1965,6 +1965,10 @@ AC_SUBST(DEFINES) dnl See sysdeps/mach/configure.ac for this variable. AC_SUBST(mach_interface_list) +# XXX +AC_CHECK_PROGS(I8C, i8c, no) +AC_CHECK_PROGS(I8X, i8x, no) + VERSION=`sed -n -e 's/^#define VERSION "\([^"]*\)"/\1/p' < $srcdir/version.h` RELEASE=`sed -n -e 's/^#define RELEASE "\([^"]*\)"/\1/p' < $srcdir/version.h` AC_SUBST(VERSION)