[Wxlua-commit] wxLua/build/autoconf acregen.sh,1.5,1.6

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/build/autoconf
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10938/autoconf

Modified Files:
	acregen.sh 
Log Message:
Fix for aclocal version of 1.10 instead of 1.10.0


Index: acregen.sh
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/autoconf/acregen.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** acregen.sh	27 Jul 2007 14:11:59 -0000	1.5
--- acregen.sh	10 Jan 2008 00:06:53 -0000	1.6
***************
*** 1,3 ****
! #!/bin/bash 
  #
  # Author: Francesco Montorsi
--- 1,3 ----
! #!/bin/bash
  #
  # Author: Francesco Montorsi
***************
*** 36,52 ****
  aclocal_rel=`echo $aclocal_verfull | sed 's/aclocal (GNU automake) \([0-9]*\).\([0-9]*\).\([0-9]*\).*/\3/'`
  
  aclocal_minimal_maj=1
  aclocal_minimal_min=9
  aclocal_minimal_rel=6
  
! majok=$(expr $aclocal_maj \>= $aclocal_minimal_maj)
! minok=$(expr $aclocal_min \>= $aclocal_minimal_min)
! relok=$(expr $aclocal_rel \>= $aclocal_minimal_rel)
! 
! if [[ "$majok" = "0" ]]; then aclocalold; fi
! if [[ "$majok" = "1" && "$minok" = "0" ]]; then aclocalold; fi
! if [[ "$majok" = "1" && "$minok" = "1" && "$relok" = 0 ]]; then aclocalold; fi
! 
  
  
  
--- 36,53 ----
  aclocal_rel=`echo $aclocal_verfull | sed 's/aclocal (GNU automake) \([0-9]*\).\([0-9]*\).\([0-9]*\).*/\3/'`
  
+ # the version may only be 1.10 instead of 1.10.0
+ if [[ "x$aclocal_rel" = "x" ]]; then aclocal_rel=0; fi
+ 
  aclocal_minimal_maj=1
  aclocal_minimal_min=9
  aclocal_minimal_rel=6
  
! majok=$(expr $aclocal_maj \- $aclocal_minimal_maj)
! minok=$(expr $aclocal_min \- $aclocal_minimal_min)
! relok=$(expr $aclocal_rel \- $aclocal_minimal_rel)
  
+ if [[ $majok < 0 ]]; then aclocalold; fi
+ if [[ $majok = 0 && $minok < 0 ]]; then aclocalold; fi
+ if [[ $majok = 0 && $minok = 0 && $relok < 0 ]]; then aclocalold; fi
  
  
***************
*** 59,68 ****
  autoconf_minimal_min=60
  
! majok=$(expr $autoconf_maj \>= $autoconf_minimal_maj)
! minok=$(expr $autoconf_min \>= $autoconf_minimal_min)
! 
! if [[ "$majok" = "0" ]]; then autoconfold; fi
! if [[ "$majok" = "1" && "$minok" = "0" ]]; then autoconfold; fi
  
  
  
--- 60,68 ----
  autoconf_minimal_min=60
  
! majok=$(expr $autoconf_maj \- $autoconf_minimal_maj)
! minok=$(expr $autoconf_min \- $autoconf_minimal_min)
  
+ if [[ $majok < 0 ]]; then autoconfold; fi
+ if [[ $majok = 0 && $minok < 0 ]]; then autoconfold; fi