7ae49be47a
- Fix some buffer underruns on the terrain array (this bug could have been the cause of arbitrary crashes on some platforms). - Don't automatically pop up the city dialog when in observer mode. - Treat an alt-left click the same as a middle click, to allow two-button mice to work on windows (GTK-2 client). - Fix a bug - when a city was transferred/conquered twice the client sometimes wouldn't get an update about the second exchange. - Fix the behavior of Granary and Pyramids in the Civ2 compatibility ruleset. - Fix Pyramids so they are no longer cumulative with Granary. - Fix a minor bug that prevented 2.0 savegames from working properly with 1.14 Freeciv. Changes 2.0.3: - Fix some bugs that show up on 64-bit machines. - Fix some bugs with future techs in some situations. - Fix some bugs that allowed naval units onto land. - Fix a bug that could crash the server when a player picked their nation. - Fix a bug with player info not being updated after an alliance is broken. - Fix a bug with happiness of a unit's home city when borders change. - Fix a bug with happiness of a unit's home city when the unit moves. - Fix some bugs with nation starting positions in scenarios. - Fix a bug when running the server without stdin input. - Don't allow teams to be changed when loading a game. - Don't allow observers to vote. - Fix a bug with the fallback when generator 3, startpos 3 fails. - Fix a crash in the help dialog (when looking at Engineers). - Don't popup the caravan dialogs when in observer mode. - Fix a crash in goto mode when the mouse is near the map overview window. - Fix a bug when a diplomat is killed while the diplomat dialog window is in the process of opening. - Fix a bug with the diplomat dialog window for spies when you don't have an embassy.
193 lines
6.9 KiB
Text
193 lines
6.9 KiB
Text
$NetBSD: patch-aa,v 1.4 2005/08/24 10:36:41 adam Exp $
|
|
|
|
--- configure.orig 2005-08-23 16:22:20.000000000 +0000
|
|
+++ configure
|
|
@@ -12203,13 +12203,13 @@ echo "${ECHO_T}yes" >&6
|
|
|
|
|
|
|
|
- if (test $ac_tr_lib == HAVE_LIBX11 \
|
|
- || test $ac_tr_lib == HAVE_LIBXEXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXMU \
|
|
- || test $ac_tr_lib == HAVE_LIBXPM \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW3D); then
|
|
+ if (test $ac_tr_lib = HAVE_LIBX11 \
|
|
+ || test $ac_tr_lib = HAVE_LIBXEXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXMU \
|
|
+ || test $ac_tr_lib = HAVE_LIBXPM \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define $ac_tr_lib 1
|
|
_ACEOF
|
|
@@ -12316,13 +12316,13 @@ echo "${ECHO_T}yes" >&6
|
|
|
|
|
|
|
|
- if (test $ac_tr_lib == HAVE_LIBX11 \
|
|
- || test $ac_tr_lib == HAVE_LIBXEXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXMU \
|
|
- || test $ac_tr_lib == HAVE_LIBXPM \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW3D); then
|
|
+ if (test $ac_tr_lib = HAVE_LIBX11 \
|
|
+ || test $ac_tr_lib = HAVE_LIBXEXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXMU \
|
|
+ || test $ac_tr_lib = HAVE_LIBXPM \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define $ac_tr_lib 1
|
|
_ACEOF
|
|
@@ -12425,13 +12425,13 @@ echo "${ECHO_T}yes" >&6
|
|
|
|
|
|
|
|
- if (test $ac_tr_lib == HAVE_LIBX11 \
|
|
- || test $ac_tr_lib == HAVE_LIBXEXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXMU \
|
|
- || test $ac_tr_lib == HAVE_LIBXPM \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW3D); then
|
|
+ if (test $ac_tr_lib = HAVE_LIBX11 \
|
|
+ || test $ac_tr_lib = HAVE_LIBXEXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXMU \
|
|
+ || test $ac_tr_lib = HAVE_LIBXPM \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define $ac_tr_lib 1
|
|
_ACEOF
|
|
@@ -12530,13 +12530,13 @@ echo "${ECHO_T}yes" >&6
|
|
|
|
|
|
|
|
- if (test $ac_tr_lib == HAVE_LIBX11 \
|
|
- || test $ac_tr_lib == HAVE_LIBXEXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXMU \
|
|
- || test $ac_tr_lib == HAVE_LIBXPM \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW3D); then
|
|
+ if (test $ac_tr_lib = HAVE_LIBX11 \
|
|
+ || test $ac_tr_lib = HAVE_LIBXEXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXMU \
|
|
+ || test $ac_tr_lib = HAVE_LIBXPM \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define $ac_tr_lib 1
|
|
_ACEOF
|
|
@@ -12641,13 +12641,13 @@ echo "${ECHO_T}yes" >&6
|
|
|
|
|
|
|
|
- if (test $ac_tr_lib == HAVE_LIBX11 \
|
|
- || test $ac_tr_lib == HAVE_LIBXEXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXMU \
|
|
- || test $ac_tr_lib == HAVE_LIBXPM \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW3D); then
|
|
+ if (test $ac_tr_lib = HAVE_LIBX11 \
|
|
+ || test $ac_tr_lib = HAVE_LIBXEXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXMU \
|
|
+ || test $ac_tr_lib = HAVE_LIBXPM \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define $ac_tr_lib 1
|
|
_ACEOF
|
|
@@ -12749,13 +12749,13 @@ echo "${ECHO_T}yes" >&6
|
|
|
|
|
|
|
|
- if (test $ac_tr_lib == HAVE_LIBX11 \
|
|
- || test $ac_tr_lib == HAVE_LIBXEXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXMU \
|
|
- || test $ac_tr_lib == HAVE_LIBXPM \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW3D); then
|
|
+ if (test $ac_tr_lib = HAVE_LIBX11 \
|
|
+ || test $ac_tr_lib = HAVE_LIBXEXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXMU \
|
|
+ || test $ac_tr_lib = HAVE_LIBXPM \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define $ac_tr_lib 1
|
|
_ACEOF
|
|
@@ -12858,13 +12858,13 @@ echo "${ECHO_T}yes" >&6
|
|
|
|
|
|
|
|
- if (test $ac_tr_lib == HAVE_LIBX11 \
|
|
- || test $ac_tr_lib == HAVE_LIBXEXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXMU \
|
|
- || test $ac_tr_lib == HAVE_LIBXPM \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW3D); then
|
|
+ if (test $ac_tr_lib = HAVE_LIBX11 \
|
|
+ || test $ac_tr_lib = HAVE_LIBXEXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXMU \
|
|
+ || test $ac_tr_lib = HAVE_LIBXPM \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define $ac_tr_lib 1
|
|
_ACEOF
|
|
@@ -12967,13 +12967,13 @@ echo "${ECHO_T}yes" >&6
|
|
|
|
|
|
|
|
- if (test $ac_tr_lib == HAVE_LIBX11 \
|
|
- || test $ac_tr_lib == HAVE_LIBXEXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXMU \
|
|
- || test $ac_tr_lib == HAVE_LIBXPM \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW3D); then
|
|
+ if (test $ac_tr_lib = HAVE_LIBX11 \
|
|
+ || test $ac_tr_lib = HAVE_LIBXEXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXMU \
|
|
+ || test $ac_tr_lib = HAVE_LIBXPM \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define $ac_tr_lib 1
|
|
_ACEOF
|
|
@@ -13074,13 +13074,13 @@ echo "${ECHO_T}yes" >&6
|
|
|
|
|
|
|
|
- if (test $ac_tr_lib == HAVE_LIBX11 \
|
|
- || test $ac_tr_lib == HAVE_LIBXEXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXT \
|
|
- || test $ac_tr_lib == HAVE_LIBXMU \
|
|
- || test $ac_tr_lib == HAVE_LIBXPM \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW \
|
|
- || test $ac_tr_lib == HAVE_LIBXAW3D); then
|
|
+ if (test $ac_tr_lib = HAVE_LIBX11 \
|
|
+ || test $ac_tr_lib = HAVE_LIBXEXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXT \
|
|
+ || test $ac_tr_lib = HAVE_LIBXMU \
|
|
+ || test $ac_tr_lib = HAVE_LIBXPM \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW \
|
|
+ || test $ac_tr_lib = HAVE_LIBXAW3D); then
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define $ac_tr_lib 1
|
|
_ACEOF
|