K 10 svn:author V 6 ehaupt K 8 svn:date V 27 2014-01-17T14:25:54.625733Z K 7 svn:log V 64 Use new dependency macros based on options. Submitted by: bapt END