PKCS11 build fails because of different LOG_LEVEL constants due to merge

[GoogleCodeExporter]

What steps will reproduce the problem?
1.Build eid-mw from trunk

What is the expected output? What do you see instead?
Expected: Builds fine.
Got: src/log.c:60:38: error: 'LOG_LEVEL_WARNING' undeclared here (not in a 
function)
src/log.c: In function 'log_trace':
src/log.c:114:22: error: 'LOG_LEVEL_INFO' undeclared (first use in this 
function)
src/log.c:114:22: note: each undeclared identifier is reported only once for 
each function it appears in
src/log.c:119:22: error: 'LOG_LEVEL_SPY' undeclared (first use in this function)
src/log.c: In function 'log_xtrace':
src/log.c:218:22: error: 'LOG_LEVEL_INFO' undeclared (first use in this 
function)
src/log.c: In function 'log_template':
src/log.c:374:22: error: 'LOG_LEVEL_INFO' undeclared (first use in this 
function)
src/log.c:379:22: error: 'LOG_LEVEL_SPY' undeclared (first use in this function)
make[3]: *** [libbeidpkcs11_la-log.lo] Error 1

What version of the product are you using? On what operating system?
eid-mw from trunk, Exherbo Linux

Please provide any additional information below.
It seems like LOG_LEVEL constants in pkcs11/src/log.c haven't been updated 
after the merge introduced in revision r1224.
In attach is a patch fixing this issue.

Original issue reported on code.google.com by superhe...@gmail.com on 29 Apr 2012 at 9:18

Attachments:

• eid-mw-scm-fix-pkcs11-log-level.patch

[GoogleCodeExporter]

Thank you for the Patch, Frank will fix this

Original comment by frederik...@gmail.com on 4 May 2012 at 8:54

• Changed state: Started

[GoogleCodeExporter]

Thanks, superheron. Sorry I had just fixed this and gcc4.7 issues for trunk. 
Should be OK now, could you try again? 

Original comment by fr4...@gmail.com on 4 May 2012 at 11:58

• Changed state: Fixed

[GoogleCodeExporter]

Yes, it builds fine now.
Thanks for your work. :-)

Original comment by superhe...@gmail.com on 7 May 2012 at 7:37