[ObjectHandler-cvs] ObjectHandler/oh Makefile.am, 1.2, 1.3 logger.hpp, 1.1, 1.2

[Eric E. <eri...@us...>]

Update of /cvsroot/objecthandler/ObjectHandler/oh
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21619/oh

Modified Files:
	Makefile.am logger.hpp 
Log Message:
merge R000104f0-branch

Index: Makefile.am
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/oh/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	26 Jul 2006 09:36:15 -0000	1.2
--- Makefile.am	28 Aug 2006 10:02:16 -0000	1.3
***************
*** 3,6 ****
--- 3,7 ----
  
  include_HEADERS = \
+     config.hpp \
      exception.hpp \
      logger.hpp \

Index: logger.hpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/oh/logger.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** logger.hpp	19 May 2006 15:12:41 -0000	1.1
--- logger.hpp	28 Aug 2006 10:02:16 -0000	1.2
***************
*** 30,33 ****
--- 30,40 ----
  #endif
  
+ // if the include below fails, it means you're using the wrong
+ // version of log4cxx.
+ #include <log4cxx/log4cxxdefines.h>
+ #if LOG4CXX_VERSION != 0x030907f1
+     #error using an incorrect version of log4cxx, please update.
+ #endif
+ 
  #include <log4cxx/logger.h>
  #include <log4cxx/simplelayout.h>