[SCM] Maintenance of the burgerspace game branch, master, updated. debian/1.8.2-5-4-g2c7c881
Francois Marier
francois at debian.org
Fri Feb 27 11:27:31 UTC 2009
The following commit has been merged in the master branch:
commit 28890e37e49acec267d8336b333b4582f84a9791
Merge: 29a631087b758c501065dfa29a3c8875da3359e8 8c92fb466b2922173f6bc9bfc76a7075a3e9bd80
Author: Francois Marier <francois at debian.org>
Date: Sat Feb 28 00:10:18 2009 +1300
Merge commit 'upstream/1.8.3'
Conflicts:
config.guess
diff --combined configure
index b82bff2,caa1d8b..e17a578
--- a/configure
+++ b/configure
@@@ -2206,7 -2206,7 +2206,7 @@@ f
# Define the identity of the package.
PACKAGE=burgerspace
- VERSION=1.8.2
+ VERSION=1.8.3
cat >>confdefs.h <<_ACEOF
@@@ -3133,7 -3133,32 +3133,7 @@@ els
fi
-{ echo "$as_me:$LINENO: checking maximum warning verbosity option" >&5
-echo $ECHO_N "checking maximum warning verbosity option... $ECHO_C" >&6; }
-if test -n "$CXX"
-then
- if test "$GXX" = "yes"
- then
- ac_compile_warnings_opt='-Wall'
- fi
- CXXFLAGS="$CXXFLAGS $ac_compile_warnings_opt"
- ac_compile_warnings_msg="$ac_compile_warnings_opt for C++"
-fi
-
-if test -n "$CC"
-then
- if test "$GCC" = "yes"
- then
- ac_compile_warnings_opt='-Wall'
- fi
- CFLAGS="$CFLAGS $ac_compile_warnings_opt"
- ac_compile_warnings_msg="$ac_compile_warnings_msg $ac_compile_warnings_opt for C"
-fi
-{ echo "$as_me:$LINENO: result: $ac_compile_warnings_msg" >&5
-echo "${ECHO_T}$ac_compile_warnings_msg" >&6; }
-unset ac_compile_warnings_msg
-unset ac_compile_warnings_opt
-
+#AC_COMPILE_WARNINGS
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@@ -3144,7 -3169,7 +3144,7 @@@ ac_compiler_gnu=$ac_cv_cxx_compiler_gn
# Checks for libraries.
- MINVER_FLATZEBRA=0.1.0;
+ MINVER_FLATZEBRA=0.1.2;
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@@ -3270,11 -3295,10 +3270,10 @@@ pkg_failed=n
{ echo "$as_me:$LINENO: checking for FLATZEBRA" >&5
echo $ECHO_N "checking for FLATZEBRA... $ECHO_C" >&6; }
- if test -n "$PKG_CONFIG"; then
- if test -n "$FLATZEBRA_CFLAGS"; then
- pkg_cv_FLATZEBRA_CFLAGS="$FLATZEBRA_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$FLATZEBRA_CFLAGS"; then
+ pkg_cv_FLATZEBRA_CFLAGS="$FLATZEBRA_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"flatzebra-0.1 >= \$MINVER_FLATZEBRA\"") >&5
($PKG_CONFIG --exists --print-errors "flatzebra-0.1 >= $MINVER_FLATZEBRA") 2>&5
ac_status=$?
@@@ -3284,15 -3308,13 +3283,13 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
- if test -n "$PKG_CONFIG"; then
- if test -n "$FLATZEBRA_LIBS"; then
- pkg_cv_FLATZEBRA_LIBS="$FLATZEBRA_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+ if test -n "$FLATZEBRA_LIBS"; then
+ pkg_cv_FLATZEBRA_LIBS="$FLATZEBRA_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"flatzebra-0.1 >= \$MINVER_FLATZEBRA\"") >&5
($PKG_CONFIG --exists --print-errors "flatzebra-0.1 >= $MINVER_FLATZEBRA") 2>&5
ac_status=$?
@@@ -3302,9 -3324,8 +3299,8 @@@
else
pkg_failed=yes
fi
- fi
- else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@@ -3317,9 -3338,9 +3313,9 @@@ els
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- FLATZEBRA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "flatzebra-0.1 >= $MINVER_FLATZEBRA"`
+ FLATZEBRA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "flatzebra-0.1 >= $MINVER_FLATZEBRA" 2>&1`
else
- FLATZEBRA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "flatzebra-0.1 >= $MINVER_FLATZEBRA"`
+ FLATZEBRA_PKG_ERRORS=`$PKG_CONFIG --print-errors "flatzebra-0.1 >= $MINVER_FLATZEBRA" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$FLATZEBRA_PKG_ERRORS" >&5
@@@ -3356,7 -3377,7 +3352,7 @@@ Alternatively, you may set the environm
and FLATZEBRA_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
- To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@@ -3366,7 -3387,7 +3362,7 @@@ Alternatively, you may set the environm
and FLATZEBRA_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
- To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@@@ -5376,7 -5397,7 +5372,7 @@@ echo "$as_me: executing $ac_file comman
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
diff --combined configure.ac
index c899e3f,a111394..8fa9b94
--- a/configure.ac
+++ b/configure.ac
@@@ -1,22 -1,22 +1,22 @@@
- # $Id: configure.ac,v 1.8 2007/12/22 23:03:35 sarrazip Exp $
+ # $Id: configure.ac,v 1.12 2009/02/27 02:50:42 sarrazip Exp $
AC_PREREQ(2.50)
AC_INIT(src/BurgerSpaceEngine.h)
AC_CANONICAL_HOST
AC_CANONICAL_SYSTEM
- AM_INIT_AUTOMAKE(burgerspace, 1.8.2)
+ AM_INIT_AUTOMAKE(burgerspace, 1.8.3)
# Checks for programs.
AC_PROG_CXX
-AC_COMPILE_WARNINGS
+#AC_COMPILE_WARNINGS
AC_LANG_CPLUSPLUS
# Checks for libraries.
- MINVER_FLATZEBRA=0.1.0; AC_SUBST(MINVER_FLATZEBRA)
+ MINVER_FLATZEBRA=0.1.2; AC_SUBST(MINVER_FLATZEBRA)
PKG_CHECK_MODULES(FLATZEBRA, flatzebra-0.1 >= $MINVER_FLATZEBRA)
--
Maintenance of the burgerspace game
More information about the Pkg-games-commits
mailing list