From unknown Sat Jun 21 03:21:23 2025 X-Loop: help-debbugs@gnu.org Subject: bug#14313: [PATCH 4/7] header-vars: simplify how make flags are determined Resent-From: Stefano Lattarini Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-automake@gnu.org Resent-Date: Mon, 29 Apr 2013 21:02:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 14313 X-GNU-PR-Package: automake X-GNU-PR-Keywords: patch To: automake-patches@gnu.org Cc: mdaniels@rim.com, 14313@debbugs.gnu.org, 12554@debbugs.gnu.org X-Debbugs-Original-Cc: mdaniels@rim.com, bug-automake@gnu.org, 12554@debbugs.gnu.org Received: via spool by submit@debbugs.gnu.org id=B.136726930125397 (code B ref -1); Mon, 29 Apr 2013 21:02:05 +0000 Received: (at submit) by debbugs.gnu.org; 29 Apr 2013 21:01:41 +0000 Received: from localhost ([127.0.0.1]:50883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UWvCf-0006bS-7N for submit@debbugs.gnu.org; Mon, 29 Apr 2013 17:01:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56370) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UWvCa-0006b0-TM for submit@debbugs.gnu.org; Mon, 29 Apr 2013 17:01:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UWvCB-0001k5-Ue for submit@debbugs.gnu.org; Mon, 29 Apr 2013 17:01:17 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-99.9 required=5.0 tests=BAYES_50,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,T_DKIM_INVALID,USER_IN_WHITELIST autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([208.118.235.17]:56421) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWvCB-0001jt-P9 for submit@debbugs.gnu.org; Mon, 29 Apr 2013 17:01:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39281) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWvC5-0000D3-9Q for bug-automake@gnu.org; Mon, 29 Apr 2013 17:01:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UWvC2-0001dF-HA for bug-automake@gnu.org; Mon, 29 Apr 2013 17:01:04 -0400 Received: from mail-ee0-f50.google.com ([74.125.83.50]:35891) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWvBu-0001Zl-6k; Mon, 29 Apr 2013 17:00:54 -0400 Received: by mail-ee0-f50.google.com with SMTP id b15so1791503eek.9 for ; Mon, 29 Apr 2013 14:00:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references; bh=kcS0GsWIztw9aBnIrubMB1zhkZJxWv9lPIZcZdkBr0Q=; b=dZ6+zJiNd9YldAMhNWoXuKw3XaUMK7spJU7Ip962Adm0CHhPiUN33tAwthpuYpIdQK mvXf6jorlEeTS34dMj4ErYUJh/4XoOFzMVUKdXoCWQqpfmUKVMeeqPsXkxQhfQjRE+YO hkZMUxDgXRZykNRft0zKVkztmQ6HfOzNJwbbvD9iKI+IX1Dy4eYsDoJMCFvd03aXpxmb WFE6oac5Zw9w4pdpitcG9PZY1c5lnBr40v8d78FmxQo5iUtuQTO1yfwtWe3QlRe+A1Yz fNP2lGWsjk2/KYBTsg4i/cLdJ+QQ52dROTtQMFVMhJA77zzxoGxCIVUtPZdW1TxzvYf5 Zcag== X-Received: by 10.14.115.131 with SMTP id e3mr52762589eeh.43.1367269253374; Mon, 29 Apr 2013 14:00:53 -0700 (PDT) Received: from localhost.localdomain (host93-95-dynamic.6-79-r.retail.telecomitalia.it. [79.6.95.93]) by mx.google.com with ESMTPSA id e50sm18164448eev.13.2013.04.29.14.00.51 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Apr 2013 14:00:52 -0700 (PDT) From: Stefano Lattarini Date: Mon, 29 Apr 2013 23:00:32 +0200 Message-Id: X-Mailer: git-send-email 1.8.2.1.610.g562af5b In-Reply-To: References: <517EB083.1060208@gmail.com> In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 208.118.235.17 X-Spam-Score: -6.1 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -6.1 (------) Actually, son far only the '-n' option ("dry mode") was detected, but this change will allow us to soon detect more options. * lib/am/header-vars.am (am__running_with_option): Even when $MAKEFLAGS appears to contain definition of variables with embedded whitespace, use simple textual pre-processing over $MAKEFLAGS rather than tricky recursive invocations of make to determine whether the '-n' option was given. This is enough to correctly handle all the tricky usages covered in the testsuite. * t/nodep.sh: Adjust to avoid a spurious failure. Signed-off-by: Stefano Lattarini --- lib/am/header-vars.am | 45 +++++++++++++++++++++++++-------------------- t/nodep.sh | 6 ++++-- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index 8426dcb..c0a5f0c 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -40,7 +40,7 @@ am__make_running_with_option = \ case $${am__target_option-} in \ n) ;; \ *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${am__target_option-}' specified" >&2; \ + "target option '$${am__target_option-}' specified" >&2; \ exit 1;; \ esac; \ am__has_opt=no; \ @@ -54,8 +54,8 @@ am__make_running_with_option = \ esac; \ done; \ else \ -## Non-GNU make: we must rely on $(MAKEFLAGS). This is tricky and brittle, -## but is the best we can do. +## Non-GNU make: we must rely on $(MAKEFLAGS). This is tricker and more +## brittle, but is the best we can do. case $$MAKEFLAGS in \ ## If we run "make TESTS='snooze nap'", FreeBSD make will export MAKEFLAGS ## to " TESTS=foo\ nap", so that the simpler loop below (on word-splitted @@ -63,25 +63,30 @@ am__make_running_with_option = \ ## misinterpret that as and indication that make is running in dry mode. ## This has already happened in practice. So we need this unpleasant hack. *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__has_opt=yes ;; \ +## Extra indirection with ${am__bs} required by FreeBSD 8.x make. +## Not sure why (so sorry for the cargo-cult programming here). + am__bs=\\; \ + am__flags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$am__bs$$am__bs[$$am__bs $$am__bs ]*//g"`;; \ *) \ - am__skip_next=no; \ - for am__flg in $$MAKEFLAGS; do \ - if test $$am__skip_next = yes; then \ - am__skip_next=no; \ - continue; \ - fi; \ - case $$am__flg in \ - *=*|--*) ;; \ -## Quite ugly special-casing. We might need other similar, but let's -## wait until the need arises. - -I) am__skip_next=yes;; \ - *$$am__target_option*) am__has_opt=yes; break;; \ - esac; \ - done ;;\ - esac; \ + am__flags=$$MAKEFLAGS;; \ + esac; \ + am__skip_next=no; \ + for am__flg in $$am__flags; do \ + if test $$am__skip_next = yes; then \ + am__skip_next=no; \ + continue; \ + fi; \ + case $$am__flg in \ + *=*|--*) ;; \ +## Quite ugly special-casing. We might need other similar ones actually, +## but let's wait until the need arises. + -I) am__skip_next=yes;; \ + *$$am__target_option*) am__has_opt=yes; break;; \ + esac; \ + done;\ fi; \ + unset am__skip_next am__flg am__flags am__target_option; \ test $$am__has_opt = yes; \ } diff --git a/t/nodep.sh b/t/nodep.sh index c36405d..b0b29f6 100755 --- a/t/nodep.sh +++ b/t/nodep.sh @@ -36,5 +36,7 @@ mkdir x $ACLOCAL $AUTOMAKE -grep '%' Makefile.in && exit 1 -exit 0 +sed 's/printf .*%s//' Makefile.in > Makefile.tmp +grep '%' Makefile.tmp && exit 1 + +: -- 1.8.2.1.610.g562af5b From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 29 17:09:02 2013 Received: (at control) by debbugs.gnu.org; 29 Apr 2013 21:09:02 +0000 Received: from localhost ([127.0.0.1]:50929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UWvJm-0006uk-1G for submit@debbugs.gnu.org; Mon, 29 Apr 2013 17:09:02 -0400 Received: from mail-ee0-f45.google.com ([74.125.83.45]:44268) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UWvJk-0006uG-9C for control@debbugs.gnu.org; Mon, 29 Apr 2013 17:09:00 -0400 Received: by mail-ee0-f45.google.com with SMTP id l10so2916734eei.32 for ; Mon, 29 Apr 2013 14:08:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:mime-version:to:subject :content-type:content-transfer-encoding; bh=QFuBms0nOChhLFWwi2Q5kj8ywZ7olDjdIX+H0dBdNas=; b=0viXPD0zn+bfkH9/CzWtvaJePnQseztX8mKZ2rkLE2uTdFVYMxUP/UgZ0qpfoDJ4w1 zCR4Lb2GICvP2ihfE9/jF3WWHbTkcvh9Ug8TIsLG1Lt5D+SN9gvdY2kclcwiQCyddgD9 HuHEK0HcPsSSZrireM57D0f0gej4fhcScqaXCSxYxmiO0MBI10c92NZy9e8+82o6a3pe EO2AMg7TMh5qDtixxAdKJ7KiJ7v7Zb/8PaJjU+sqTEcDnm/e2PY3zN2LwqDW4UwoR22D Wxrc1aEbe3+DXxxfIJ5K6sjuJAY5Y0XmZav0X3bnbkGDsGat1XXXG+rlp+5zkWoKvTDd 6i4A== X-Received: by 10.14.173.71 with SMTP id u47mr92004340eel.24.1367269720248; Mon, 29 Apr 2013 14:08:40 -0700 (PDT) Received: from [192.168.178.20] (host93-95-dynamic.6-79-r.retail.telecomitalia.it. [79.6.95.93]) by mx.google.com with ESMTPSA id j43sm34853784eep.4.2013.04.29.14.08.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Apr 2013 14:08:38 -0700 (PDT) Message-ID: <517EE155.2000700@gmail.com> Date: Mon, 29 Apr 2013 23:08:37 +0200 From: Stefano Lattarini MIME-Version: 1.0 To: GNU bug tracker automated control server Subject: x Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Score: 0.1 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) forcemerge 14310 14315 forcemerge 14311 14315 forcemerge 14312 14315 forcemerge 14313 14315 forcemerge 14314 14315 forcemerge 14316 14315 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 29 17:13:06 2013 Received: (at control) by debbugs.gnu.org; 29 Apr 2013 21:13:07 +0000 Received: from localhost ([127.0.0.1]:50940 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UWvNi-00074S-Ke for submit@debbugs.gnu.org; Mon, 29 Apr 2013 17:13:06 -0400 Received: from mail-ea0-f177.google.com ([209.85.215.177]:55671) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UWvNh-00074J-2c for control@debbugs.gnu.org; Mon, 29 Apr 2013 17:13:05 -0400 Received: by mail-ea0-f177.google.com with SMTP id q10so1835963eaj.36 for ; Mon, 29 Apr 2013 14:12:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:mime-version:to:subject :content-type:content-transfer-encoding; bh=cg59VfKqUYx4CLrIzstQtC1d7QEEbiMX91T6sIOz2Sg=; b=ykNW70riw+Ha+AQLefppX0gS4jqBzABlwgqN5DYPFW8RLGwI/blbVKxiinY6ZWiWNm 2RucLZfJQ+DILPB6G6zoHDtYiX4wdKs0IyScPwfgj7pU/P0jJc44gDPQYvj+FfddWf5J m5fyM1OoLv1JGaHQQdRquAMAGV0F/KaXMewS5KvBWld9lTV4UiAw7J+6cZOq8wWoFY22 3uOXgsYG4yM8CVN49W9dk4UfSzhL6DzrNwbt21ykg5yYgs+1GLEznZkAJ82TKh8RxiWc yKenA4yph5WpR1qC3b5KMOe/peismUcisAznnV02ukg2vA8Q/+QVaPhBGceTv57np/Ou N/nQ== X-Received: by 10.15.42.198 with SMTP id u46mr1092352eev.10.1367269965144; Mon, 29 Apr 2013 14:12:45 -0700 (PDT) Received: from [192.168.178.20] (host93-95-dynamic.6-79-r.retail.telecomitalia.it. [79.6.95.93]) by mx.google.com with ESMTPSA id bj2sm34887920eeb.1.2013.04.29.14.12.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Apr 2013 14:12:43 -0700 (PDT) Message-ID: <517EE247.7040801@gmail.com> Date: Mon, 29 Apr 2013 23:12:39 +0200 From: Stefano Lattarini MIME-Version: 1.0 To: GNU bug tracker automated control server Subject: x Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Score: 0.1 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -2.6 (--) tags 14309 notabug close 14309 forcemerge 14309 14310 forcemerge 14309 14311 forcemerge 14309 14312 forcemerge 14309 14313 forcemerge 14309 14314 forcemerge 14309 14315 forcemerge 14309 14316 From unknown Sat Jun 21 03:21:23 2025 X-Loop: help-debbugs@gnu.org Subject: bug#14313: Spurious bug report, ignore References: In-Reply-To: Resent-From: Stefano Lattarini Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-automake@gnu.org Resent-Date: Mon, 29 Apr 2013 21:19:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 14313 X-GNU-PR-Package: automake X-GNU-PR-Keywords: notabug patch To: Stefano Lattarini Received: via spool by 14313-submit@debbugs.gnu.org id=B14313.136727028731499 (code B ref 14313); Mon, 29 Apr 2013 21:19:04 +0000 Received: (at 14313) by debbugs.gnu.org; 29 Apr 2013 21:18:07 +0000 Received: from localhost ([127.0.0.1]:50956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UWvSZ-0008Bv-Bd for submit@debbugs.gnu.org; Mon, 29 Apr 2013 17:18:07 -0400 Received: from mail-ea0-f172.google.com ([209.85.215.172]:53778) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UWvSV-0008Ay-VX; Mon, 29 Apr 2013 17:18:04 -0400 Received: by mail-ea0-f172.google.com with SMTP id z16so1179830ead.17 for ; Mon, 29 Apr 2013 14:17:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:mime-version:to:subject :content-type:content-transfer-encoding; bh=gSi1w5tQFfd2TuCpuhTF6XLFUHKQvM9rS5QMfJw4EPk=; b=veCFIyZsL+xW4/gHOJzuznAfvWivCyCOSU9lp3LpOBjJYS3UkUI9OT/RQQ8gCFcRz4 jQCle4WohbvrL4D3xxSaSTbMxBf+I7iYzob1IhuQPPaHgqIJX2C4dQQuK7C35RDA70xQ 8q+zo5dejYTBfIT9Sjic8XyUnkzHHuG+/8fWahkh2SuooVJq6nFYfeRt/1ynoIbMeWfS M5Tg0AoLZ+QpqHa0mHfFPtOnSqQqVw93jOCiumIm/UYOR0ZVSZMnWR9MKVmdijWZVQKp eSqn0Q3WUYRxlsgiKYGEXUuci0D+tLiP44/3CoWy5QffvTgQ7YGane8MezXIFWDvW/hV onzg== X-Received: by 10.14.110.198 with SMTP id u46mr127777254eeg.41.1367270263335; Mon, 29 Apr 2013 14:17:43 -0700 (PDT) Received: from [192.168.178.20] (host93-95-dynamic.6-79-r.retail.telecomitalia.it. [79.6.95.93]) by mx.google.com with ESMTPSA id cb50sm34829721eeb.14.2013.04.29.14.17.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Apr 2013 14:17:42 -0700 (PDT) Message-ID: <517EE373.1050106@gmail.com> Date: Mon, 29 Apr 2013 23:17:39 +0200 From: Stefano Lattarini MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Score: 0.1 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: debbugs-submit-bounces@debbugs.gnu.org Errors-To: debbugs-submit-bounces@debbugs.gnu.org X-Spam-Score: -1.2 (-) Oops, erroneously created while dealing with bug#12254. Please ignore, and sorry for the noise, Stefano