On Tuesday 01 January 2008 15:17:12 DJ Delorie wrote:
> Ok, after removing guile-devel, don't forget to run "make reconfig" so
> you lose the GUILE_FLAGS macro.
>
> There's still a bug in configure.  You have a line like this:
>
>       if test $guile_need_major -gt $guile_major \
>
>          || test $guile_need_minor -gt $guile_minor; then
>
> You should protect stuff like that with double quotes.

Sure thing.

> Also, that test will not work right - it will think guile 2.1 is older
> than guile 1.6.

My bad.  Try the attached patch.


                                          Peter


-- 
Peter Brett

Electronic Systems Engineer
Integral Informatics Ltd
From f92167a4dc153f411b3655c7be2138af629434cc Mon Sep 17 00:00:00 2001
From: Peter TB Brett <[EMAIL PROTECTED]>
Date: Tue, 1 Jan 2008 15:42:13 +0000
Subject: [PATCH] Fix configure checks for Guile.

---
 gattrib/configure.ac   |    5 +++--
 gnetlist/configure.ac  |    5 +++--
 gsymcheck/configure.ac |    5 +++--
 libgeda/configure.ac   |    5 +++--
 utils/configure.ac     |    5 +++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/gattrib/configure.ac b/gattrib/configure.ac
index 0b28819..dfd9636 100644
--- a/gattrib/configure.ac
+++ b/gattrib/configure.ac
@@ -111,8 +111,9 @@ guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
 guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
 AC_MSG_RESULT($GUILE_VERSION)
 
-if test $guile_need_major -gt $guile_major \
-   || test $guile_need_minor -gt $guile_minor; then
+if test "$guile_need_major" -gt "$guile_major" \
+   || (test "$guile_need_major" -le "$guile_major" \
+       && test "$guile_need_minor" -gt "$guile_minor"); then
   AC_MSG_ERROR([Guile version >= $guile_need_version is required.])
 fi
 
diff --git a/gnetlist/configure.ac b/gnetlist/configure.ac
index 7a2184a..c1d9535 100644
--- a/gnetlist/configure.ac
+++ b/gnetlist/configure.ac
@@ -153,8 +153,9 @@ guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
 guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
 AC_MSG_RESULT($GUILE_VERSION)
 
-if test $guile_need_major -gt $guile_major \
-   || test $guile_need_minor -gt $guile_minor; then
+if test "$guile_need_major" -gt "$guile_major" \
+   || (test "$guile_need_major" -le "$guile_major" \
+       && test "$guile_need_minor" -gt "$guile_minor"); then
   AC_MSG_ERROR([Guile version >= $guile_need_version is required.])
 fi
 
diff --git a/gsymcheck/configure.ac b/gsymcheck/configure.ac
index c1588f1..3575c95 100644
--- a/gsymcheck/configure.ac
+++ b/gsymcheck/configure.ac
@@ -65,8 +65,9 @@ guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
 guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
 AC_MSG_RESULT($GUILE_VERSION)
 
-if test $guile_need_major -gt $guile_major \
-   || test $guile_need_minor -gt $guile_minor; then
+if test "$guile_need_major" -gt "$guile_major" \
+   || (test "$guile_need_major" -le "$guile_major" \
+       && test "$guile_need_minor" -gt "$guile_minor"); then
   AC_MSG_ERROR([Guile version >= $guile_need_version is required.])
 fi
 
diff --git a/libgeda/configure.ac b/libgeda/configure.ac
index 38ef275..268bb35 100644
--- a/libgeda/configure.ac
+++ b/libgeda/configure.ac
@@ -106,8 +106,9 @@ guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
 guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
 AC_MSG_RESULT($GUILE_VERSION)
 
-if test $guile_need_major -gt $guile_major \
-   || test $guile_need_minor -gt $guile_minor; then
+if test "$guile_need_major" -gt "$guile_major" \
+   || (test "$guile_need_major" -le "$guile_major" \
+       && test "$guile_need_minor" -gt "$guile_minor"); then
   AC_MSG_ERROR([Guile version >= $guile_need_version is required.])
 fi
 
diff --git a/utils/configure.ac b/utils/configure.ac
index 1b320fa..3383eaf 100644
--- a/utils/configure.ac
+++ b/utils/configure.ac
@@ -102,8 +102,9 @@ guile_major=`echo "$GUILE_VERSION" | sed 's/\([[^.]][[^.]]*\).*/\1/'`
 guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
 AC_MSG_RESULT($GUILE_VERSION)
 
-if test $guile_need_major -gt $guile_major \
-   || test $guile_need_minor -gt $guile_minor; then
+if test "$guile_need_major" -gt "$guile_major" \
+   || (test "$guile_need_major" -le "$guile_major" \
+       && test "$guile_need_minor" -gt "$guile_minor"); then
   AC_MSG_ERROR([Guile version >= $guile_need_version is required.])
 fi
 
-- 
1.5.3.3

Attachment: signature.asc
Description: This is a digitally signed message part.


_______________________________________________
geda-dev mailing list
[email protected]
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev

Reply via email to