[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:35
Modified: . ChangeLog configure.ac
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.408 eda/geda/gaf/libgeda/ChangeLog
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangeLog
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/ChangeLog,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -b -r1.407 -r1.408
--- ChangeLog 28 May 2007 21:24:19 -0000 1.407
+++ ChangeLog 2 Jun 2007 16:33:34 -0000 1.408
@@ -1,3 +1,11 @@
+2007-06-02 Peter Brett <peter@xxxxxxxxxxxxx>
+
+ * configure.ac, src/g_basic.c: 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.
+
2007-05-28 Peter Brett <peter@xxxxxxxxxxxxx>
* configure.ac: Require Guile 1.8.x
1.46 eda/geda/gaf/libgeda/configure.ac
(In the diff below, changes in quantity of whitespace are not shown.)
Index: configure.ac
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/libgeda/configure.ac,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- configure.ac 28 May 2007 21:24:19 -0000 1.45
+++ configure.ac 2 Jun 2007 16:33:35 -0000 1.46
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.45 2007-05-28 21:24:19 peterb Exp $
+# $Id: configure.ac,v 1.46 2007-06-02 16:33:35 peterb Exp $
#
# Process this file with autoconf to produce a configure script.
AC_INIT
@@ -75,42 +75,23 @@
#
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)
-
-# must have guile flags in CFLAGS for AC_COMPILE_IFELSE to work right
-saved_CFLAGS="${CFLAGS}"
-CFLAGS="${CFLAGS} ${GUILE_CFLAGS}"
-
-# 1-argument scm_eval_x (guile-1.4) or 2-argument form (guile-1.6)?
-AC_MSG_CHECKING(
- [if scm_eval_x() takes a second module argument])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libguile.h>]],
- [[SCM foo,bar; scm_eval_x(foo,bar);]])],
- [AC_DEFINE([HAVE_SCM_EVAL_X_MODULE], 1,
- [Define if the SCM_EVAL_X function takes a second argument "module"])
- AC_MSG_RESULT(yes) ], [AC_MSG_RESULT(no)])
-CFLAGS="${saved_CFLAGS}"
-
-# Check some Guile functions are available
-AC_CHECK_LIB(guile, scm_init_guile)
-
-AC_CHECK_FUNCS([scm_make_smob_type scm_set_smob_mark scm_set_smob_free scm_set_smob_print],,
- [AC_MSG_ERROR([Upgrade Guile, at least version >= 1.8.0])])
-
-AC_CHECK_FUNCS([scm_from_locale_string],,
- [AC_MSG_ERROR([Upgrade Guile, at least version >= 1.8.0])])
-
-# Restore LIBS. Apparently AC_CHECK_LIB destroys it.
-LIBS="$ac_save_LIBS"
+# 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