Hi,

I added a check for wchar_t and the header 
include/log4cxx/private/log4cxx_private.h in configure.in. Patch is attached.

It would have been easier to do a #define or #undef on 
LOG4CXX_LOGCHAR_IS_UTF8, because this is the normal behaviour for tests. But 
log4cxx.h.in expects a value for it. Should we change it or are there 
problems at the ant-side then?

Tommi
Index: configure.in
===================================================================
RCS file: /home/cvspublic/logging-log4cxx/configure.in,v
retrieving revision 1.51
diff -c -r1.51 configure.in
*** configure.in	4 May 2005 16:13:40 -0000	1.51
--- configure.in	14 May 2005 19:36:33 -0000
***************
*** 22,27 ****
--- 22,29 ----
  [/* no explicit exports */
  #define LOG4CXX_EXPORT])
  
+ unset CDPATH
+ AC_CONFIG_HEADERS([src/config.h])
  AM_INIT_AUTOMAKE(log4cxx, 0.9.8)
  
  # Checks for programs
***************
*** 369,374 ****
--- 371,382 ----
  
  CPPFLAGS="-DLOG4CXX $CPPFLAGS"
  
+ AC_MSG_CHECKING([wchar_t])
+ AC_COMPILE_IFELSE(AC_LANG_SOURCE(wchar_t* w;), [have_wchar_t=yes; have_wchar_t_value=1], [have_wchar_t=no; have_wchar_t_value=0])
+ AC_MSG_RESULT($have_wchar_t)
+ 
+ AC_SUBST(LOGCHAR_IS_UTF8, $have_wchar_t_value)
+ 
  # Create files
  # ----------------------------------------------------------------------------
  
***************
*** 378,384 ****
  docs/Doxyfile
  src/Makefile
  include/Makefile
! include/log4cxx/private/log4cxx.h
  include/log4cxx/Makefile
  include/log4cxx/helpers/Makefile
  include/log4cxx/net/Makefile
--- 386,393 ----
  docs/Doxyfile
  src/Makefile
  include/Makefile
! include/log4cxx/log4cxx.h
! include/log4cxx/private/log4cxx_private.h
  include/log4cxx/Makefile
  include/log4cxx/helpers/Makefile
  include/log4cxx/net/Makefile

Reply via email to