jfclere 01/06/21 07:48:11
Modified: jk/native configure.in
jk/native/common jk_global.h
Added: jk/native/common version.h.in
Log:
Add JK_VERSION - Note the logic is configure.in, not in version.h -
Revision Changes Path
1.6 +30 -4 jakarta-tomcat-connectors/jk/native/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure.in 2001/06/14 14:38:13 1.5
+++ configure.in 2001/06/21 14:47:59 1.6
@@ -1,17 +1,24 @@
dnl
dnl Process this file with autoconf to produce a configure script
dnl
-AC_REVISION($Id: configure.in,v 1.5 2001/06/14 14:38:13 jfclere Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.6 2001/06/21 14:47:59 jfclere Exp $)dnl
AC_PREREQ(2.13)
AC_INIT(common/jk_ajp13.h)
AC_CONFIG_AUX_DIR(scripts/build/unix)
+AM_CONFIG_HEADER(common/version.h)
+dnl package and version.
PACKAGE=mod_jk
-VERSION=0.0.0
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
+VERMAJOR=1
+VERMINOR=2
+VERFIX=0
+VERBETA=1
+dnl set VERISRELEASE to 1 when release (do not forget to commit!)
+VERISRELEASE=0
+VERSION=${VERMAJOR}.${VERMINOR}.${VERFIX}
+
AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
dnl AM_PROG_LIBTOOL often causes problems.
@@ -42,6 +49,25 @@
AC_PATH_PROG(MKDIR,mkdir,$PATH)dnl
AC_SUBST(MKDIR)
+
+dnl prepare the string and value for mod_jk version logic
+JK_EXPOSED_VERSION=${PACKAGE}/${VERSION}
+if ${TEST} ${VERISRELEASE} -eq 0 ; then
+ JK_EXPOSED_VERSION=${JK_EXPOSED_VERSION}-beta-${VERBETA}
+else
+ VERBETA=255
+fi
+
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+
+#
+# Adds in version.h
+#
+AC_DEFINE_UNQUOTED(JK_EXPOSED_VERSION,"$JK_EXPOSED_VERSION",
+ [ Printable string for version ] )
+AC_DEFINE_UNQUOTED(JK_VERSION,((($VERMAJOR) << 24) + (($VERMINOR) << 16) +
(($VERFIX) << 8) + ($VERBETA)),
+ [ Version in hex :like 010200ff for release 01020001 for beta 1. ] )
WEBSERVER=""
apache_dir=""
1.4 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_global.h
Index: jk_global.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jk_global.h 2001/06/18 14:15:40 1.3
+++ jk_global.h 2001/06/21 14:48:05 1.4
@@ -59,13 +59,13 @@
* Description: Global definitions and include files that should exist *
* anywhere *
* Author: Gal Shachor <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.3 $ *
+ * Version: $Revision: 1.4 $ *
***************************************************************************/
#ifndef JK_GLOBAL_H
#define JK_GLOBAL_H
-#define JK_EXPOSED_VERSION ("mod_jk/1.1a1")
+#include "version.h"
#include <stdio.h>
#include <stdlib.h>
1.1 jakarta-tomcat-connectors/jk/native/common/version.h.in
Index: version.h.in
===================================================================
#undef JK_EXPOSED_VERSION
#undef JK_VERSION
