[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.3.0-20071229-6-g5f3cde4)
The branch, master has been updated
via 5f3cde4f20975275cb38b52cd3155fda41201209 (commit)
from b9ffb4675fbca6e92a4f713c28486e74dcbbeef4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gattrib/configure.ac | 2 +-
gnetlist/configure.ac | 2 +-
gschem/configure.ac.in | 5 +++--
gsymcheck/configure.ac | 2 +-
libgeda/configure.ac | 2 +-
utils/configure.ac | 2 +-
6 files changed, 8 insertions(+), 7 deletions(-)
=================
Commit Messages
=================
commit 5f3cde4f20975275cb38b52cd3155fda41201209
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Tue Jan 1 17:24:18 2008 +0000
Fix configure checks for Guile (again).
The previous patch missed changing the gschem configure script
(generated from configure.ac.in), and got the logic wrong anyway.
:100644 100644 dfd9636... 83e7ee1... M gattrib/configure.ac
:100644 100644 c1d9535... eb193e6... M gnetlist/configure.ac
:100644 100644 3e163ef... 43de51d... M gschem/configure.ac.in
:100644 100644 3575c95... ce99946... M gsymcheck/configure.ac
:100644 100644 268bb35... 7f186d4... M libgeda/configure.ac
:100644 100644 3383eaf... 7ba2773... M utils/configure.ac
=========
Changes
=========
commit 5f3cde4f20975275cb38b52cd3155fda41201209
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date: Tue Jan 1 17:24:18 2008 +0000
Fix configure checks for Guile (again).
The previous patch missed changing the gschem configure script
(generated from configure.ac.in), and got the logic wrong anyway.
diff --git a/gattrib/configure.ac b/gattrib/configure.ac
index dfd9636..83e7ee1 100644
--- a/gattrib/configure.ac
+++ b/gattrib/configure.ac
@@ -112,7 +112,7 @@ guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1
AC_MSG_RESULT($GUILE_VERSION)
if test "$guile_need_major" -gt "$guile_major" \
- || (test "$guile_need_major" -le "$guile_major" \
+ || (test "$guile_need_major" -eq "$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 c1d9535..eb193e6 100644
--- a/gnetlist/configure.ac
+++ b/gnetlist/configure.ac
@@ -154,7 +154,7 @@ guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1
AC_MSG_RESULT($GUILE_VERSION)
if test "$guile_need_major" -gt "$guile_major" \
- || (test "$guile_need_major" -le "$guile_major" \
+ || (test "$guile_need_major" -eq "$guile_major" \
&& test "$guile_need_minor" -gt "$guile_minor"); then
AC_MSG_ERROR([Guile version >= $guile_need_version is required.])
fi
diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
index 3e163ef..43de51d 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -104,8 +104,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" -eq "$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 3575c95..ce99946 100644
--- a/gsymcheck/configure.ac
+++ b/gsymcheck/configure.ac
@@ -66,7 +66,7 @@ guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1
AC_MSG_RESULT($GUILE_VERSION)
if test "$guile_need_major" -gt "$guile_major" \
- || (test "$guile_need_major" -le "$guile_major" \
+ || (test "$guile_need_major" -eq "$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 268bb35..7f186d4 100644
--- a/libgeda/configure.ac
+++ b/libgeda/configure.ac
@@ -107,7 +107,7 @@ guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1
AC_MSG_RESULT($GUILE_VERSION)
if test "$guile_need_major" -gt "$guile_major" \
- || (test "$guile_need_major" -le "$guile_major" \
+ || (test "$guile_need_major" -eq "$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 3383eaf..7ba2773 100644
--- a/utils/configure.ac
+++ b/utils/configure.ac
@@ -103,7 +103,7 @@ guile_minor=`echo "$GUILE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1
AC_MSG_RESULT($GUILE_VERSION)
if test "$guile_need_major" -gt "$guile_major" \
- || (test "$guile_need_major" -le "$guile_major" \
+ || (test "$guile_need_major" -eq "$guile_major" \
&& test "$guile_need_minor" -gt "$guile_minor"); then
AC_MSG_ERROR([Guile version >= $guile_need_version is required.])
fi
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs