guile.m4 site dir backward compatiblity

guile.m4 site dir backward compatiblity

[Mike Gran]

[-- Attachment #1: Type: text/plain, Size: 157 bytes --]

Hi all-

The attached patch allows me to distribute Guile 1.9.x's guile.m4
in a package that is supposed to compile with both 1.9.x and 1.8.x.

Thanks,

Mike

[-- Attachment #2: 0001-Add-v1.8.x-backward-compatiblity-to-GUILE_SITE_DIR.patch --]
[-- Type: application/octet-stream, Size: 1312 bytes --]

From e5e8ee4bda6e38629525b34ff218bddb39c582fc Mon Sep 17 00:00:00 2001
From: Michael Gran <spk121@yahoo.com>
Date: Sat, 2 Oct 2010 14:29:14 -0700
Subject: [PATCH] Add v1.8.x backward compatiblity to GUILE_SITE_DIR

* meta/guile.m4 (GUILE_SITE_DIR): use pkgdatadir if no sitedir
---
 meta/guile.m4 |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/guile.m4 b/meta/guile.m4
index 5ba725f..aaa9f88 100644
--- a/meta/guile.m4
+++ b/meta/guile.m4
@@ -1,6 +1,6 @@
 ## Autoconf macros for working with Guile.
 ##
-##   Copyright (C) 1998,2001, 2006 Free Software Foundation, Inc.
+##   Copyright (C) 1998,2001, 2006, 2010 Free Software Foundation, Inc.
 ##
 ## This library is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU Lesser General Public License
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301 USA
 
-# serial 9
+# serial 10
 
 ## Index
 ## -----
@@ -109,6 +109,9 @@ AC_DEFUN([GUILE_SITE_DIR],
  [AC_REQUIRE([GUILE_PROGS])dnl
   AC_MSG_CHECKING(for Guile site directory)
   GUILE_SITE=`[$GUILE_CONFIG] info sitedir`
+  if test "$GUILE_SITE" = ""; then
+     GUILE_SITE=`[$GUILE_CONFIG] info pkgdatadir`/site
+  fi
   AC_MSG_RESULT($GUILE_SITE)
   AC_SUBST(GUILE_SITE)
  ])
-- 
1.7.2.3

Re: guile.m4 site dir backward compatiblity

[Andy Wingo]

On Sat 02 Oct 2010 23:34, Mike Gran <spk121@yahoo.com> writes:

> The attached patch allows me to distribute Guile 1.9.x's guile.m4
> in a package that is supposed to compile with both 1.9.x and 1.8.x.

Applied, thanks.

Andy
-- 
http://wingolog.org/