* Bug.

    - #13715

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

diff --git a/configure b/configure
index bd1039c..82c3c97 100755 (executable)
--- a/configure
+++ b/configure
@@ -19954,7 +19954,6 @@ LIBS="${LIBS} `${APR_CONFIG} --ldflags` `${APR_CONFIG} --libs` "
 LIBS="${LIBS} `${APU_CONFIG} --ldflags` `${APU_CONFIG} --libs` "
 LIBS="${LIBS} ${MYSQL_COOKIE_LIBS}"
 LIBS="${LIBS} ${MEMCACHE_COOKIE_LIBS} "
-LIBS="${LIBS} serf/.libs/libserf-0.a"
 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 --git a/configure.ac b/configure.ac
index 12fb4e2..3acf2ff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -247,7 +247,6 @@ LIBS="${LIBS} `${APR_CONFIG} --ldflags` `${APR_CONFIG} --libs` "
 LIBS="${LIBS} `${APU_CONFIG} --ldflags` `${APU_CONFIG} --libs` "
 LIBS="${LIBS} ${MYSQL_COOKIE_LIBS}"
 LIBS="${LIBS} ${MEMCACHE_COOKIE_LIBS} "
-LIBS="${LIBS} serf/.libs/libserf-0.a"
 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 --git a/include/config.h b/include/config.h
index 85a7561..99e6e7b 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -17,7 +17,7 @@
 #define HAVE_AP_REGEX_H 1
 
 /* Define to 1 if you have the `close' function. */
-/* #undef HAVE_CLOSE */
+#define HAVE_CLOSE 1
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
@@ -36,22 +36,22 @@
 
 /* Define to 1 if your system has a GNU libc compatible `malloc' function, and
    to 0 otherwise. */
-#define HAVE_MALLOC 0
+#define HAVE_MALLOC 1
 
 /* Define to 1 if you have the `memcpy' function. */
-/* #undef HAVE_MEMCPY */
+#define HAVE_MEMCPY 1
 
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
 /* Define to 1 if you have the `memset' function. */
-/* #undef HAVE_MEMSET */
+#define HAVE_MEMSET 1
 
 /* Define to 1 if you have the `mmap' function. */
-/* #undef HAVE_MMAP */
+#define HAVE_MMAP 1
 
 /* Define to 1 if you have the `open' function. */
-/* #undef HAVE_OPEN */
+#define HAVE_OPEN 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
@@ -60,7 +60,7 @@
 #define HAVE_STDLIB_H 1
 
 /* Define to 1 if you have the `strcasecmp' function. */
-/* #undef HAVE_STRCASECMP */
+#define HAVE_STRCASECMP 1
 
 /* Define to 1 if you have the <strings.h> header file. */
 #define HAVE_STRINGS_H 1
@@ -69,10 +69,10 @@
 #define HAVE_STRING_H 1
 
 /* Define to 1 if you have the `strncasecmp' function. */
-/* #undef HAVE_STRNCASECMP */
+#define HAVE_STRNCASECMP 1
 
 /* Define to 1 if you have the `strstr' function. */
-/* #undef HAVE_STRSTR */
+#define HAVE_STRSTR 1
 
 /* Define to 1 if you have the <sys/mman.h> header file. */
 #define HAVE_SYS_MMAN_H 1
@@ -114,4 +114,4 @@
 /* #undef const */
 
 /* Define to rpl_malloc if the replacement function should be used. */
-#define malloc rpl_malloc
+/* #undef malloc */

diff --git a/src/Makefile.am b/src/Makefile.am
index 5d4bcac..54cf321 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,7 +43,7 @@ libmod_chxj_la_SOURCES = mod_chxj.c \
 
 libmod_chxj_la_CFLAGS = -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@  -I./serf
 AM_CFLAGS = @CFLAGS@ -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@
-libmod_chxj_la_DEPENDENCIES = serf/libserf-0.la
+libmod_chxj_la_LIBADD = serf/libserf-0.la
 lib_LTLIBRARIES = libmod_chxj.la
 
 make_so:

diff --git a/src/Makefile.in b/src/Makefile.in
index 5c4cac0..3e1c5db 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -51,7 +51,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(libdir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libmod_chxj_la_LIBADD =
+libmod_chxj_la_DEPENDENCIES = serf/libserf-0.la
 am_libmod_chxj_la_OBJECTS = libmod_chxj_la-mod_chxj.lo \
        libmod_chxj_la-qs_parse_string.lo libmod_chxj_la-qs_log.lo \
        libmod_chxj_la-qs_malloc.lo libmod_chxj_la-qs_parse_tag.lo \
@@ -265,7 +265,7 @@ libmod_chxj_la_SOURCES = mod_chxj.c \
 
 libmod_chxj_la_CFLAGS = -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@  -I./serf
 AM_CFLAGS = @CFLAGS@ -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@
-libmod_chxj_la_DEPENDENCIES = serf/libserf-0.la
+libmod_chxj_la_LIBADD = serf/libserf-0.la
 lib_LTLIBRARIES = libmod_chxj.la
 all: all-am