Changeset 470

Show
Ignore:
Timestamp:
11/22/06 05:26:55 (2 years ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r467 r470  
     12006-11-22  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
     2 
     3        * configure.in: Added new --enable-beta parameter. It allows to 
     4        build beta versions based on the subversion revision number.  
     5 
    162006-11-20  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
    27 

  • cherokee/trunk/README

    r438 r470  
    41418.- Windows compilation 
    4242----------------------- 
    43 ./configure --prefix=/usr --sysconfdir=/etc --enable-trace --enable-static-module=all --enable-static --enable-shared=no 
     43./configure --prefix=/usr --sysconfdir=/etc --enable-trace --enable-static-module=all --enable-static --enable-shared=no --enable-beta 
    4444 
    4545 

  • cherokee/trunk/configure.in

    r469 r470  
     1dnl -*- mode: m4-mode -*- 
    12dnl Process this file with autoconf to produce a configure script. 
    23 
    …… 
    1920]) 
    2021 
    21 dnl require autoconf 2.58 
     22dnl require autoconf 2.56 
    2223AC_PREREQ(2.56) 
    2324 
    …… 
    2627m4_define([cherokee_minor_version], [6]) 
    2728m4_define([cherokee_micro_version], [0]) 
    28 m4_define([cherokee_patch_version], [b$LastChangedRevision$]) 
    29 m4_define([cherokee_version], m4_format('%s.%s.%s%s', cherokee_major_version, cherokee_minor_version, cherokee_micro_version, cherokee_patch_version)) 
     29m4_define([cherokee_version], m4_format('%s.%s.%s', cherokee_major_version, cherokee_minor_version, cherokee_micro_version)) 
    3030 
    3131dnl Init autoconf and automake 
    …… 
    3434AM_INIT_AUTOMAKE([no-define]) 
    3535 
    36 AC_CANONICAL_HOST 
     36dnl Define version 
    3737AC_DEFINE(PACKAGE_MAJOR_VERSION, "cherokee_major_version", [Version string]) 
    3838AC_DEFINE(PACKAGE_MINOR_VERSION, "cherokee_minor_version", [Version string]) 
    3939AC_DEFINE(PACKAGE_MICRO_VERSION, "cherokee_micro_version", [Version string]) 
    40 AC_DEFINE(PACKAGE_PATCH_VERSION, "cherokee_patch_version", [Version string]) 
    41  
    42 dnl Substitution variables 
     40 
    4341PACKAGE_MAJOR_VERSION="cherokee_major_version" 
    4442PACKAGE_MINOR_VERSION="cherokee_minor_version" 
    4543PACKAGE_MICRO_VERSION="cherokee_micro_version" 
    46 PACKAGE_PATCH_VERSION="cherokee_patch_version" 
    4744AC_SUBST(PACKAGE_MAJOR_VERSION) 
    4845AC_SUBST(PACKAGE_MINOR_VERSION) 
    4946AC_SUBST(PACKAGE_MICRO_VERSION) 
    50 AC_SUBST(PACKAGE_PATCH_VERSION) 
     47 
     48dnl Check the SVN revision 
     49AC_ARG_ENABLE(beta, AC_HELP_STRING([--enable-beta], [Enable beta development]), 
     50                    is_beta="$enableval", is_beta="no") 
     51 
     52if test x"$is_beta" == "xyes"; then 
     53  if test -d ".svn"; then 
     54     SVN_REV="`svn info -R | grep Revision | sort | tail -1 | sed 's/Revision: //'`";    
     55  fi 
     56 
     57  PACKAGE_PATCH_VERSION="b$SVN_REV" 
     58  AC_SUBST(PACKAGE_PATCH_VERSION) 
     59  AC_DEFINE(PACKAGE_PATCH_VERSION, "$PACKAGE_PATCH_VERSION", [Version string]) 
     60 
     61  dnl Redefine versions 
     62  PACKAGE_VERSION="$PACKAGE_MAJOR_VERSION.$PACKAGE_MINOR_VERSION.$PACKAGE_MICRO_VERSION$PACKAGE_PATCH_VERSION" 
     63  AC_DEFINE(PACKAGE_VERSION, $PACKAGE_VERSION, [Package version]) 
     64 
     65  VERSION="$PACKAGE_MAJOR_VERSION.$PACKAGE_MINOR_VERSION.$PACKAGE_MICRO_VERSION$PACKAGE_PATCH_VERSION" 
     66  AC_DEFINE(VERSION, $VERSION, [Software version]) 
     67fi 
    5168 
    5269dnl Check for CPU / vendor / OS 
     70AC_CANONICAL_HOST 
     71 
    5372os_string="UNIX" 
    5473so_suffix=so