Patchwork [RFC,20/22] Add ./configure checks for I8C and I8X

login
register
mail settings
Submitter Gary Benson
Date Oct. 20, 2015, 2:56 p.m.
Message ID <1445352975-17844-21-git-send-email-gbenson@redhat.com>
Download mbox | patch
Permalink /patch/9257/
State New
Headers show

Comments

Gary Benson - Oct. 20, 2015, 2:56 p.m.
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(-)
Joseph Myers - Oct. 20, 2015, 3:33 p.m.
I'd expect this patch to also update manual/install.texi (and regenerate 
INSTALL) to document the use of these tools and the version requirements 
on them.
Mike Frysinger - Oct. 20, 2015, 5:54 p.m.
On 20 Oct 2015 15:56, Gary Benson wrote:
> --- 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)

the "# XXX" should be "dnl A real comment."

i know this is an RFC, but sometimes these things slip through
-mike
Gary Benson - Oct. 21, 2015, 8:31 a.m.
Joseph Myers wrote:
> I'd expect this patch to also update manual/install.texi (and regenerate 
> INSTALL) to document the use of these tools and the version requirements 
> on them.

In the "Recommended Tools for Compilation" section?  Ok, I'll do that.

Cheers,
Gary
Gary Benson - Oct. 21, 2015, 8:33 a.m.
Mike Frysinger wrote:
> On 20 Oct 2015 15:56, Gary Benson wrote:
> > --- 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)
> 
> the "# XXX" should be "dnl A real comment."
> 
> i know this is an RFC, but sometimes these things slip through

Thanks Mike.  Usually I do a quick grep before I mail things, but
I guess I forgot this time :)

Cheers,
Gary

Patch

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)