Merge pull request #31 from yujinrobot/master

Minor updates to the apr/log4cxx packages

src/log4cxx-2-pkgconfig.patch

@@ -2,7 +2,9 @@ This file is part of MXE.
 See index.html for further information.
 
 This patch ensures that the correct dependencies can always be found for
-static mingw builds. Not yet submitted upstream.
+static mingw builds. Submitted upstream: 
+
+   https://issues.apache.org/jira/browse/LOGCXX-381
 
 diff -NBaur vanilla/liblog4cxx.pc.in mingw_cross/liblog4cxx.pc.in
 --- vanilla/liblog4cxx.pc.in	2008-04-01 07:34:52.000000000 +0900

src/log4cxx-4-mingw.definitions.patch

@@ -3,7 +3,9 @@ See index.html for further information.
 
 Fixes a problem with the mismatched calling conventions in apr and log4cxx.
 See http://www.mail-archive.com/log4cxx-user@logging.apache.org/msg02671.html
-Not yet submitted upstream.
+Submitted upstream:
+
+  https://issues.apache.org/jira/browse/LOGCXX-382
 
 diff -NBaur vanilla/src/main/include/log4cxx/helpers/thread.h mingw_cross/src/main/include/log4cxx/helpers/thread.h
 --- vanilla/src/main/include/log4cxx/helpers/thread.h	2008-04-01 07:34:26.000000000 +0900

src/log4cxx-5-cmake.patch

@@ -0,0 +1,14 @@
+diff -NBaur vanilla/log4cxx-config.cmake mingw_cross/log4cxx-config.cmake
+--- vanilla/log4cxx-config.cmake	1970-01-01 09:00:00.000000000 +0900
++++ mingw_cross/log4cxx-config.cmake	2012-03-14 15:29:54.706247316 +0900
+@@ -0,0 +1,10 @@
++
++set(LOG4CXX_VERSION 0.10.0)
++
++get_filename_component(LOG4CXX_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
++
++set(LOG4CXX_INCLUDE_DIR "${LOG4CXX_CMAKE_DIR}/../../../include" CACHE FILEPATH "Log4cxx include directory")
++set(LOG4CXX_INCLUDE_DIRS "${LOG4CXX_INCLUDE_DIR}")
++set(LOG4CXX_LIBRARY_DIRS "${LOG4CXX_CMAKE_DIR}/../../../lib")
++set(LOG4CXX_LIBRARIES "log4cxx;aprutil-1;iconv;expat;apr-1;rpcrt4;shell32;ws2_32;advapi32;kernel32;msvcrt")
++

src/log4cxx.mk

@@ -27,6 +27,8 @@ define $(PKG)_BUILD
         CFLAGS=-D_WIN32_WINNT=0x0500 \
         CXXFLAGS=-D_WIN32_WINNT=0x0500
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS=
+    mkdir -p $(PREFIX)/$(TARGET)/share/cmake/log4cxx
+    cp $(1)/log4cxx-config.cmake $(PREFIX)/$(TARGET)/share/cmake/log4cxx/log4cxx-config.cmake
 
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \