[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

gEDA-dev: Guile 1.6 compat

To: gEDA developer mailing list <geda-dev-at-NOSPAMmoria_dot_seul_dot_org>
Subject: gEDA-dev: Guile 1.6 compat
From: Peter Clifton <pcjc2-at-NOSPAMcam_dot_ac_dot_uk>
Date: Tue, 31 Jul 2007 20:01:03 +0100
Delivery-Date: Tue, 31 Jul 2007 15:01:19 -0400
List-Archive: <http://www.seul.org/pipermail/geda-dev>
List-Help: <mailto:geda-dev-request@moria.seul.org?subject=help>
List-Id: gEDA developer mailing list <geda-dev.moria.seul.org>
List-Post: <mailto:geda-dev@moria.seul.org>
List-Subscribe: <http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev>,<mailto:geda-dev-request@moria.seul.org?subject=subscribe>
List-Unsubscribe: <http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev>,<mailto:geda-dev-request@moria.seul.org?subject=unsubscribe>
Reply-To: gEDA developer mailing list <geda-dev-at-NOSPAMmoria_dot_seul_dot_org>
Sender: geda-dev-bounces-at-NOSPAMmoria_dot_seul_dot_org

Ugly as this is, I think its useful...

 gattrib/configure.ac   |   45 +++++++++++++++++++++++++++++++++++++++++++++
 gnetlist/configure.ac  |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 gschem/configure.ac.in |   23 ++++++++++++++++++++++-
 gsymcheck/configure.ac |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 libgeda/configure.ac   |   23 ++++++++++++++++++++++-
 utils/configure.ac     |   46 ++++++++++++++++++++++++++++++++++++++++++++++

---
Changed configure.ac(.in) to allow guile-1.6
    
Introduces compatibility #defines where guile 1.8 funcs are missing in
guile 1.6. Also adds missing configure.ac checks for guile in packages
gattrib, gnetlist, gsymcheck and utils.

-- 
Peter Clifton

Electrical Engineering Division,
Engineering Department,
University of Cambridge,
9, JJ Thomson Avenue,
Cambridge
CB3 0FA

Tel: +44 (0)7729 980173 - (No signal in the lab!)

diff --git a/gattrib/configure.ac b/gattrib/configure.ac
index 18637a3..f77abe2 100644
--- a/gattrib/configure.ac
+++ b/gattrib/configure.ac
@@ -62,6 +62,51 @@ fi
 # Misc win32 / mingw checks and variables end
 #########################################################################
 
+############################################################################
+# Check for guile start
+GUILE_FLAGS
+
+# Check Guile version
+guile_need_major=1
+guile_need_minor=6
+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
+
+# Guile 1.6 compatability
+
+AC_CHECK_FUNC(scm_is_string,,
+  AC_DEFINE(scm_is_string(x),  (SCM_STRINGP(x)), [Compatability define for scm_is_string]))
+AC_CHECK_FUNC(scm_is_integer,,
+  AC_DEFINE(scm_is_integer(x), (SCM_INUMP(x)),   [Compatability define for scm_is_integer]))
+AC_CHECK_FUNC(scm_to_int,,
+  AC_DEFINE(scm_to_int(x),     (SCM_INUM(x)),    [Compatability define for scm_to_int]))
+AC_CHECK_FUNC(scm_from_int,,
+  AC_DEFINE(scm_from_int(x),   (SCM_MAKINUM(x)), [Compatability define for scm_from_int]))
+AC_CHECK_FUNC(scm_is_true,,
+  AC_DEFINE(scm_is_true(x),    (SCM_NFALSEP(x)), [Compatability define for scm_is_true]))
+AC_CHECK_FUNC(scm_is_false,,
+  AC_DEFINE(scm_is_false(x),   (SCM_FALSEP(x)),  [Compatability define for scm_is_false]))
+
+AC_CHECK_FUNC(scm_from_locale_string,,
+  AC_DEFINE(scm_from_locale_string(x), (scm_makfrom0str(x)), [Compatability define for scm_from_locale_string]))
+
+AC_CHECK_FUNC(scm_to_locale_string,,
+  AC_DEFINE(scm_to_locale_string(x), (strdup(SCM_STRING_CHARS(x))), [Compatability define for scm_to_locale_string]))
+
+#
+# Check for guile end
+############################################################################
 
 ############################################################################
 # Check for misc things. . . .
diff --git a/gnetlist/configure.ac b/gnetlist/configure.ac
index cbacb3c..2f3ce68 100644
--- a/gnetlist/configure.ac
+++ b/gnetlist/configure.ac
@@ -140,6 +140,53 @@ fi
 # Misc win32 / mingw checks and variables end
 #########################################################################
 
+
+############################################################################
+# Check for guile start
+GUILE_FLAGS
+
+# Check Guile version
+guile_need_major=1
+guile_need_minor=6
+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
+
+# Guile 1.6 compatability
+
+AC_CHECK_FUNC(scm_is_string,,
+  AC_DEFINE(scm_is_string(x),  (SCM_STRINGP(x)), [Compatability define for scm_is_string]))
+AC_CHECK_FUNC(scm_is_integer,,
+  AC_DEFINE(scm_is_integer(x), (SCM_INUMP(x)),   [Compatability define for scm_is_integer]))
+AC_CHECK_FUNC(scm_to_int,,
+  AC_DEFINE(scm_to_int(x),     (SCM_INUM(x)),    [Compatability define for scm_to_int]))
+AC_CHECK_FUNC(scm_from_int,,
+  AC_DEFINE(scm_from_int(x),   (SCM_MAKINUM(x)), [Compatability define for scm_from_int]))
+AC_CHECK_FUNC(scm_is_true,,
+  AC_DEFINE(scm_is_true(x),    (SCM_NFALSEP(x)), [Compatability define for scm_is_true]))
+AC_CHECK_FUNC(scm_is_false,,
+  AC_DEFINE(scm_is_false(x),   (SCM_FALSEP(x)),  [Compatability define for scm_is_false]))
+
+AC_CHECK_FUNC(scm_from_locale_string,,
+  AC_DEFINE(scm_from_locale_string(x), (scm_makfrom0str(x)), [Compatability define for scm_from_locale_string]))
+
+AC_CHECK_FUNC(scm_to_locale_string,,
+  AC_DEFINE(scm_to_locale_string(x), (strdup(SCM_STRING_CHARS(x))), [Compatability define for scm_to_locale_string]))
+
+#
+# Check for guile end
+############################################################################
+
 ############################################################################
 # Check for mics things start
 # 
diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
index 4cca3c9..9cbe613 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -71,7 +71,7 @@ GUILE_FLAGS
 
 # Check Guile version
 guile_need_major=1
-guile_need_minor=8
+guile_need_minor=6
 guile_need_version="$guile_need_major[].$guile_need_minor.0"
 
 AC_MSG_CHECKING([Guile version >= $guile_need_version])
@@ -86,6 +86,27 @@ if test $guile_need_major -gt $guile_major \
   AC_MSG_ERROR([Guile version >= $guile_need_version is required.])
 fi
 
+# Guile 1.6 compatability
+
+AC_CHECK_FUNC(scm_is_string,,
+  AC_DEFINE(scm_is_string(x),  (SCM_STRINGP(x)), [Compatability define for scm_is_string]))
+AC_CHECK_FUNC(scm_is_integer,,
+  AC_DEFINE(scm_is_integer(x), (SCM_INUMP(x)),   [Compatability define for scm_is_integer]))
+AC_CHECK_FUNC(scm_to_int,,
+  AC_DEFINE(scm_to_int(x),     (SCM_INUM(x)),    [Compatability define for scm_to_int]))
+AC_CHECK_FUNC(scm_from_int,,
+  AC_DEFINE(scm_from_int(x),   (SCM_MAKINUM(x)), [Compatability define for scm_from_int]))
+AC_CHECK_FUNC(scm_is_true,,
+  AC_DEFINE(scm_is_true(x),    (SCM_NFALSEP(x)), [Compatability define for scm_is_true]))
+AC_CHECK_FUNC(scm_is_false,,
+  AC_DEFINE(scm_is_false(x),   (SCM_FALSEP(x)),  [Compatability define for scm_is_false]))
+
+AC_CHECK_FUNC(scm_from_locale_string,,
+  AC_DEFINE(scm_from_locale_string(x), (scm_makfrom0str(x)), [Compatability define for scm_from_locale_string]))
+
+AC_CHECK_FUNC(scm_to_locale_string,,
+  AC_DEFINE(scm_to_locale_string(x), (strdup(SCM_STRING_CHARS(x))), [Compatability define for scm_to_locale_string]))
+
 #
 # Check for guile end
 ############################################################################
diff --git a/gsymcheck/configure.ac b/gsymcheck/configure.ac
index 121793b..99cb81d 100644
--- a/gsymcheck/configure.ac
+++ b/gsymcheck/configure.ac
@@ -54,6 +54,52 @@ fi
 #########################################################################
 
 ############################################################################
+# Check for guile start
+GUILE_FLAGS
+
+# Check Guile version
+guile_need_major=1
+guile_need_minor=6
+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
+
+# Guile 1.6 compatability
+
+AC_CHECK_FUNC(scm_is_string,,
+  AC_DEFINE(scm_is_string(x),  (SCM_STRINGP(x)), [Compatability define for scm_is_string]))
+AC_CHECK_FUNC(scm_is_integer,,
+  AC_DEFINE(scm_is_integer(x), (SCM_INUMP(x)),   [Compatability define for scm_is_integer]))
+AC_CHECK_FUNC(scm_to_int,,
+  AC_DEFINE(scm_to_int(x),     (SCM_INUM(x)),    [Compatability define for scm_to_int]))
+AC_CHECK_FUNC(scm_from_int,,
+  AC_DEFINE(scm_from_int(x),   (SCM_MAKINUM(x)), [Compatability define for scm_from_int]))
+AC_CHECK_FUNC(scm_is_true,,
+  AC_DEFINE(scm_is_true(x),    (SCM_NFALSEP(x)), [Compatability define for scm_is_true]))
+AC_CHECK_FUNC(scm_is_false,,
+  AC_DEFINE(scm_is_false(x),   (SCM_FALSEP(x)),  [Compatability define for scm_is_false]))
+
+AC_CHECK_FUNC(scm_from_locale_string,,
+  AC_DEFINE(scm_from_locale_string(x), (scm_makfrom0str(x)), [Compatability define for scm_from_locale_string]))
+
+AC_CHECK_FUNC(scm_to_locale_string,,
+  AC_DEFINE(scm_to_locale_string(x), (strdup(SCM_STRING_CHARS(x))), [Compatability define for scm_to_locale_string]))
+
+#
+# Check for guile end
+############################################################################
+
+############################################################################
 # Check for mics things start
 # 
 # Checking for rint in math library
diff --git a/libgeda/configure.ac b/libgeda/configure.ac
index 663d791..3814852 100644
--- a/libgeda/configure.ac
+++ b/libgeda/configure.ac
@@ -69,7 +69,7 @@ GUILE_FLAGS
 
 # Check Guile version
 guile_need_major=1
-guile_need_minor=8
+guile_need_minor=6
 guile_need_version="$guile_need_major[].$guile_need_minor.0"
 
 AC_MSG_CHECKING([Guile version >= $guile_need_version])
@@ -84,6 +84,27 @@ if test $guile_need_major -gt $guile_major \
   AC_MSG_ERROR([Guile version >= $guile_need_version is required.])
 fi
 
+# Guile 1.6 compatability
+
+AC_CHECK_FUNC(scm_is_string,,
+  AC_DEFINE(scm_is_string(x),  (SCM_STRINGP(x)), [Compatability define for scm_is_string]))
+AC_CHECK_FUNC(scm_is_integer,,
+  AC_DEFINE(scm_is_integer(x), (SCM_INUMP(x)),   [Compatability define for scm_is_integer]))
+AC_CHECK_FUNC(scm_to_int,,
+  AC_DEFINE(scm_to_int(x),     (SCM_INUM(x)),    [Compatability define for scm_to_int]))
+AC_CHECK_FUNC(scm_from_int,,
+  AC_DEFINE(scm_from_int(x),   (SCM_MAKINUM(x)), [Compatability define for scm_from_int]))
+AC_CHECK_FUNC(scm_is_true,,
+  AC_DEFINE(scm_is_true(x),    (SCM_NFALSEP(x)), [Compatability define for scm_is_true]))
+AC_CHECK_FUNC(scm_is_false,,
+  AC_DEFINE(scm_is_false(x),   (SCM_FALSEP(x)),  [Compatability define for scm_is_false]))
+
+AC_CHECK_FUNC(scm_from_locale_string,,
+  AC_DEFINE(scm_from_locale_string(x), (scm_makfrom0str(x)), [Compatability define for scm_from_locale_string]))
+
+AC_CHECK_FUNC(scm_to_locale_string,,
+  AC_DEFINE(scm_to_locale_string(x), (strdup(SCM_STRING_CHARS(x))), [Compatability define for scm_to_locale_string]))
+
 #
 # Check for guile end
 ############################################################################
diff --git a/utils/configure.ac b/utils/configure.ac
index b5403be..2a39e59 100644
--- a/utils/configure.ac
+++ b/utils/configure.ac
@@ -93,6 +93,52 @@ fi
 #########################################################################
 
 ############################################################################
+# Check for guile start
+GUILE_FLAGS
+
+# Check Guile version
+guile_need_major=1
+guile_need_minor=6
+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
+
+# Guile 1.6 compatability
+
+AC_CHECK_FUNC(scm_is_string,,
+  AC_DEFINE(scm_is_string(x),  (SCM_STRINGP(x)), [Compatability define for scm_is_string]))
+AC_CHECK_FUNC(scm_is_integer,,
+  AC_DEFINE(scm_is_integer(x), (SCM_INUMP(x)),   [Compatability define for scm_is_integer]))
+AC_CHECK_FUNC(scm_to_int,,
+  AC_DEFINE(scm_to_int(x),     (SCM_INUM(x)),    [Compatability define for scm_to_int]))
+AC_CHECK_FUNC(scm_from_int,,
+  AC_DEFINE(scm_from_int(x),   (SCM_MAKINUM(x)), [Compatability define for scm_from_int]))
+AC_CHECK_FUNC(scm_is_true,,
+  AC_DEFINE(scm_is_true(x),    (SCM_NFALSEP(x)), [Compatability define for scm_is_true]))
+AC_CHECK_FUNC(scm_is_false,,
+  AC_DEFINE(scm_is_false(x),   (SCM_FALSEP(x)),  [Compatability define for scm_is_false]))
+
+AC_CHECK_FUNC(scm_from_locale_string,,
+  AC_DEFINE(scm_from_locale_string(x), (scm_makfrom0str(x)), [Compatability define for scm_from_locale_string]))
+
+AC_CHECK_FUNC(scm_to_locale_string,,
+  AC_DEFINE(scm_to_locale_string(x), (strdup(SCM_STRING_CHARS(x))), [Compatability define for scm_to_locale_string]))
+
+#
+# Check for guile end
+############################################################################
+
+############################################################################
 # Check for mics things start
 # 
 # Checking for rint in math library



_______________________________________________
geda-dev mailing list
geda-dev@moria.seul.org
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev

Follow-Ups:
- Re: gEDA-dev: Guile 1.6 compat
  - From: Ales Hvezda

Prev by Date: Re: gEDA-dev: Fix drawing artifacts in gschem when dragging grips
Next by Date: Re: gEDA-dev: Fix drawing artifacts in gschem when dragging grips
Prev by thread: Re: gEDA-dev: Fix drawing artifacts in gschem when dragging grips
Next by thread: Re: gEDA-dev: Guile 1.6 compat
Index(es):
- Date
- Thread