[SCM] Maintenance of the burgerspace game branch, master, updated. debian/1.8.3-3-3-ged242b8

[Francois Marier]

The following commit has been merged in the master branch:
commit 54bd65273e1d33cc3760421e8e54c1180a07b240
Merge: 99081e5a47af65a8b0427c7b431a0c6459fba4c4 8eac5b74a88b9bdfc598ef62269be7c173d98c7c
Author: Francois Marier <francois at debian.org>
Date:   Thu Apr 1 08:07:31 2010 +1300

    Merge commit 'upstream/1.8.4'
    
    Conflicts:
    	config.guess
    	config.sub
    	configure

diff --combined configure.ac
index 8fa9b94,975eb95..e8ac234
--- a/configure.ac
+++ b/configure.ac
@@@ -1,22 -1,22 +1,22 @@@
- # $Id: configure.ac,v 1.12 2009/02/27 02:50:42 sarrazip Exp $
+ # $Id: configure.ac,v 1.14 2010/03/31 02:05:48 sarrazip Exp $
  
  AC_PREREQ(2.50)
  AC_INIT(src/BurgerSpaceEngine.h)
  AC_CANONICAL_HOST
  AC_CANONICAL_SYSTEM
- AM_INIT_AUTOMAKE(burgerspace, 1.8.3)
+ AM_INIT_AUTOMAKE(burgerspace, 1.8.4)
  
  
  # Checks for programs.
  
  AC_PROG_CXX
 -AC_COMPILE_WARNINGS
 +#AC_COMPILE_WARNINGS
  AC_LANG_CPLUSPLUS
  
  
  # Checks for libraries.
  
- MINVER_FLATZEBRA=0.1.2;		AC_SUBST(MINVER_FLATZEBRA)
+ MINVER_FLATZEBRA=0.1.4;		AC_SUBST(MINVER_FLATZEBRA)
  PKG_CHECK_MODULES(FLATZEBRA, flatzebra-0.1 >= $MINVER_FLATZEBRA)
  
  

-- 
Maintenance of the burgerspace game