From 1911e3da17638c31bd2fe638c9727f560fd1c1ec Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 17 Apr 2007 14:12:17 +0000
Subject: [PATCH] Changes from arch/CVS synchronization

---
 ChangeLog          |  5 +++++
 configure.in       |  2 +-
 libguile/ChangeLog |  5 +++++
 libguile/numbers.c | 10 +++++-----
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 020d576b4..73601b46c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-17  Ludovic Courtès  <ludovic.courtes@laas.fr>
+
+	* configure.in (GUILE_FOR_BUILD): Reverted to `$(preinstguile)'
+	instead of `$(top_builddir_absolute)/$(preinstguile)'.
+	
 2007-04-09  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
 	* configure.in (HAVE_CRYPT): check for cexp, clog, carg
diff --git a/configure.in b/configure.in
index b60f0a265..d0bb73be2 100644
--- a/configure.in
+++ b/configure.in
@@ -1234,7 +1234,7 @@ if test "$cross_compiling" = "yes"; then
   AC_MSG_CHECKING(guile for build)
   GUILE_FOR_BUILD="${GUILE_FOR_BUILD-guile}"
 else
-  GUILE_FOR_BUILD='$(top_builddir_absolute)/$(preinstguile)'
+  GUILE_FOR_BUILD='$(preinstguile)'
 fi   
 
 ## AC_MSG_CHECKING("if we are cross compiling")
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 6f5984f5d..9fd4d6295 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-17  Ludovic Courtès  <ludovic.courtes@laas.fr>
+
+	* numbers.c: Commented out trailing `HAVE_COMPLEX_DOUBLE' after
+	`#endif'.  Use `#ifndef HAVE_XXX' rather than `#if !HAVE_XXX'.
+
 2007-04-09  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
 	* numbers.c (carg): provide carg, cexp, clog in case they are
diff --git a/libguile/numbers.c b/libguile/numbers.c
index 4454a342c..522621b22 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -5997,8 +5997,8 @@ scm_is_number (SCM z)
   return scm_is_true (scm_number_p (z));
 }
 
-#if HAVE_COMPLEX_DOUBLE
-#if !HAVE_CLOG
+#ifdef HAVE_COMPLEX_DOUBLE
+#ifndef HAVE_CLOG
 complex double clog (complex double z);
 complex double
 clog (complex double z)
@@ -6007,7 +6007,7 @@ clog (complex double z)
 }
 #endif
 
-#if !HAVE_CEXP
+#ifndef HAVE_CEXP
 complex double cexp (complex double z);
 complex double
 cexp (complex double z)
@@ -6016,7 +6016,7 @@ cexp (complex double z)
 }
 #endif
 
-#if !HAVE_CARG
+#ifndef HAVE_CARG
 double carg (complex double z);
 double
 carg (complex double z)
@@ -6024,7 +6024,7 @@ carg (complex double z)
   return atan2 (cimag(z), creal(z));
 }
 #endif
-#endif HAVE_COMPLEX_DOUBLE
+#endif /* HAVE_COMPLEX_DOUBLE */
 
 
 /* In the following functions we dispatch to the real-arg funcs like log()
-- 
2.20.1