[GRASS5] 5.1: mysterious configure[.in]

[Markus Neteler]

A followup to the current configure problem in GRASS 5.1:

The configure.in changes are minimal to the working version 1.12.
But include/config.h in not written properly any more.

Find attached the diff (what I have changed) to the workinf 1.12
version, perhaps someone can tell me the trick.

For now I will revert the change to keep 5.1 in a compilable
state. I still don't understand the problem.


Markus


On Thu, Jan 30, 2003 at 11:39:20AM +0100, Markus Neteler wrote:
> Hi,
> 
> today I have updated the VERSION handling in 5.1 to have it
> independent from 5.0 and to fix a dependency problem, when
> 5.1 is linked to an uncompiled 5.0 tree.
> 
> The version numbers are written correctly by configure from
> include/Make/Grass.make.in to include/Make/Grass.make
> 
> (that means that the new include/VERSION file is analysed properly).
> But now in the current 5.1 CVS version the following files
> are not updated properly any more:
> 
> configure ...
> [...]
> checking whether to use GLw... no
> checking whether to use FreeType... no
> checking whether to use NLS... no
> creating ./config.status
> creating include/Make/Grass.make    <- o.k.
> creating include/Make/Platform.make    <- o.k. 
> creating include/config.h    <- nothing expanded
> creating ./config.status
> sed: can't read confdefs.h: No such file or directory    <- ???
> creating include/version.h    <- nothing expanded
> creating include/winname.h    <- nothing expanded 
> creating include/config.h    <- again?
> 
> Maybe someone more expert for configure.in could fix this problem.
> 
> Thanks in advance,
> 
>  Markus
> 
> _______________________________________________
> grass5 mailing list
> grass5 at grass.itc.it
> http://grass.itc.it/mailman/listinfo/grass5
-------------- next part --------------
--- configure.in	Fri Jan 31 13:38:49 2003
+++ configure.in.new	Thu Jan 30 18:01:28 2003
@@ -1,7 +1,5 @@
 #############################################################################
 #
-# $Id: configure.in,v 1.12 2003/01/17 07:55:37 radim Exp $
-#
 # MODULE:   	Grass Compilation
 # AUTHOR(S):	Original author unknown - probably CERL
 #   	    	Eric G. Miller - egm2 at jps.net
@@ -25,7 +23,7 @@
 $2
 ])
 
-AC_INIT(include/Make/Grass.make)
+AC_INIT(configure.in)
 AC_PREFIX_DEFAULT(/usr/local)
 AC_CONFIG_HEADER(include/config.h)
 AC_CANONICAL_HOST
@@ -108,23 +106,27 @@
 AC_SUBST(GISBASE)
 AC_SUBST(GRASS_BIN)
 
-dnl # Set VERSION_*
-dnl 
-dnl VERSION_FILE=${SRCDIR}/src/CMD/VERSION
-dnl VERSION_NUMBER=`sed -n 1p ${VERSION_FILE}`
-dnl VERSION_DATE=`sed -n 2p ${VERSION_FILE}`
-dnl VERSION_UPDATE_PKG=`sed -n 3p ${VERSION_FILE}`
-dnl NAME_VER=`echo ${VERSION_NUMBER} | sed 's/\..*//'`
-dnl changequote(,)
-dnl LIB_VER=`echo ${VERSION_NUMBER} | sed 's/^\([0-9.]*\).*$/\1/'`
-dnl changequote([,])
-dnl 
-dnl AC_SUBST(VERSION_FILE)
-dnl AC_SUBST(VERSION_NUMBER)
-dnl AC_SUBST(VERSION_DATE)
-dnl AC_SUBST(VERSION_UPDATE_PKG)
-dnl AC_SUBST(NAME_VER)
-dnl AC_SUBST(LIB_VER)
+# Set VERSION_*
+
+VERSION_FILE=include/VERSION
+VERSION_MAJOR=`sed -n 1p ${VERSION_FILE}`
+VERSION_MINOR=`sed -n 2p ${VERSION_FILE}`
+VERSION_RELEASE=`sed -n 3p ${VERSION_FILE}`
+VERSION_DATE=`sed -n 4p ${VERSION_FILE}`
+VERSION_NUMBER=`echo ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}`
+NAME_VER=`echo ${VERSION_NUMBER} | sed 's/\..*//'`
+changequote(,)
+LIB_VER=`echo ${VERSION_NUMBER} | sed 's/^\([0-9.]*\).*$/\1/'`
+changequote([,])
+
+AC_SUBST(VERSION_FILE)
+AC_SUBST(VERSION_MAJOR)
+AC_SUBST(VERSION_MINOR)
+AC_SUBST(VERSION_RELEASE)
+AC_SUBST(VERSION_NUMBER)
+AC_SUBST(VERSION_DATE)
+AC_SUBST(NAME_VER)
+AC_SUBST(LIB_VER)
 
 # Enable options
 
@@ -1136,11 +1138,12 @@
 GRASS_HOME=${DSTDIR}
 AC_SUBST(GRASS_HOME)
 
-AC_OUTPUT(include/Make/Platform.make)
+AC_OUTPUT(include/Make/Grass.make include/Make/Platform.make)
+
+#remove first to avoid link tool problems (5.0 links):
 
-dnl mkdir -p mk src/CMD/head src/CMD/lists src/include
-dnl AC_OUTPUT(Makefile src/CMD/head/head src/CMD/lists/optional
-dnl 	mk/Makefile src/include/version.h src/include/winname.h)
+\rm -f include/version.h include/winname.h
+AC_OUTPUT(include/version.h include/winname.h)
 
 # Generate files for conventional (non-gmake5) build