Merged revisions 165071 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

I might add here that in I tested the merged fixes
from trunk in both 1.6.0 and 1.6.1 via both
'make' and ./runtests in the ael regression tests
for all but DEBUG_CHANNEL_LOCKS, DEBUG_SCHEDULER,
and CHANNEL_TRACE options.

........
r165071 | murf | 2008-12-16 22:04:56 -0700 (Tue, 16 Dec 2008) | 31 lines

A possibly "horrible fix" for a "horribly broken"
situation.

As stuff shifts around in the asterisk code, the
miscellaneous inclusions from the standalone stuff
gets broken. There's no easy fix for this situation.

I made sure that everything in utils builds without
problem ***AND*** that aelparse runs the regressions
correctly with the following make menuselect options
both on and off:

DONT_OPTIMIZE
DEBUG_THREADS
DEBUG_CHANNEL_LOCKS
MALLOC_DEBUG
MTX_PROFILE
DEBUG_SCHEDULER
DEBUG_THREADLOCALS
DETECT_DEADLOCKS
CHANNEL_TRACE

I think from now on, I'm going to #undef
all these features in the various utils native
files; I guess I could do the same for the
copied-in files, surrounded by STANDALONE ifdef.

A standalone isn't going to care about threads,
mutexes, etc.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@165093 65c4cc65-6c06-0410-ace0-fbb531ad65f3

utils/ael_main.c

@@ -24,6 +24,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/ael_structs.h"
 #include "asterisk/extconf.h"
 
+int option_debug = 0;
+int option_verbose = 0;
+void ast_register_file_version(const char *file, const char *version) { }
+void ast_unregister_file_version(const char *file) { }
+
 struct ast_flags ast_compat = { 7 };
 
 /*** MODULEINFO