From d9c5892f0a9b5338fd40858540e868d2fe5cd6bf Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Thu, 23 Jun 2011 15:17:37 +0200 Subject: [PATCH] Made autoconf aware of llvm-lua and rename --enable-luajit to the more correct --with-luajit --- configure.in | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/configure.in b/configure.in index e88aa3f95..4231aaf78 100644 --- a/configure.in +++ b/configure.in @@ -13,14 +13,17 @@ AC_SEARCH_LIBS([SDL_Init], [SDL], [], AC_MSG_ERROR([Can't LÖVE without SDL])) AC_SEARCH_LIBS([glLoadIdentity], [GL], [], AC_MSG_ERROR([Can't LÖVE without OpenGL])) #AC_SEARCH_LIBS([gluOrtho2D], [GLU], [], AC_MSG_ERROR([Can't LÖVE without OpenGL Utility Library])) AC_SEARCH_LIBS([alSourcePlay], [openal], [], AC_MSG_ERROR([Can't LÖVE without OpenAL])) -AC_ARG_ENABLE([luajit], - [ --enable-luajit Use LuaJIT instead of lua], - AC_SEARCH_LIBS( - [lua_pcall], - [luajit luajit-5.1], - AC_SUBST([INCLUDE_LUA], [-I/usr/include/luajit-2.0]), - AC_MSG_ERROR([Can't LÖVE without LuaJIT]) - ), +lua=lua +AC_ARG_WITH([luajit], + [AS_HELP_STRING([--with-luajit], [Use LuaJIT instead of lua and llvm-lua])], + [lua=luajit], + []) +AC_ARG_WITH([llvm-lua], + [AS_HELP_STRING([--with-llvm-lua], [Use llvm-lua instead of lua and LuaJIT])], + [lua=llvm-lua], + []) + +AS_IF([test "$lua" == "lua"], AC_SEARCH_LIBS( [lua_pcall], [lua lua5.1], @@ -29,7 +32,24 @@ AC_ARG_ENABLE([luajit], fi, AC_MSG_ERROR([Can't LÖVE without Lua]) ) -) + ) +AS_IF([test "$lua" == "luajit"], + AC_SEARCH_LIBS( + [lua_pcall], + [luajit luajit-5.1], + AC_SUBST([INCLUDE_LUA], [-I/usr/include/luajit-2.0]), + AC_MSG_ERROR([Can't LÖVE without LuaJIT]) + ) + ) +AS_IF([test "$lua" == "llvm-lua"], + AC_SEARCH_LIBS( + [lua_pcall], + [llvm-lua], + [], + AC_MSG_ERROR([Can't LÖVE without llvm-lua]) + ) + ) + AC_SEARCH_LIBS([ilInit], [IL], [], AC_MSG_ERROR([Can't LÖVE without DevIL])) AC_SEARCH_LIBS([mng_initialize], [mng], [], AC_MSG_ERROR([DevIL needs MNG])) AC_SEARCH_LIBS([TIFFOpen], [tiff], [], AC_MSG_ERROR([DevIL needs TIFF]))