[myserver-commit] [2798] Define MyServer version in the `version' file.

[Giuseppe Scrivano]

Revision: 2798
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2798
Author:   gscrivano
Date:     2008-09-11 15:25:50 +0000 (Thu, 11 Sep 2008)

Log Message:
-----------
Define MyServer version in the `version' file.

Modified Paths:
--------------
    trunk/myserver/SConstruct
    trunk/myserver/configure.in

Added Paths:
-----------
    trunk/myserver/version

Modified: trunk/myserver/SConstruct
===================================================================
--- trunk/myserver/SConstruct   2008-09-10 20:23:12 UTC (rev 2797)
+++ trunk/myserver/SConstruct   2008-09-11 15:25:50 UTC (rev 2798)
@@ -2,7 +2,7 @@
 # MySever configuration script for scons.
 #
 # MyServer
-# http://www.myserverproject.net/
+# http://www.gnu.org/software/myserver/
 #
 # Copyright (C) 2002-2008 Free Software Foundation, Inc.
 # This program is free software; you can redistribute it and/or modify
@@ -25,9 +25,11 @@
 from xml.dom.minidom import Node
 
 import string
- 
-MYSERVER_VERSION = "GNU MyServer 0.9.0"
 
+f = open('version','r')
+MYSERVER_VERSION = f.readline()
+f.close()
+
 SVN_TRUNK = "svn://svn.savannah.gnu.org/myserver/trunk"
 HOMEPAGE = "http://www.gnu.org/software/myserver/";
 

Modified: trunk/myserver/configure.in
===================================================================
--- trunk/myserver/configure.in 2008-09-10 20:23:12 UTC (rev 2797)
+++ trunk/myserver/configure.in 2008-09-11 15:25:50 UTC (rev 2798)
@@ -16,7 +16,7 @@
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([GNU MyServer], [0.9.0-rc2], address@hidden)
+AC_INIT([GNU MyServer], [ ], address@hidden)
 AC_PREREQ([2.50])
 AM_CONFIG_HEADER(config.h)
 CFLAGS="${CFLAGS=}"
@@ -27,22 +27,13 @@
 
 AM_INIT_AUTOMAKE
 
-dnl Setting version
-MYSERVER_MAJOR_VERSION=0
-MYSERVER_MINOR_VERSION=9
-MYSERVER_MICRO_VERSION=0
+PACKAGE_STRING=`cat version`
+MYSERVER_VERSION="${PACKAGE_STRING}"
 
-MYSERVER_VERSION="GNU MyServer 
${MYSERVER_MAJOR_VERSION}.${MYSERVER_MINOR_VERSION}.${MYSERVER_MICRO_VERSION}"
-
-AC_SUBST(MYSERVER_MAJOR_VERSION)
-AC_SUBST(MYSERVER_MINOR_VERSION)
-AC_SUBST(MYSERVER_MICRO_VERSION)
-
 AC_SUBST(MYSERVER_VERSION)
 
 AC_DEFINE_UNQUOTED([MYSERVER_VERSION], ["${MYSERVER_VERSION}"], [The software 
version])
 
-
 AC_PROG_CC
 AC_PROG_CPP
 AC_AIX
@@ -66,7 +57,7 @@
 
 AC_ARG_ENABLE([ipv6], [  --enable-ipv6 Build with IPv6 support], 
enable_ipv6="yes", enable_ipv6="")
 
-AC_ARG_ENABLE([cygwin], [ --enable-cygwin Enable cygwin], enable_cygwin="yes", 
enable_cygwin="")
+AC_ARG_ENABLE([mingw32], [ --enable-mingw32 Enable mingw32], 
enable_mingw32="yes", enable_mingw32="")
 
 
 root_bindir='${root_prefix}/bin'
@@ -110,7 +101,7 @@
 
 dnl Looking for pthreads
 GNOME_PTHREAD_CHECK
-if test x$PTHREAD_LIB = x  -a "x$enable_cygwin" != "xyes"; then
+if test x$PTHREAD_LIB = x  -a "x$enable_mingw32" != "xyes"; then
    AC_MSG_ERROR([
 *** This system appears to have no posix threads
 *** Threads are required for MyServer
@@ -140,7 +131,7 @@
 else
    EVENT_LIB=""
 
-   if test "x$enable_cygwin" != "xyes"; then
+   if test "x$enable_mingw32" != "xyes"; then
       AC_MSG_ERROR([
 *** This system appears to have no libevent
 *** Libevent is required by MyServer
@@ -166,7 +157,7 @@
 
 if test x$have_dl != xyes; then
 
-   if test "x$enable_cygwin" != "xyes"; then
+   if test "x$enable_mingw32" != "xyes"; then
       AC_MSG_WARN([
 *** dlLIB not found
 *** MSCGI support will not function
@@ -213,13 +204,8 @@
                fi
   fi
 
-#if test "x$have_idn" = "xyes"; then
-#      LDFLAGS="$LDFLAGS $IDN_LIB"
-#fi
-
 AC_SUBST(IDN_LIB)
 
-
 dnl Looking for LibXL2
 AM_PATH_XML2(2.6.0, have_xml2=yes)
 if test x$have_xml2 != xyes; then
@@ -235,7 +221,7 @@
 OPENSSL_INC=""
 
 AC_ARG_WITH(openssl-include,
-  [[  --with-openssl-include=FILE     Use the given path to the openssl 
include files.]],
+  [[  --with-openssl-include=PATH       Use the given path to the openssl 
include files.]],
   [
         OPENSSL_INC=$withval
   ])
@@ -268,10 +254,7 @@
     fi
     AC_SUBST(HAVE_SSL)
     AC_SUBST(OPENSSL_LIB) # myserver
-    
 
-
-
 dnl Looking for zlib
 AC_CHECK_LIB(z, uncompress, have_libz=yes)
 if test x$have_libz != xyes; then
@@ -363,7 +346,7 @@
     CPPUNIT_LDFLAGS="-lcppunit"
 fi
 
-if test "x$enable_cygwin" = "xyes"; then
+if test "x$enable_mingw32" = "xyes"; then
    LDFLAGS="$LDFLAGS -levent_extra -levent_core  -lws2_32 -lgdi32 -lrx 
-luserenv -lole32  -luuid -ly" 
 fi
 

Added: trunk/myserver/version
===================================================================
--- trunk/myserver/version                              (rev 0)
+++ trunk/myserver/version      2008-09-11 15:25:50 UTC (rev 2798)
@@ -0,0 +1 @@
+GNU MyServer 0.9.0-rc2
\ No newline at end of file