From 84e28d568bc4e7f16bd67f64b66c82fd68746d93 Mon Sep 17 00:00:00 2001
From: Linas Vepstas <linas@linas.org>
Date: Tue, 1 Dec 1998 09:02:47 +0000
Subject: [PATCH] merge robbs patches fro branch rlb-patch4

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@1422 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 configure                 | 14 +++++++-------
 configure.in              | 10 +++++-----
 src/scm/startup/main.scm  |  2 +-
 src/scm/startup/path.scm  |  6 +++---
 src/scm/startup/prefs.scm | 38 +++++++++++++++++++++++++++++++++++++-
 5 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/configure b/configure
index 0b7b34d69d..dd8a070cfa 100755
--- a/configure
+++ b/configure
@@ -14,7 +14,7 @@ ac_default_prefix=/usr/local
 ac_help="$ac_help
   --with-x                use the X Window System"
 ac_help="$ac_help
-  --with-gtk-config=executable  which gtk-config to use to find gtk "
+  --with-gnome-config=executable  which gnome-config to use to find gnome "
 ac_help="$ac_help
   --with-imlib=PATH       specify where to look for imlib includes and libs"
 ac_help="$ac_help
@@ -1885,11 +1885,11 @@ fi
 X_LIBS="$X_LIBS -lXext -lXmu -lXt -lX11"
 MOTIF_LIBS="-lXm"
 
-# Let the user specify gtk paths:
-# Check whether --with-gtk-config or --without-gtk-config was given.
-if test "${with_gtk_config+set}" = set; then
-  withval="$with_gtk_config"
-  GTK_CONFIG_BIN="$with_gtk/bin/"
+# Let the user specify gnome paths:
+# Check whether --with-gnome-config or --without-gnome-config was given.
+if test "${with_gnome_config+set}" = set; then
+  withval="$with_gnome_config"
+  GNOME_CONFIG_BIN="$with_gnome/bin/"
 fi
 
 
@@ -2723,7 +2723,7 @@ s%@X_CFLAGS@%$X_CFLAGS%g
 s%@X_PRE_LIBS@%$X_PRE_LIBS%g
 s%@X_LIBS@%$X_LIBS%g
 s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
-s%@GTK_CONFIG_BIN@%$GTK_CONFIG_BIN%g
+s%@GNOME_CONFIG_BIN@%$GNOME_CONFIG_BIN%g
 s%@OPT_STYLE_INSTALL@%$OPT_STYLE_INSTALL%g
 s%@XMHTML_TARGET@%$XMHTML_TARGET%g
 s%@XMHTML_INC@%$XMHTML_INC%g
diff --git a/configure.in b/configure.in
index 8616a0c04c..028388e1fa 100644
--- a/configure.in
+++ b/configure.in
@@ -31,11 +31,11 @@ AC_PATH_XTRA
 X_LIBS="$X_LIBS -lXext -lXmu -lXt -lX11"
 MOTIF_LIBS="-lXm"
 
-# Let the user specify gtk paths:
-AC_ARG_WITH( gtk-config, 
-  [  --with-gtk-config=executable  which gtk-config to use to find gtk ],
-  GTK_CONFIG_BIN="$with_gtk/bin/")
-AC_SUBST(GTK_CONFIG_BIN)
+# Let the user specify gnome paths:
+AC_ARG_WITH( gnome-config, 
+  [  --with-gnome-config=executable  which gnome-config to use to find gnome ],
+  GNOME_CONFIG_BIN="$with_gnome/bin/")
+AC_SUBST(GNOME_CONFIG_BIN)
 
 # Let the user specify imlib paths:
 AC_ARG_WITH( imlib, 
diff --git a/src/scm/startup/main.scm b/src/scm/startup/main.scm
index 246363b43b..6ddfc0942b 100644
--- a/src/scm/startup/main.scm
+++ b/src/scm/startup/main.scm
@@ -16,7 +16,7 @@
   
   (if (not (gnc:load-user-config-if-needed))
       (gnc:shutdown 1))
-  
+
   (gnc:hook-run-danglers gnc:*startup-hook*)
   
   (if (or (gnc:config-var-value-get gnc:*arg-show-usage*)
diff --git a/src/scm/startup/path.scm b/src/scm/startup/path.scm
index cfc2219ffe..a8c21b73ba 100644
--- a/src/scm/startup/path.scm
+++ b/src/scm/startup/path.scm
@@ -81,10 +81,10 @@ file in all of the directories specified by gnc:*load-path*."
               (gnc:warn "failure loading " file-name)
               #f)))))
 
-(define (gnc:load-user-config-if-needed)
+(define gnc:load-user-config-if-needed
   (let ((user-config-loaded? #f))
     (lambda ()
-      (if (not user-config-loaded)
+      (if (not user-config-loaded?)
           (begin
             (gnc:debug "loading user configuration")
             
@@ -95,7 +95,7 @@ file in all of the directories specified by gnc:*load-path*."
               
               (if (access? user-file F_OK)
                   (if (false-if-exception (primitive-load user-file))
-                      (set! gnc:user-config-loaded #t)
+                      (set! user-config-loaded? #t)
                       (begin
                         (gnc:warn "failure loading " user-file)
                         #f))
diff --git a/src/scm/startup/prefs.scm b/src/scm/startup/prefs.scm
index 35cb1bde40..7929a21165 100644
--- a/src/scm/startup/prefs.scm
+++ b/src/scm/startup/prefs.scm
@@ -1,6 +1,42 @@
 
 
-;;;; Preferences
+;;;; Preferences...
+
+;; (define gnc:*double-entry-restriction*
+;;   (gnc:make-config-var
+;;    "Determines how the splits in a transaction will be balanced. 
+;;  The following values have significance:
+;; 
+;;    #f        anything goes
+;; 
+;;    'force    The sum of all splits in a transaction will be
+;;              forced to be zero, even if this requires the
+;;              creation of additional splits.  Note that a split
+;;              whose value is zero (e.g. a stock price) can exist
+;;              by itself. Otherwise, all splits must come in at 
+;;              least pairs.
+;; 
+;;    'collect  splits without parents will be forced into a
+;;              lost & found account.  (Not implemented)"
+;;    (lambda (var value)
+;;      (cond
+;;       ((eq? value #f)
+;;        (_gnc_set_force_double_entry_ 0)
+;;        (list value))
+;;       ((eq? value 'force)
+;;        (_gnc_set_force_double_entry_ 1)
+;;        (list value))
+;;       ((eq? value 'collect)
+;;        (gnc:warn
+;;         "gnc:*double-entry-restriction* -- 'collect not supported yet.  "
+;;         "Ignoring.")
+;;        #f)
+;;       (else
+;;        (gnc:warn
+;;         "gnc:*double-entry-restriction* -- " value " not supported.  Ignoring.")
+;;        #f)))
+;;    eq?
+;;    #f))
 
 (define gnc:*arg-show-usage*
   (gnc:make-config-var