From 83e9b7a994aec17d10fe9a46ea1aedb5e4e2c623 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Mon, 2 Jan 2006 20:24:33 +0000
Subject: [PATCH] slightly improved, but still hackish way to recognize luabind
 versions.

---
 src/eressea/lua/building.cpp   |  2 +-
 src/eressea/lua/faction.cpp    |  2 +-
 src/eressea/lua/message.cpp    |  2 +-
 src/eressea/lua/objects.cpp    |  2 +-
 src/eressea/lua/region.cpp     |  2 +-
 src/eressea/lua/script.cpp     |  2 +-
 src/eressea/lua/ship.cpp       |  2 +-
 src/eressea/lua/unit.cpp       |  2 +-
 src/eressea/server.cpp         |  4 ++--
 src/lua.hpp                    | 13 ++++++++++---
 src/res/eressea/de/strings.xml |  2 +-
 11 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/eressea/lua/building.cpp b/src/eressea/lua/building.cpp
index 8cd0e260c..30e74ee9a 100644
--- a/src/eressea/lua/building.cpp
+++ b/src/eressea/lua/building.cpp
@@ -14,7 +14,7 @@
 #include <lua.hpp>
 #include <luabind/luabind.hpp>
 #include <luabind/iterator_policy.hpp>
-#ifdef HAVE_LUABIND_B7
+#if LUABIND_BETA >= 7
 # include <luabind/operator.hpp>
 #endif
 
diff --git a/src/eressea/lua/faction.cpp b/src/eressea/lua/faction.cpp
index bb75f0ae0..fa2a1ea8f 100644
--- a/src/eressea/lua/faction.cpp
+++ b/src/eressea/lua/faction.cpp
@@ -25,7 +25,7 @@
 #include <luabind/iterator_policy.hpp>
 #include <luabind/out_value_policy.hpp>
 #include <luabind/copy_policy.hpp>
-#ifdef HAVE_LUABIND_B7
+#if LUABIND_BETA >= 7
 # include <luabind/operator.hpp>
 #endif
 
diff --git a/src/eressea/lua/message.cpp b/src/eressea/lua/message.cpp
index a5121c4c1..44d848867 100644
--- a/src/eressea/lua/message.cpp
+++ b/src/eressea/lua/message.cpp
@@ -15,7 +15,7 @@
 #include <lua.hpp>
 #include <luabind/luabind.hpp>
 #include <luabind/iterator_policy.hpp>
-#ifdef HAVE_LUABIND_B7
+#if LUABIND_BETA >= 7
 # include <luabind/operator.hpp>
 #endif
 
diff --git a/src/eressea/lua/objects.cpp b/src/eressea/lua/objects.cpp
index 64d4d0381..ba233b034 100644
--- a/src/eressea/lua/objects.cpp
+++ b/src/eressea/lua/objects.cpp
@@ -52,7 +52,7 @@ namespace eressea {
         }
       }
     }
-#ifdef LUABIND_OLD
+#if LUABIND_BETA<7 || (LUABIND_BETA==7 && LUABIND_DEVEL<2)
     return object(L); // nil
 #else
     return object(); // nil
diff --git a/src/eressea/lua/region.cpp b/src/eressea/lua/region.cpp
index 95aadd8dc..8b39d9a7a 100644
--- a/src/eressea/lua/region.cpp
+++ b/src/eressea/lua/region.cpp
@@ -17,7 +17,7 @@
 #include <lua.hpp>
 #include <luabind/luabind.hpp>
 #include <luabind/iterator_policy.hpp>
-#ifdef HAVE_LUABIND_B7
+#if LUABIND_BETA >= 7
 # include <luabind/operator.hpp>
 #endif
 
