[luabind-cvs] luabind/luabind Jamfile,1.7,1.8

[Arvid N. <ar...@us...>]

Update of /cvsroot/luabind/luabind/luabind
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv343/luabind

Modified Files:
	Jamfile 
Log Message:
added luabind::nil and assignment operators to handle it

Index: Jamfile
===================================================================
RCS file: /cvsroot/luabind/luabind/luabind/Jamfile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Jamfile	29 May 2006 18:30:41 -0000	1.7
+++ Jamfile	13 Jun 2006 23:27:57 -0000	1.8
@@ -5,47 +5,55 @@
 BOOST_ROOT = [ modules.peek : BOOST_ROOT ] ;
 LUA_PATH = [ modules.peek : LUA_PATH ] ;
 
-if ! $(LUA_PATH)
-{
-    errors.user-error
-        "LUA_PATH needs to be set to point to your Lua5.x directory." ;
-}
-
-#if ! [ GLOB $(LUA_PATH)/include : lua.h ]
-#{
-#    errors.user-error
-#        "LUA_PATH seems to point to a broken Lua5.x installation." :
-#        "Currently set to $(LUA_PATH)" ;
-#}
-
 if ! $(BOOST_ROOT)
 {
     errors.user-error
         "BOOST_ROOT must be set to your boost installation path." ;
 }
 
-lib lua
-    :
-    : <name>lua <search>$(LUA_PATH)/lib
-      <search>$(LUA_PATH)/src
+if ! $(LUA_PATH)
+{
+    ECHO LUA_PATH not specified. using pkg-config to find lua
+    alias lua : : : :
+        <cflags>"`pkg-config --cflags lua5.1`"
+        <linkflags>"`pkg-config --libs lua5.1`"
     ;
 
-lib lualib
+    lib lualib : ;
+
+#    alias lualib : : : :
+#        <lua-version>5:<cflags>"`pkg-config --cflags lualib50`"
+#        <lua-version>5:<linkflags>"`pkg-config --libs lualib50`"
+#    ;
+}
+else
+{
+    lib lua :
+    : <name>lua <search>$(LUA_PATH)/lib
+      <search>$(LUA_PATH)/src
     :
-    : <name>lualib <search>$(LUA_PATH)/lib
+    : <include>$(LUA_PATH)/include
+      <include>$(LUA_PATH)/src
     ;
 
+    lib lualib : ;
+
+#    lib lualib :
+#        <lua-version>5:<name>lualib <search>$(LUA_PATH)/lib
+#      : <lua-version>5:<include>$(LUA_PATH)/include
+#        <lua-version>5:<include>$(LUA_PATH)/src
+#    ;
+}
+
 project luabind
     : requirements
-        <include>./ <include>$(BOOST_ROOT) <include>$(LUA_PATH)/include/
-        <include>$(LUA_PATH)/src/
+        <include>./ <include>$(BOOST_ROOT)
         <library>/luabind//lua
-#        <library>/luabind//lualib
+#        <library>/lualib
         <toolset>msvc,<link>shared:<define>LUABIND_IMPORT=__declspec(dllimport)
         <toolset>msvc,<link>shared:<define>LUABIND_EXPORT=__declspec(dllexport)
     : usage-requirements
-        <include>./ <include>$(BOOST_ROOT) <include>$(LUA_PATH)/include/
-        <include>$(LUA_PATH)/src/
+        <include>./ <include>$(BOOST_ROOT)
         <toolset>msvc,<link>shared:<define>LUABIND_IMPORT=__declspec(dllimport)
         <toolset>msvc,<link>shared:<define>LUABIND_EXPORT=__declspec(dllexport)
     ;