Reverted the master branch back to the state of v2.6.0.90, because I intend to

be much more thorough about what gets commited to the master and why.  This
will still be the branch where new work will be checked in, but only after
thorough review in a development branch.

NEWS

@@ -388,10 +388,6 @@
 - Did much internal restructuring to allow the use of libledger.so in
   non-command-line environments (such as GUI tools).
 
-* 2.4.1
-
-- Corrected an issue that had inadvertantly disabled Gnucash support.
-
 * 2.4
 
 - Both "-$100.00" and "$-100.00" are now equivalent amounts.

acprep

@@ -17,52 +17,31 @@ else
 fi
 autoconf
 
-HERE="$PWD"
+INCDIRS="-I/sw/include -I/sw/include/boost -I/usr/include/httpd/xml"
-
-if [ "$1" != "--local" ]; then
-    if [ -d "$HOME/Products" ]; then
-	projdir="$HOME/Products/$(basename $HERE)"
-	if [ ! -d "$projdir" ]; then
-	    mkdir -p "$projdir"
-	fi
-	cd "$projdir" || (echo "Cannot change to $projdir"; exit 1)
-    fi
-else
-    shift 1
-fi
-
-INCDIRS="-I/opt/local/include -I/usr/local/include -I/usr/include/httpd/xml"
 #INCDIRS="$INCDIRS -I/sw/include/libofx"
 INCDIRS="$INCDIRS -I/usr/include/python2.3"
 INCDIRS="$INCDIRS -Wno-long-double"
-LIBDIRS="-L/opt/local/lib -L/usr/local/lib"
+LIBDIRS="-L/sw/lib -L/usr/local/lib -L/usr/lib/python2.3/config"
 
 if [ "$1" = "--debug" ]; then
     shift 1
-    $HERE/configure CPPFLAGS="$INCDIRS" LDFLAGS="$LIBDIRS" CXXFLAGS="-g" \
+    ./configure CPPFLAGS="$INCDIRS" LDFLAGS="$LIBDIRS" CXXFLAGS="-g" \
 	--enable-debug --enable-python "$@"
 elif [ "$1" = "--opt" ]; then
     shift 1
-    $HERE/configure CPPFLAGS="$INCDIRS" LDFLAGS="$LIBDIRS" \
+    ./configure CPPFLAGS="$INCDIRS" LDFLAGS="$LIBDIRS" \
 	CXXFLAGS="-fomit-frame-pointer -O3 -mcpu=7450 -fPIC" "$@"
 elif [ "$1" = "--flat-opt" ]; then
     shift 1
-    $HERE/configure CPPFLAGS="$INCDIRS" LDFLAGS="$LIBDIRS" \
+    ./configure CPPFLAGS="$INCDIRS" LDFLAGS="$LIBDIRS" \
 	CXXFLAGS="-fomit-frame-pointer -O3 -mcpu=7450" "$@"
 elif [ "$1" = "--safe-opt" ]; then
     shift 1
-    $HERE/configure CPPFLAGS="$INCDIRS" LDFLAGS="$LIBDIRS" \
+    ./configure CPPFLAGS="$INCDIRS" LDFLAGS="$LIBDIRS" \
 	CXXFLAGS="-fomit-frame-pointer -O3 -mcpu=7450 -fPIC -DDEBUG_LEVEL=1" "$@"
 elif [ "$1" = "--perf" ]; then
     shift 1
-    $HERE/configure CPPFLAGS="$INCDIRS" LDFLAGS="$LIBDIRS" CXXFLAGS="-g -pg" "$@"
+    ./configure CPPFLAGS="$INCDIRS" LDFLAGS="$LIBDIRS" CXXFLAGS="-g -pg" "$@"
-elif [ "$1" = "--python" ]; then
-    shift 1
-    $HERE/configure CPPFLAGS="$INCDIRS" LDFLAGS="$LIBDIRS" CXXFLAGS="-g" \
-	--enable-python "$@"
-else
-    shift 1
-    $HERE/configure CPPFLAGS="$INCDIRS" LDFLAGS="$LIBDIRS" CXXFLAGS="-g" "$@"
 fi
 
-rm -f AUTHORS COPYING
+rm AUTHORS COPYING

ledger.texi

@@ -294,7 +294,7 @@ in the distribution), and that the contents of that file are:
   Equity:Opening Balances
 
 2004/05/01 * Investment balance
-  Assets:Brokerage              50 AAPL @@ $30.00
+  Assets:Brokerage              50 AAPL @ $30.00
   Equity:Opening Balances
 
 2004/05/14 * Pay day
@@ -2386,8 +2386,8 @@ The format of each following transaction is:
 The @samp{ACCOUNT} may be surrounded by parentheses if it is a virtual
 transactions, or square brackets if it is a virtual transactions that
 must balance.  The @samp{AMOUNT} can be followed by a per-unit
-transaction cost, by specifying @samp{@@ AMOUNT}, or a complete
+transaction cost, by specifying @samp{@ AMOUNT}, or a complete
-transaction cost with @samp{@@@@ AMOUNT}.  Lastly, the @samp{NOTE} may
+transaction cost with @samp{@@ AMOUNT}.  Lastly, the @samp{NOTE} may
 specify an actual and/or effective date for the transaction by using
 the syntax @samp{[ACTUAL_DATE]} or @samp{[=EFFECTIVE_DATE]} or
 @samp{[ACTUAL_DATE=EFFECtIVE_DATE]}.

option.cc

@@ -482,17 +482,17 @@ OPT_BEGIN(begin, "b:") {
 OPT_BEGIN(end, "e:") {
   char buf[128];
   interval_t interval(optarg);
-  if (! interval.begin)
+  if (! interval.end)
     throw new error(std::string("Could not determine end of period '") +
 		    optarg + "'");
 
   if (! report->predicate.empty())
     report->predicate += "&";
   report->predicate += "d<[";
-  report->predicate += interval.begin.to_string();
+  report->predicate += interval.end.to_string();
   report->predicate += "]";
 
-  terminus = interval.begin;
+  terminus = interval.end;
 } OPT_END(end);
 
 OPT_BEGIN(current, "c") {