Merge branch 'branch_0.12.0' into sandbox

Conflicts:

	configure
	configure.ac

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/sandbox@2889 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --cc configure
index d6e2f9c,dd8ec51..6687556
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -20073,7 -19954,7 +20073,11 @@@ LIBS="${LIBS} `${APR_CONFIG} --ldflags
  LIBS="${LIBS} `${APU_CONFIG} --ldflags` `${APU_CONFIG} --libs` "
  LIBS="${LIBS} ${MYSQL_COOKIE_LIBS}"
  LIBS="${LIBS} ${MEMCACHE_COOKIE_LIBS} "
++<<<<<<< HEAD:configure
 +LIBS="${LIBS} `${CROCO_CONFIG} --libs` "
++=======
+ LIBS="${LIBS} serf/.libs/libserf-0.a"
++>>>>>>> branch_0.12.0:configure
  CFLAGS="${CFLAGS} `${WAND_CONFIG} --cppflags` `${WAND_CONFIG} --cflags`"
  CFLAGS="${CFLAGS} `${APR_CONFIG} --includes` `${APR_CONFIG} --cflags` `${APR_CONFIG} --cppflags`"
  CFLAGS="${CFLAGS} `${APU_CONFIG} --includes`"

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/chxj_jxhtml.c
Simple merge

diff --cc src/chxj_xhtml_mobile_1_0.c
Simple merge

diff --cc src/mod_chxj.c
Simple merge