public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
From: Michael Frysinger <vapier@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin] libgloss: use m4_foreach_w to simplify the logic a bit
Date: Wed,  2 Mar 2022 01:29:08 +0000 (GMT)	[thread overview]
Message-ID: <20220302012908.082093858D39@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=89f643e87b919aa3a20ef81429f5712a2879b6de

commit 89f643e87b919aa3a20ef81429f5712a2879b6de
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Mon Feb 7 06:18:55 2022 -0500

    libgloss: use m4_foreach_w to simplify the logic a bit
    
    It's functionally the same, but the configure.ac code is simpler and
    less boiler plate duplicated.

Diff:
---
 libgloss/configure    | 34 +++++++++++++++++-----------------
 libgloss/configure.ac | 12 +++++++-----
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/libgloss/configure b/libgloss/configure
index 5b5146f3e..b50c9065a 100755
--- a/libgloss/configure
+++ b/libgloss/configure
@@ -629,10 +629,10 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
-CONFIG_LIBNOSYS_FALSE
-CONFIG_LIBNOSYS_TRUE
 CONFIG_WINCE_FALSE
 CONFIG_WINCE_TRUE
+CONFIG_LIBNOSYS_FALSE
+CONFIG_LIBNOSYS_TRUE
 CONFIG_IQ2000_FALSE
 CONFIG_IQ2000_TRUE
 CONFIG_BFIN_FALSE
@@ -2958,7 +2958,7 @@ subdirs="$subdirs aarch64"
 	;;
 esac
 
- if test x$config_bfin = xtrue; then
+   if test x$config_bfin = xtrue; then
   CONFIG_BFIN_TRUE=
   CONFIG_BFIN_FALSE='#'
 else
@@ -2966,7 +2966,7 @@ else
   CONFIG_BFIN_FALSE=
 fi
 
- if test x$config_iq2000 = xtrue; then
+   if test x$config_iq2000 = xtrue; then
   CONFIG_IQ2000_TRUE=
   CONFIG_IQ2000_FALSE='#'
 else
@@ -2974,7 +2974,15 @@ else
   CONFIG_IQ2000_FALSE=
 fi
 
- if test x$config_wince = xtrue; then
+   if test x$config_libnosys = xtrue; then
+  CONFIG_LIBNOSYS_TRUE=
+  CONFIG_LIBNOSYS_FALSE='#'
+else
+  CONFIG_LIBNOSYS_TRUE='#'
+  CONFIG_LIBNOSYS_FALSE=
+fi
+
+   if test x$config_wince = xtrue; then
   CONFIG_WINCE_TRUE=
   CONFIG_WINCE_FALSE='#'
 else
@@ -2984,14 +2992,6 @@ fi
 
 
 
- if test x$config_libnosys = xtrue; then
-  CONFIG_LIBNOSYS_TRUE=
-  CONFIG_LIBNOSYS_FALSE='#'
-else
-  CONFIG_LIBNOSYS_TRUE='#'
-  CONFIG_LIBNOSYS_FALSE=
-fi
-
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -5195,14 +5195,14 @@ if test -z "${CONFIG_IQ2000_TRUE}" && test -z "${CONFIG_IQ2000_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_IQ2000\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${CONFIG_WINCE_TRUE}" && test -z "${CONFIG_WINCE_FALSE}"; then
-  as_fn_error $? "conditional \"CONFIG_WINCE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${CONFIG_LIBNOSYS_TRUE}" && test -z "${CONFIG_LIBNOSYS_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_LIBNOSYS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CONFIG_WINCE_TRUE}" && test -z "${CONFIG_WINCE_FALSE}"; then
+  as_fn_error $? "conditional \"CONFIG_WINCE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index 43e791663..6ed848dd5 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -237,9 +237,13 @@ case "${target}" in
 	;;
 esac
 
-AM_CONDITIONAL(CONFIG_BFIN, test x$config_bfin = xtrue)
-AM_CONDITIONAL(CONFIG_IQ2000, test x$config_iq2000 = xtrue)
-AM_CONDITIONAL(CONFIG_WINCE, test x$config_wince = xtrue)
+dnl These subdirs have converted to non-recursive make.  Hopefully someday all
+dnl the ports above will too!
+m4_foreach_w([SUBDIR], [
+  bfin iq2000 libnosys wince
+], [dnl
+  AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR = xtrue)
+])
 
 dnl For now, don't bother configuring testsuite
 dnl
@@ -247,8 +251,6 @@ dnl if test "${config_testsuite}" = "true";
 dnl   then AC_CONFIG_SUBDIRS([testsuite])
 dnl fi
 
-AM_CONDITIONAL(CONFIG_LIBNOSYS, test x$config_libnosys = xtrue)
-
 AC_PROG_CC
 AM_PROG_AS
 AM_PROG_AR


                 reply	other threads:[~2022-03-02  1:29 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220302012908.082093858D39@sourceware.org \
    --to=vapier@sourceware.org \
    --cc=newlib-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).