From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Bogatov Newsgroups: gmane.lisp.guile.devel Subject: Autoconf guile.m4 improvement Date: Wed, 13 Aug 2014 10:40:54 +0400 Organization: Church of GNU Message-ID: <20140813064054.GA29324@self> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="wzJLGUyc3ArbnUjN" X-Trace: ger.gmane.org 1407912098 20891 80.91.229.3 (13 Aug 2014 06:41:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 13 Aug 2014 06:41:38 +0000 (UTC) To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Wed Aug 13 08:41:30 2014 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XHSFV-00019w-MO for guile-devel@m.gmane.org; Wed, 13 Aug 2014 08:41:29 +0200 Original-Received: from localhost ([::1]:45338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHSFV-0002ee-8Y for guile-devel@m.gmane.org; Wed, 13 Aug 2014 02:41:29 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHSFO-0002eY-4j for guile-devel@gnu.org; Wed, 13 Aug 2014 02:41:27 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHSFI-0006Uk-LS for guile-devel@gnu.org; Wed, 13 Aug 2014 02:41:22 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60252) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHSFI-0006Uf-Hn for guile-devel@gnu.org; Wed, 13 Aug 2014 02:41:16 -0400 Original-Received: from tor-exit-node.dnslab.nl ([95.211.229.158]:46566 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1XHSFH-00005J-2j for guile-devel@gnu.org; Wed, 13 Aug 2014 02:41:16 -0400 Content-Disposition: inline X-Haskell-Quote: IO String contains a String in the same way that /bin/ls contains a list of files X-Perfect-World: There should be one -- and preferably only one -- obvious way to do it. User-Agent: Mutt/1.5.22.1 (2013-10-16) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:17331 Archived-At: --wzJLGUyc3ArbnUjN Content-Type: multipart/mixed; boundary="6TrnltStXW4iwmi0" Content-Disposition: inline --6TrnltStXW4iwmi0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello! In current state GUILE_SITE do not respect $prefix and hard to use in local installs of Guile modules. This patch tries to improve this situation by introducing GUILE_SITE_LOCAL version, than respects $prefix. Opinions, better solutions, critics? PS. Please, keep me in CC. -- Best regards, Dmitry Bogatov , Free Software supporter, esperantisto and netiquette guardian. GPG: 54B7F00D --6TrnltStXW4iwmi0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="0001-Improve-guile-site-handling-in-autoconf.patch" Content-Transfer-Encoding: quoted-printable =46rom d91eb9293bea7783afa8270c1826dc558c7380da Mon Sep 17 00:00:00 2001 =46rom: Dmitry Bogatov Date: Wed, 13 Aug 2014 10:13:25 +0400 Subject: [PATCH] Improve guile-site handling in autoconf * meta/guile.m4(GUILE_SITE_DIR): Add new substitution variable GUILE_SITE_LOCAL, that outputs "guile-site" under prefix of package beeing installed, not under guile prefix. This way `make dist-check` will be happy. Signed-off-by: Dmitry Bogatov --- meta/guile.m4 | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/meta/guile.m4 b/meta/guile.m4 index 441dcd4..31339c9 100644 --- a/meta/guile.m4 +++ b/meta/guile.m4 @@ -162,7 +162,11 @@ AC_DEFUN([GUILE_FLAGS], # PREFIX/share/guile/site, and sets var @var{GUILE_SITE} to the path. # Note that the var name is different from the macro name. # -# The variable is marked for substitution, as by @code{AC_SUBST}. +# Also, set @var{GUILE_SITE_LOCAL} variable as installation path +# under package prefix, if it is specified. It is suitable for +# non-root installation of Guile modules. +# +# The variables is marked for substitution, as by @code{AC_SUBST}. # AC_DEFUN([GUILE_SITE_DIR], [AC_REQUIRE([GUILE_PKG]) @@ -172,7 +176,17 @@ AC_DEFUN([GUILE_SITE_DIR], if test "$GUILE_SITE" =3D ""; then AC_MSG_FAILURE(sitedir not found) fi + if test "x$prefix" !=3D xNONE ; then + GUILE_SITE_LOCAL=3D`$PKG_CONFIG --print-errors --variable=3Dsitedir gu= ile-$GUILE_EFFECTIVE_VERSION --define-variable=3Dprefix=3D$prefix` + else + GUILE_SITE_LOCAL=3D"$GUILE_SITE" + fi + AC_ARG_WITH([guile-site-dir], + [AS_HELP_STRING([--with-guile-site-dir], [use the specified installati= on path for Guile modules])], + [GUILE_SITE_LOCAL=3D"$withval"], + []) AC_SUBST(GUILE_SITE) + AC_SUBST(GUILE_SITE_LOCAL) ]) =20 # GUILE_PROGS -- set paths to Guile interpreter, config and tool programs --=20 I may be not subscribed. Please, keep me in carbon copy. --6TrnltStXW4iwmi0-- --wzJLGUyc3ArbnUjN Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBAgAGBQJT6wh2AAoJEHiL4BJUt/ANYVgQAJG2j00fX2fXeD03kM1fUUpe ZmRyUsLsn/Xt+LvZ1VBHukd46L/FRWnIADqVd8OPGuEgbqooQ26dPZA5YFwP/oM3 3STsfKP3WBvTLVXtIeYMobvNIQf3bvl3hS18RhbUReIIyWsOVRlYkcKU+HerIlgq BcN895gV2KDUbdNhA5SKj4McL+ufE1CDyqpdJ1yztW1aT87KP7c3lH2ylXW9JPc3 dXQPCd8wc43fRBak9vb9ofLV+Oy/s3mshz4ekiP7Uu/h3Btz4aMZATU4HfA7nZvx +eg7K2o2qw+ebr+EHA8VSi4ZzQVUB1CPOu+2SvzkyzRSvtOBLr9p6qNzOWBFOpBj RaibK+eecyaDreedscdE4dr0FvLpXHBBcYiwF+00hXgQuwkJiWm4kAe661izVT+q FWAaDzSlcQR4cA+GGdgK5/mV1kxX6NKh6OgiGpozx73UnLtWEPlk3gjQC9Ynatad josLNkpKPQRMT2KjX1/C0/0ctawaY1EYc88gsH613OG0M789Tudvh1HzZBsTBI+2 +6h2NDHbSyzvqlYcKUcemcZqxrh9PVyYUrnVaOqFyI1DTmBqvtizFSANjLU0ghrA q1qr4U8SQX5xOEkGU0PPmAok/FBbEX/HdUfqQVkZcOjl+gx+T2SzMt4oNomJKen+ ZTA529nSFXmflPQilt8z =zYNP -----END PGP SIGNATURE----- --wzJLGUyc3ArbnUjN--