summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2005-10-19 23:35:37 +0000
committerJohn Wiegley <johnw@newartisans.com>2008-04-13 02:41:19 -0400
commit56bf4ea27cf05c2b6fb872d61daf5e450fe2cda1 (patch)
tree7c659f18c29d384bd3e84be7254e8fb85c9e093b
parent2a82e904e9b48d56cc6f578c13885bbd70361fc6 (diff)
downloadfork-ledger-56bf4ea27cf05c2b6fb872d61daf5e450fe2cda1.tar.gz
fork-ledger-56bf4ea27cf05c2b6fb872d61daf5e450fe2cda1.tar.bz2
fork-ledger-56bf4ea27cf05c2b6fb872d61daf5e450fe2cda1.zip
(parse_and_report): Added a check for HAVE_EXPAT in addition to
HAVE_XMLPARSE, which was causing the xml/gnucash parsers not to be registered!
-rw-r--r--main.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/main.cc b/main.cc
index ddd1b4cd..cec321e8 100644
--- a/main.cc
+++ b/main.cc
@@ -314,7 +314,7 @@ int parse_and_report(int argc, char * argv[], char * envp[])
// Parse initialization files, ledger data, price database, etc.
std::auto_ptr<binary_parser_t> bin_parser(new binary_parser_t);
-#ifdef HAVE_XMLPARSE
+#if defined(HAVE_EXPAT) || defined(HAVE_XMLPARSE)
std::auto_ptr<xml_parser_t> xml_parser(new xml_parser_t);
std::auto_ptr<gnucash_parser_t> gnucash_parser(new gnucash_parser_t);
#endif
@@ -325,7 +325,7 @@ int parse_and_report(int argc, char * argv[], char * envp[])
std::auto_ptr<textual_parser_t> text_parser(new textual_parser_t);
register_parser(bin_parser.get());
-#ifdef HAVE_XMLPARSE
+#if defined(HAVE_EXPAT) || defined(HAVE_XMLPARSE)
register_parser(xml_parser.get());
register_parser(gnucash_parser.get());
#endif
@@ -336,7 +336,7 @@ int parse_and_report(int argc, char * argv[], char * envp[])
register_parser(text_parser.get());
parse_ledger_data(journal.get(), bin_parser.get(), text_parser.get()
-#ifdef HAVE_XMLPARSE
+#if defined(HAVE_EXPAT) || defined(HAVE_XMLPARSE)
, xml_parser.get()
#endif
);