merge robbs patches fro branch rlb-patch4

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@1422 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas 1998-12-01 09:02:47 +00:00
parent c558ded0ff
commit 84e28d568b
5 changed files with 53 additions and 17 deletions

14
configure vendored
View File

@ -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

View File

@ -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,

View File

@ -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*)

View File

@ -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))

View File

@ -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