* README.cvs: make it even more explicit that you should not run configure

* src/engine/Makefile.am: remove the circular dependency I added earlier
	* src/engine/gw-engine-spec.scm: don't include gnc-engine-util.h (it's
	  not required and may break things).
	* src/engine/gnc-trace.[ch]: move gnc_should_log() out of the .h
	  and into the .c (making it a function instead of an array) due
	  to symbol problems with libgw-engine.  With it the other way the
	  test-account-create test was throwing an error about an
	  undefined symbol (gnc_log_modules).
	  NOTE: If you don't like this de-optimization then feel free to remove
	  all the P*() calls from engine-helpers.c and then revert gnc-trace.
	  Or you can find another way around the undefined symbol problem.
	* src/doc/Makefile.am: include guid.txt in the dist


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@9757 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins 2004-01-07 00:09:58 +00:00
parent 4187aed0ee
commit e857be8e33
7 changed files with 37 additions and 7 deletions

View File

@ -1,4 +1,20 @@
2003-01-02 Derek Atkins <derek@ihtfp.com>
2004-01-06 Derek Atkins <derek@ihtfp.com>
* README.cvs: make it even more explicit that you should not run configure
* src/engine/Makefile.am: remove the circular dependency I added earlier
* src/engine/gw-engine-spec.scm: don't include gnc-engine-util.h (it's
not required and may break things).
* src/engine/gnc-trace.[ch]: move gnc_should_log() out of the .h
and into the .c (making it a function instead of an array) due
to symbol problems with libgw-engine. With it the other way the
test-account-create test was throwing an error about an
undefined symbol (gnc_log_modules).
NOTE: If you don't like this de-optimization then feel free to remove
all the P*() calls from engine-helpers.c and then revert gnc-trace.
Or you can find another way around the undefined symbol problem.
* src/doc/Makefile.am: include guid.txt in the dist
2004-01-02 Derek Atkins <derek@ihtfp.com>
* README.patches:
* make-gnucash-patch.in:

View File

@ -13,7 +13,8 @@ Owen Taylor.
Autogen will automatically generate the configure script and then
run it WITH SPECIAL ARGUMENTS to make sure certain files get built.
If you run "configure" without these special arguments, it is very likely
that GnuCash will fail to build.
that GnuCash will fail to build. Therefore, do not run configure by
hand.
If in doubt, you can run autogen.sh, run ./configure --help,
then re-run autogen.sh with your options.

View File

@ -26,6 +26,7 @@ EXTRA_DIST = \
multicurrency-discussion.txt \
netlogin.txt \
query-api.txt \
guid.txt \
user-prefs-howto.txt

View File

@ -150,7 +150,6 @@ libgw_kvp_la_LDFLAGS = -module ${G_WRAP_LINK_ARGS}
libgw_engine_la_SOURCES = gw-engine.c engine-helpers.c glib-helpers.c
libgw_engine_la_LDFLAGS = -module ${G_WRAP_LINK_ARGS}
libgw_engine_la_LIBADD = libgncmod-engine.la
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
gncmod_DATA = engine.scm

View File

@ -251,5 +251,11 @@ gnc_report_clock_total (int clockno,
fprintf (fout, "\n");
}
gboolean
gnc_should_log(gncModuleType module, gncLogLevel log_level)
{
return (log_level <= gnc_log_modules[module]);
}
/************************* END OF FILE ******************************\
\********************************************************************/

View File

@ -76,7 +76,7 @@ typedef enum
GNC_LOG_TRACE = 6,
} gncLogLevel;
extern gncLogLevel gnc_log_modules[MOD_LAST + 1];
//extern gncLogLevel gnc_log_modules[MOD_LAST + 1];
/** Initialize the error logging subsystem */
void gnc_log_init (void);
@ -103,9 +103,17 @@ const char * gnc_log_prettify (const char *name);
* a CPU-cucking subroutine call. Thus, this is a #define, not a
* subroutine call. The prototype would have been:
* gboolean gnc_should_log (gncModuleType module, gncLogLevel log_level);
*
* Unfortunately this doesn't work due to circular dependencies and
* undefined symbols, so let's return it to a function call. The real
* problem appears to be that gnc_log_modules isn't being exported
* so engine-helpers.c has an undefined symbol when linked into libgw-engine
* -- Derek Atkins <derek@ihtfp.com> 2004-01-06
*
* #define gnc_should_log(module,log_level) \
* (log_level <= gnc_log_modules[module])
*/
#define gnc_should_log(module,log_level) \
(log_level <= gnc_log_modules[module])
gboolean gnc_should_log(gncModuleType module, gncLogLevel log_level);
#define FUNK gnc_log_prettify(__FUNCTION__)

View File

@ -28,7 +28,6 @@
"#include <gnc-commodity.h>\n"
"#include <gnc-date.h>\n"
"#include <gnc-engine.h>\n"
"#include <gnc-engine-util.h>\n"
"#include <gnc-event.h>\n"
"#include <gnc-numeric.h>\n"
"#include <gnc-pricedb.h>\n"