* merge from master

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

diff --git a/src/css/config.status b/src/css/config.status
index 7343c0a..b46cf93 100755 (executable)
--- a/src/css/config.status
+++ b/src/css/config.status
@@ -341,7 +341,7 @@ Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/konno/work/mod_chxj/src/css'
+ac_pwd='/home/konno/work/mod-chxj_svn/mod_chxj/src/css'
 srcdir='.'
 INSTALL='/usr/bin/install -c'
 MKDIR_P='/bin/mkdir -p'
@@ -552,19 +552,19 @@ s,@am__isrc@,|#_!!_#|,g
 s,@CYGPATH_W@,|#_!!_#|echo,g
 s,@PACKAGE@,|#_!!_#|scss,g
 s,@VERSION@,|#_!!_#|1.0.0,g
-s,@ACLOCAL@,|#_!!_#|${SHELL} /home/konno/work/mod_chxj/missing --run aclocal-1.10,g
-s,@AUTOCONF@,|#_!!_#|${SHELL} /home/konno/work/mod_chxj/missing --run autoconf,g
-s,@AUTOMAKE@,|#_!!_#|${SHELL} /home/konno/work/mod_chxj/missing --run automake-1.10,g
-s,@AUTOHEADER@,|#_!!_#|${SHELL} /home/konno/work/mod_chxj/missing --run autoheader,g
-s,@MAKEINFO@,|#_!!_#|${SHELL} /home/konno/work/mod_chxj/missing --run makeinfo,g
-s,@install_sh@,|#_!!_#|$(SHELL) /home/konno/work/mod_chxj/install-sh,g
+s,@ACLOCAL@,|#_!!_#|${SHELL} /home/konno/work/mod-chxj_svn/mod_chxj/missing --run aclocal-1.10,g
+s,@AUTOCONF@,|#_!!_#|${SHELL} /home/konno/work/mod-chxj_svn/mod_chxj/missing --run autoconf,g
+s,@AUTOMAKE@,|#_!!_#|${SHELL} /home/konno/work/mod-chxj_svn/mod_chxj/missing --run automake-1.10,g
+s,@AUTOHEADER@,|#_!!_#|${SHELL} /home/konno/work/mod-chxj_svn/mod_chxj/missing --run autoheader,g
+s,@MAKEINFO@,|#_!!_#|${SHELL} /home/konno/work/mod-chxj_svn/mod_chxj/missing --run makeinfo,g
+s,@install_sh@,|#_!!_#|$(SHELL) /home/konno/work/mod-chxj_svn/mod_chxj/install-sh,g
 s,@STRIP@,|#_!!_#|strip,g
 s,@INSTALL_STRIP_PROGRAM@,|#_!!_#|$(install_sh) -c -s,g
 s,@mkdir_p@,|#_!!_#|/bin/mkdir -p,g
 s,@AWK@,|#_!!_#|gawk,g
 s,@SET_MAKE@,|#_!!_#|,g
 s,@am__leading_dot@,|#_!!_#|.,g
-s,@AMTAR@,|#_!!_#|${SHELL} /home/konno/work/mod_chxj/missing --run tar,g
+s,@AMTAR@,|#_!!_#|${SHELL} /home/konno/work/mod-chxj_svn/mod_chxj/missing --run tar,g
 s,@am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g
 s,@am__untar@,|#_!!_#|${AMTAR} xf -,g
 s,@CC@,|#_!!_#|gcc,g

diff --git a/src/css/src/Makefile b/src/css/src/Makefile
index a2399aa..7e13816 100644 (file)
--- a/src/css/src/Makefile
+++ b/src/css/src/Makefile
@@ -78,16 +78,16 @@ DIST_SOURCES = $(libscss_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/konno/work/mod_chxj/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/konno/work/mod_chxj/missing --run tar
+ACLOCAL = ${SHELL} /home/konno/work/mod-chxj_svn/mod_chxj/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/konno/work/mod-chxj_svn/mod_chxj/missing --run tar
 APR_1_CONFIG = 
 APR_CONFIG = /usr/bin/apr-config
 APU_1_CONFIG = 
 APU_CONFIG = /usr/bin/apu-config
 AR = ar
-AUTOCONF = ${SHELL} /home/konno/work/mod_chxj/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/konno/work/mod_chxj/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/konno/work/mod_chxj/missing --run automake-1.10
+AUTOCONF = ${SHELL} /home/konno/work/mod-chxj_svn/mod_chxj/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/konno/work/mod-chxj_svn/mod_chxj/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/konno/work/mod-chxj_svn/mod_chxj/missing --run automake-1.10
 AWK = gawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
@@ -122,7 +122,7 @@ LIBTOOL = /usr/bin/libtool
 LIBTOOL_DEPS = ./../../ltmain.sh
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/konno/work/mod_chxj/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/konno/work/mod-chxj_svn/mod_chxj/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 OBJEXT = o
 PACKAGE = scss
@@ -137,10 +137,10 @@ SET_MAKE =
 SHELL = /bin/sh
 STRIP = strip
 VERSION = 1.0.0
-abs_builddir = /home/konno/work/mod_chxj/src/css/src
-abs_srcdir = /home/konno/work/mod_chxj/src/css/src
-abs_top_builddir = /home/konno/work/mod_chxj/src/css
-abs_top_srcdir = /home/konno/work/mod_chxj/src/css
+abs_builddir = /home/konno/work/mod-chxj_svn/mod_chxj/src/css/src
+abs_srcdir = /home/konno/work/mod-chxj_svn/mod_chxj/src/css/src
+abs_top_builddir = /home/konno/work/mod-chxj_svn/mod_chxj/src/css
+abs_top_srcdir = /home/konno/work/mod-chxj_svn/mod_chxj/src/css
 ac_ct_CC = gcc
 ac_ct_CXX = g++
 ac_ct_F77 = 
@@ -169,7 +169,7 @@ host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/konno/work/mod_chxj/install-sh
+install_sh = $(SHELL) /home/konno/work/mod-chxj_svn/mod_chxj/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale