Changeset 8707 in orxonox.OLD

Timestamp:

Jun 22, 2006, 12:46:29 PM (18 years ago)

Author:

bensch

Message:

merged the lua-download-script back

File:

• trunk/acinclude.m4 (modified) (2 diffs)

trunk/acinclude.m4

@@ -278 +278 @@
 
 AC_CHECK_LIB([dl], [dlopen])
-AX_CHECK_REQUIRED_HEADER_LIB([lua.h], [lua lua50], [lua_open],,,)
-AX_CHECK_REQUIRED_HEADER_LIB([lualib.h], [lualib lualib50], [luaopen_base])
-#dnl libLUA found
-#     [LUA_LIBS="${LUA_LIBS} -l${LAST_FOUND_LIB}"  AX_CHECK_REQUIRED_HEADER_LIB([lualib.h], [lualib lualib50], [luaopen_base],
+AX_CHECK_REQUIRED_HEADER_LIB([lua.h], [lua lua50], [lua_open],
+dnl libLUA found
+     [LUA_LIBS="${LUA_LIBS} -l${LAST_FOUND_LIB}"  AX_CHECK_REQUIRED_HEADER_LIB([lualib.h], [lualib lualib50], [luaopen_base],
 dnl liblualib found
-#      [LUA_LIBS="${LUA_LIBS} -l${LAST_FOUND_LIB}"],,
-#      [http://www.lua.org],, [${LUA_LIBS} -ldl -lm])],
-#dnl liblua not found (download it)
-#       [AX_GET_INSTALL_NECESSARY_LIB([http://www.lua.org/ftp], [lua-5.0.tar.gz], [lua-5.0], [extern_libs/], [include/*.h lib/*.a])
-#       LUA_LIBS="-llualib -llua"  LUA_INCLUDES="-I$(top_build_dir)/extern_libs" ], [http://www.lua.org])
+      [LUA_LIBS="${LUA_LIBS} -l${LAST_FOUND_LIB}"],,
+      [http://www.lua.org],, [${LUA_LIBS} -ldl -lm])],
+dnl liblua not found (download it)
+       [AX_GET_INSTALL_NECESSARY_LIB([http://www.lua.org/ftp], [lua-5.0.tar.gz], [lua-5.0], [extern_libs/], [include/*.h lib/*.a])
+       LUA_LIBS="-llualib -llua"  LUA_INCLUDES="-I$(top_build_dir)/extern_libs" ], [http://www.lua.org])
 
 AC_SUBST([LUA_LIBS])
@@ -341 +340 @@
 
 #cleaning up
-#  echo "rm -rf ${_get_install_DISTDIR}"
-#  rm -rf ${_get_install_DISTDIR}
-#  echo "rm ${_get_install_DISTFILE}"
-#  rm ${_get_install_DISTFILE}
-])
+  echo "rm -rf ${_get_install_DISTDIR}"
+  rm -rf ${_get_install_DISTDIR}
+  echo "rm ${_get_install_DISTFILE}"
+  rm ${_get_install_DISTFILE}
+])