From 5be282d1bd00b5abfd954e59105fa4cef366664f Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Sun, 25 May 2014 18:54:08 +0300 Subject: [PATCH] Re: [RFC PATCH] configure: Create sh.config based on Makefile.config data --- ac/519f9d121303c914c31b8f58d0af2e89d73015 | 121 ++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 ac/519f9d121303c914c31b8f58d0af2e89d73015 diff --git a/ac/519f9d121303c914c31b8f58d0af2e89d73015 b/ac/519f9d121303c914c31b8f58d0af2e89d73015 new file mode 100644 index 000000000..635e1b30d --- /dev/null +++ b/ac/519f9d121303c914c31b8f58d0af2e89d73015 @@ -0,0 +1,121 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id B748A431FC7 + for ; Sun, 25 May 2014 08:54:26 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id j5PUhvxToiNk for ; + Sun, 25 May 2014 08:54:18 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id 8F804431FAF + for ; Sun, 25 May 2014 08:54:18 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id B10F410008F; + Sun, 25 May 2014 18:54:08 +0300 (EEST) +From: Tomi Ollila +To: Jani Nikula , Charles Celerier , + notmuch@notmuchmail.org +Subject: Re: [RFC PATCH] configure: Create sh.config based on + Makefile.config data +In-Reply-To: <87tx8ei7xj.fsf@nikula.org> +References: <1399802816-29521-1-git-send-email-tomi.ollila@iki.fi> + <87tx8ei7xj.fsf@nikula.org> +User-Agent: Notmuch/0.18+12~g9d41f94 (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 25 May 2014 15:54:26 -0000 + +On Sun, May 25 2014, Jani Nikula wrote: + +> On Sun, 11 May 2014, Tomi Ollila wrote: +>> Read Makefile.config and when line matches var = val assignment +>> create _var='val' from it. var must match [a-zA-Z_][a-zA-Z0-9_]* +>> and val [^'\]* ('\' usually meaning multiline assignments). +>> +>> Write these lines to sh.config. +>> +>> sh.config can then be used e.g. in test scripts. +> +> I like the general idea here much better than [1] or the symlinks that +> we have now. However I'm wary of the sed magic and the various ways it +> might trip over. The resulting file has way more info than we need, but +> then it also misses the multiline settings (which we luckily don't +> need). +> +> At the risk of duplicating stuff, I'd go with manually generated config +> for shell with minimal amount of information. For now, we'd only need +> this for HAVE_XAPIAN_COMPACT and HAVE_MAN (the latter of which could +> also be dropped from Makefile.config). + +I agree with this. It looks simpler and cleaner to an outside observer. +I don't think the duplication of (one variable now) stuff is of any issue +here (now or in foreseeable future). + +> +> BR, +> Jani. +> +> +> [1] id:1399737224-79348-1-git-send-email-cceleri@cs.stanford.edu + +In any case, this sh.config to be useful sourcing of it needs to be +added to test/test-lib.sh and then used in the followup patch of +the above... + +Tomi + + +>> --- +>> configure | 5 +++++ +>> 1 file changed, 5 insertions(+) +>> +>> diff --git a/configure b/configure +>> index 9bde2eb72b0e..feb0e480f86a 100755 +>> --- a/configure +>> +++ b/configure +>> @@ -935,3 +935,8 @@ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ +>> +>> CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(XAPIAN_LDFLAGS) +>> EOF +>> + +>> +# Create sh.config based on Makefile.config values. +>> +# Output will be _var='val', val not containing ' nor \ (skipping multiline). +>> +sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\) *= *\([^\\'\'']*\)$/_\1='\''\2'\''/p' \ +>> + Makefile.config > sh.config +>> -- +>> 1.8.0 +>> +>> _______________________________________________ +>> notmuch mailing list +>> notmuch@notmuchmail.org +>> http://notmuchmail.org/mailman/listinfo/notmuch +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2