[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: ChangeLog
User: peterb
Date: 07/06/02 12:33:34
Modified: . ChangeLog configure.ac.in
Log:
Improve Guile configure checks & remove 1.4 compat. code.
Removes compatibility code for Guile 1.4, and makes configure scripts
check for actual Guile version.
Revision Changes Path
1.689 eda/geda/gaf/gschem/ChangeLog
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangeLog
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/ChangeLog,v
retrieving revision 1.688
retrieving revision 1.689
diff -u -b -r1.688 -r1.689
--- ChangeLog 2 Jun 2007 01:02:42 -0000 1.688
+++ ChangeLog 2 Jun 2007 16:33:34 -0000 1.689
@@ -1,3 +1,9 @@
+2007-06-02 Peter Brett <peter@xxxxxxxxxxxxx>
+
+ * configure.ac: Improve Guile configure checks.
+
+ Makes configure scripts check for actual Guile version.
+
2007-06-01 Ales Hvezda <ahvezda@xxxxxxxxxxxxx>
* src/i_callbacks.c: Fixed a behavior where you would cancel
1.12 eda/geda/gaf/gschem/configure.ac.in
(In the diff below, changes in quantity of whitespace are not shown.)
Index: configure.ac.in
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gschem/configure.ac.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- configure.ac.in 30 May 2007 04:11:07 -0000 1.11
+++ configure.ac.in 2 Jun 2007 16:33:34 -0000 1.12
@@ -1,4 +1,4 @@
-# $Id: configure.ac.in,v 1.11 2007-05-30 04:11:07 danmc Exp $
+# $Id: configure.ac.in,v 1.12 2007-06-02 16:33:34 peterb Exp $
#
# Process this file with autoconf to produce a configure script.
AC_INIT
@@ -77,21 +77,25 @@
############################################################################
# Check for guile start
-# Do a very basic guile test, as the bulk of the flags will come from
-# libgeda.pc
-
GUILE_FLAGS
-# Manually search for guile-config. This is provided by GUILE_PROGS, but
-# guile-1.4 does not have GUILE_PROGS, so we have to do it manually.
-AC_PATH_PROG(GUILE_CONFIG,guile-config)
-if test "$GUILE_CONFIG" = "" ; then
- AC_MSG_ERROR([guile-config required but not found])
-fi
-AC_SUBST(GUILE_CONFIG)
+# Check Guile version
+guile_need_major=1
+guile_need_minor=8
+guile_need_version="$guile_need_major[].$guile_need_minor.0"
+AC_MSG_CHECKING([Guile version >= $guile_need_version])
GUILE_VERSION=`$GUILE_CONFIG info guileversion`
+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
+ AC_MSG_ERROR([Guile version >= $guile_need_version is required.])
+fi
+
#
# Check for guile end
############################################################################
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs