r14519 - gnucash/branches/2.0 - check for (g-wrap) module (#347680)

[Derek Atkins]

Author: warlord
Date: 2006-07-16 12:40:28 -0400 (Sun, 16 Jul 2006)
New Revision: 14519
Trac: http://svn.gnucash.org/trac/changeset/14519

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/configure.in
Log:
check for (g-wrap) module (#347680)
Apparently some distributions ship g-wrap-config separately
from the g-wrap.scm guile module.

(also add a bunch of ChangeLog entries for backported fixes)



Property changes on: gnucash/branches/2.0
___________________________________________________________________
Name: svk:merge
   - d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:12860
   + d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:12874

Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog	2006-07-16 16:17:58 UTC (rev 14518)
+++ gnucash/branches/2.0/ChangeLog	2006-07-16 16:40:28 UTC (rev 14519)
@@ -1,3 +1,10 @@
+2006-07-16  Derek Atkins  <derek at ihtfp.com>
+
+	* configure.in:
+	  check for (g-wrap) module (#347680)
+	  Apparently some distributions ship g-wrap-config separately
+	  from the g-wrap.scm guile module.
+
 2006-07-15  Christian Stimming  <stimming at tuhh.de>
 
 	* src/import-export/hbci/druid-hbci-initial.c: Remove obsolete
@@ -3,16 +10,24 @@
 	buttons for aqbanking/hbci setup that are unneeded. Fix crash due
 	to dangling points by deleting all pointers after calling
-	AB_Banking_Fini.
+	AB_Banking_Fini. (#347595)
 
 2006-07-14  Derek Atkins  <derek at ihtfp.com>
 
 	* configure.in:
-	  check for (g-wrap gw-glib-spec) instead of (g-wrap) #347404.
+	  check for (g-wrap gw-glib-spec). Bomb out if not found. #347404.
 
+	* configure.in:
+	  Pull down one change from r14497 to fix a broken test (#347607).
+
 2006-07-14  Andreas Köhler  <andi5.py at gmx.net>
 
 	* src/gnome/schemas/Makefile.am: Add
 	  apps_gnucash_scheduled_transctions.schemas.in. Fixes #340641.
 
+2006-07-13  Chris Shoemaker <chris.shoemaker at cox.net>
+
+	* Fix off-by-one bug that strips all spaces from imported strings.
+	  (#347472)
+
 2006-07-12  Derek Atkins  <derek at ihtfp.com>
 
@@ -24,6 +39,9 @@
 	  This patch returns to the old behavior (but uses the new
 	  function structure).
 
+	* Handle the case of a user who has svk but hasn't configured it.
+	  (#347403).
+
 2006-07-09  Chris Lyttle  <chris at wilddev.net>
 
 	* NEWS: Added some text about the release.

Modified: gnucash/branches/2.0/configure.in
===================================================================
--- gnucash/branches/2.0/configure.in	2006-07-16 16:17:58 UTC (rev 14518)
+++ gnucash/branches/2.0/configure.in	2006-07-16 16:40:28 UTC (rev 14519)
@@ -313,6 +313,22 @@
 
 AS_SCRUB_INCLUDE(CFLAGS)
 
+AC_MSG_CHECKING([for (g-wrap) guile module])
+if LD_LIBRARY_PATH=$G_WRAP_LIB_DIR:$LD_LIBRARY_PATH \
+  GUILE_LOAD_PATH=$G_WRAP_MODULE_DIR \
+        ${GUILE} -c "(use-modules (g-wrap))" > /dev/null 2>&1
+then
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_ERROR([
+
+   Cannot find the (g-wrap) guile module.
+   Are you sure you have g-wrap compile-time environment installed?
+   See http://bugzilla.gnome.org/show_bug.cgi?id=347680
+
+])
+fi
+
 AC_MSG_CHECKING([for (g-wrap gw-glib-spec) guile module])
 if LD_LIBRARY_PATH=$G_WRAP_LIB_DIR:$LD_LIBRARY_PATH \
   GUILE_LOAD_PATH=$G_WRAP_MODULE_DIR \
@@ -324,6 +340,7 @@
 
    Cannot find the (g-wrap gw-glib-spec) guile module.
    Are you sure you have g-wrap installed with glib support?
+   See http://bugzilla.gnome.org/show_bug.cgi?id=347404
 
 ])
 fi