diff --git a/src/eressea/lua/script.cpp b/src/eressea/lua/script.cpp
index 7757167c8..cafc87804 100644
--- a/src/eressea/lua/script.cpp
+++ b/src/eressea/lua/script.cpp
@@ -192,7 +192,7 @@ lua_changeresource(unit * u, const struct resource_type * rtype, int delta)
 bool
 is_function(struct lua_State * luaState, const char * fname)
 {
-#ifndef LUABIND_OLD
+#if LUABIND_BETA>7 || (LUABIND_BETA==7 && LUABIND_DEVEL>=2)
   object g = globals(luaState);
   object fun = g[fname];
   if (fun.is_valid()) {
diff --git a/src/eressea/lua/ship.cpp b/src/eressea/lua/ship.cpp
index c8543e3b2..c1d42957e 100644
--- a/src/eressea/lua/ship.cpp
+++ b/src/eressea/lua/ship.cpp
@@ -11,7 +11,7 @@
 #include <lua.hpp>
 #include <luabind/luabind.hpp>
 #include <luabind/iterator_policy.hpp>
-#ifdef HAVE_LUABIND_B7
+#if LUABIND_BETA >= 7
 # include <luabind/operator.hpp>
 #endif
 
diff --git a/src/eressea/lua/unit.cpp b/src/eressea/lua/unit.cpp
index 13f45b0a5..c48b223db 100644
--- a/src/eressea/lua/unit.cpp
+++ b/src/eressea/lua/unit.cpp
@@ -31,7 +31,7 @@
 #include <lua.hpp>
 #include <luabind/luabind.hpp>
 #include <luabind/iterator_policy.hpp>
-#ifdef HAVE_LUABIND_B7
+#if LUABIND_BETA>=7
 # include <luabind/operator.hpp>
 #endif
 
diff --git a/src/eressea/server.cpp b/src/eressea/server.cpp
index 7110f5d6e..1e8239d4b 100644
--- a/src/eressea/server.cpp
+++ b/src/eressea/server.cpp
@@ -458,7 +458,7 @@ usage(const char * prog, const char * arg)
 static void
 setLuaString(lua_State * luaState, const char * name, const char * value)
 {
-#ifdef LUABIND_OLD
+#if LUABIND_BETA<7 || (LUABIND_BETA==7 && LUABIND_DEVEL<2)
   luabind::object g = luabind::get_globals(luaState);
 #else
   luabind::object g = luabind::globals(luaState);
@@ -469,7 +469,7 @@ setLuaString(lua_State * luaState, const char * name, const char * value)
 static void
 setLuaNumber(lua_State * luaState, const char * name, double value)
 {
-#ifdef LUABIND_OLD
+#if LUABIND_BETA<7 || (LUABIND_BETA==7 && LUABIND_DEVEL<2)
   luabind::object g = luabind::get_globals(luaState);
 #else
   luabind::object g = luabind::globals(luaState);
diff --git a/src/lua.hpp b/src/lua.hpp
index 1d6177c83..c7216703d 100644
--- a/src/lua.hpp
+++ b/src/lua.hpp
@@ -3,7 +3,14 @@ extern "C" {
 #include <lua50/lauxlib.h>
 #include <lua50/lualib.h>
 }
-#include <boost/version.hpp>
-#if BOOST_VERSION < 103300
-# define LUABIND_OLD
+
+#ifndef LUABIND_BETA
+# include <boost/version.hpp>
+# if BOOST_VERSION < 103300
+#  define LUABIND_BETA 7
+#  define LUABIND_DEVEL 1
+# else
+#  define LUABIND_BETA 7
+#  define LUABIND_DEVEL 2
+# endif
 #endif
diff --git a/src/res/eressea/de/strings.xml b/src/res/eressea/de/strings.xml
index a234fbae7..b7f239388 100644
--- a/src/res/eressea/de/strings.xml
+++ b/src/res/eressea/de/strings.xml
@@ -38,7 +38,7 @@
          region of Muschelplateau.
       </text>
       <text locale="de">
-        Dieses Abzeichen identifiziert die Partei seines Träger offiziell
+        Dieses Abzeichen identifiziert die Partei seines Trägers offiziell
         als einen Besucher der Botschafterregion 'Muschelplateau'.
       </text>
     </string>