From c6da830ed4b2f7488ff3db78d0cdc713f04fc4b6 Mon Sep 17 00:00:00 2001 From: konn Date: Fri, 7 Nov 2008 18:41:41 +0000 Subject: [PATCH] * version up. - 0.13.1-rc git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/sandbox@3622 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- configure | 20 ++++++++++---------- configure.ac | 2 +- include/config.h | 6 +++--- src/Makefile.am | 4 ++-- src/Makefile.in | 7 ++++--- support/centos/mod-chxj.spec | 2 +- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/configure b/configure index a7a0cbce..656fa499 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for mod_chxj 0.12.18. +# Generated by GNU Autoconf 2.61 for mod_chxj 0.13.1-rc. # # Report bugs to . # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='mod_chxj' PACKAGE_TARNAME='mod_chxj' -PACKAGE_VERSION='0.12.18' -PACKAGE_STRING='mod_chxj 0.12.18' +PACKAGE_VERSION='0.13.1-rc' +PACKAGE_STRING='mod_chxj 0.13.1-rc' PACKAGE_BUGREPORT='konn@users.sourceforge.jp' ac_unique_file="src/mod_chxj.c" @@ -1407,7 +1407,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures mod_chxj 0.12.18 to adapt to many kinds of systems. +\`configure' configures mod_chxj 0.13.1-rc to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1478,7 +1478,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of mod_chxj 0.12.18:";; + short | recursive ) echo "Configuration of mod_chxj 0.13.1-rc:";; esac cat <<\_ACEOF @@ -1595,7 +1595,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -mod_chxj configure 0.12.18 +mod_chxj configure 0.13.1-rc generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1609,7 +1609,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by mod_chxj $as_me 0.12.18, which was +It was created by mod_chxj $as_me 0.13.1-rc, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2427,7 +2427,7 @@ fi # Define the identity of the package. PACKAGE=mod_chxj - VERSION=0.12.18 + VERSION=0.13.1-rc cat >>confdefs.h <<_ACEOF @@ -22012,7 +22012,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by mod_chxj $as_me 0.12.18, which was +This file was extended by mod_chxj $as_me 0.13.1-rc, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22065,7 +22065,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -mod_chxj config.status 0.12.18 +mod_chxj config.status 0.13.1-rc configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 570203bc..e6c60294 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([mod_chxj],[0.12.18],[konn@users.sourceforge.jp]) +AC_INIT([mod_chxj],[0.13.1-rc],[konn@users.sourceforge.jp]) AC_PREREQ(2.59) AC_CONFIG_SRCDIR([src/mod_chxj.c]) AC_CANONICAL_TARGET diff --git a/include/config.h b/include/config.h index 14d12c67..7d57e1be 100644 --- a/include/config.h +++ b/include/config.h @@ -96,19 +96,19 @@ #define PACKAGE_NAME "mod_chxj" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "mod_chxj 0.12.18" +#define PACKAGE_STRING "mod_chxj 0.13.1-rc" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "mod_chxj" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.12.18" +#define PACKAGE_VERSION "0.13.1-rc" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.12.18" +#define VERSION "0.13.1-rc" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ diff --git a/src/Makefile.am b/src/Makefile.am index 3b25731f..7b9d5d45 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,7 +45,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 -I./css/include AM_CFLAGS = @CFLAGS@ -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@ -libmod_chxj_la_LIBADD = serf/.libs/libserf-0.a +libmod_chxj_la_LIBADD = serf/.libs/libserf-0.a css/src/.libs/libscss.a lib_LTLIBRARIES = libmod_chxj.la make_so: @@ -54,7 +54,7 @@ make_so: serf/.libs/libserf-0.a: (cd serf; CFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --enable-shared --with-apr=`dirname @APR_CONFIG@` --with-apr-util=`dirname @APU_CONFIG@`; make) -css/src/libscss.la: +css/src/.libs/libscss.a: (cd css; ./configure --with-apr-config=@APR_CONFIG@ --with-apu-config=@APU_CONFIG@; make) clean: diff --git a/src/Makefile.in b/src/Makefile.in index d3c155bd..0e42ab28 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -51,7 +51,8 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(libdir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) -libmod_chxj_la_DEPENDENCIES = serf/.libs/libserf-0.a +libmod_chxj_la_DEPENDENCIES = serf/.libs/libserf-0.a \ + css/src/.libs/libscss.a 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 \ @@ -268,7 +269,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 -I./css/include AM_CFLAGS = @CFLAGS@ -O2 -prefer-pic @QDEFS@ @DDEFS@ -I. -I../include -I@with_apache_header@ -libmod_chxj_la_LIBADD = serf/.libs/libserf-0.a +libmod_chxj_la_LIBADD = serf/.libs/libserf-0.a css/src/.libs/libscss.a lib_LTLIBRARIES = libmod_chxj.la all: all-am @@ -880,7 +881,7 @@ make_so: serf/.libs/libserf-0.a: (cd serf; CFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --enable-shared --with-apr=`dirname @APR_CONFIG@` --with-apr-util=`dirname @APU_CONFIG@`; make) -css/src/libscss.la: +css/src/.libs/libscss.a: (cd css; ./configure --with-apr-config=@APR_CONFIG@ --with-apu-config=@APU_CONFIG@; make) clean: diff --git a/support/centos/mod-chxj.spec b/support/centos/mod-chxj.spec index 88a37d17..8ccc6426 100644 --- a/support/centos/mod-chxj.spec +++ b/support/centos/mod-chxj.spec @@ -1,4 +1,4 @@ -%define version 0.12.18 +%define version 0.13.1-rc Summary: CHTML to HDML,XHTML,JHTML convert module for Apache HTTPD. Name: mod_chxj -- 2.11.0