mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Push linker/compiler flages up into the --with-lua* functions, this stops

Browse source 
empty flags from being passed.  I didn't notice beacuse I always have them
set.

Originally committed to SVN as r1876.
This commit is contained in:
Amar Takhar 2008-03-03 17:39:39 +00:00
parent 76ed1d4ad8
commit c86d525d98
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
configure.in
View file

@ -266,14 +266,15 @@ AC_ARG_WITH(lua,
[ --without-lua build without lua 5.1 (auto3)], [lua_disabled="(disabled)"]) [ --without-lua build without lua 5.1 (auto3)], [lua_disabled="(disabled)"])
AC_ARG_WITH(lua-lib, AC_ARG_WITH(lua-lib,
[ --with-lua-lib=PREFIX PATH location of lua 5.1 library], [lua_lib_dir="$withval"]) [ --with-lua-lib=PREFIX PATH location of lua 5.1 library], [lua_lib_dir="-L$withval"])
AC_ARG_WITH(lua-include, AC_ARG_WITH(lua-include,
[ --with-lua-include=PREFIX [ --with-lua-include=PREFIX
PATH location of lua 5.1 includes], [lua_include_dir="$withval"]) PATH location of lua 5.1 includes], [lua_include_dir="-I$withval"])
if test "$without_lua" != no; then if test "$without_lua" != no; then
aegisub_save_LDFLAGS="$LDFLAGS" aegisub_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$lua_lib_dir" LDFLAGS="$LDFLAGS -L$lua_lib_dir"
AC_CHECK_LIB([lua], [lua_call], LUA_LDFLAGS="-L$lua_lib_dir -llua", with_lua_lib=no) AC_CHECK_LIB([lua], [lua_call], LUA_LDFLAGS="-L$lua_lib_dir -llua", with_lua_lib=no)
LDFLAGS="$aegisub_save_LDFLAGS" LDFLAGS="$aegisub_save_LDFLAGS"
@ -375,11 +376,11 @@ AM_CONDITIONAL([HAVE_AUTO4_RUBY], [test "$with_ruby" != "no"])
AC_ARG_WITH(lua50-lib, AC_ARG_WITH(lua50-lib,
[ --with-lua50-lib=PREFIX PATH location of lua 5.0 library [ --with-lua50-lib=PREFIX PATH location of lua 5.0 library
(required for auto3 support)], [lua50_lib_dir="$withval"]) (required for auto3 support)], [lua50_lib_dir="-L$withval"])
AC_ARG_WITH(lua50-include, AC_ARG_WITH(lua50-include,
[ --with-lua50-include=PREFIX [ --with-lua50-include=PREFIX
PATH location of lua 5.0 includes PATH location of lua 5.0 includes
(required for auto3 support)], [lua50_include_dir="$withval"]) (required for auto3 support)], [lua50_include_dir="-I$withval"])
#if test -z "$lua50-lib-dir"; then #if test -z "$lua50-lib-dir"; then
@ -389,12 +390,12 @@ AC_ARG_WITH(lua50-include,
if ! test -z "$lua50_lib_dir" && ! test -z "$lua50_include_dir"; then if ! test -z "$lua50_lib_dir" && ! test -z "$lua50_include_dir"; then
aegisub_save_LDFLAGS="$LDFLAGS" aegisub_save_LDFLAGS="$LDFLAGS"
LDFLAGS="-L$lua50_lib_dir" LDFLAGS="-L$lua50_lib_dir"
AC_CHECK_LIB([lua], [lua_call],[LUA50_LDFLAGS="-L$lua50_lib_dir -llua"; lua50_lib="yes"], [lua50_lib="no"]) AC_CHECK_LIB([lua], [lua_call],[LUA50_LDFLAGS="$lua50_lib_dir -llua"; lua50_lib="yes"], [lua50_lib="no"])
LDFLAGS="$aegisub_save_LDFLAGS" LDFLAGS="$aegisub_save_LDFLAGS"
aegisub_save_CPPFLAGS="$CPPFLAGS" aegisub_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="-I$lua50_include_dir" CPPFLAGS="-I$lua50_include_dir"
AC_CHECK_HEADER([lua.h],[LUA50_CPPFLAGS="-I$lua50_include_dir"; lua50_include="yes"],[lua50_include="no"]) AC_CHECK_HEADER([lua.h],[LUA50_CPPFLAGS="$lua50_include_dir"; lua50_include="yes"],[lua50_include="no"])
CPPFLAGS="$aegisub_save_CPPFLAGS" CPPFLAGS="$aegisub_save_CPPFLAGS"
fi fi