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

WITH_AUTOMATION used to include auto4 (LUA 5.1), however it was not condusive

Browse source 
to including PERL or Ruby support.  This change supports the conditionals added
in r1889`.

Originally committed to SVN as r1899.
This commit is contained in:
Amar Takhar 2008-03-05 04:09:04 +00:00
parent a9984a2741
commit 5286ae1eb3
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
configure.in
View file

@ -318,7 +318,8 @@ fi
if (test "$with_lua_lib" != "no" || ! test "$have_lua_include" != "no") && test "$with_lua" != "no"; then if (test "$with_lua_lib" != "no" || ! test "$have_lua_include" != "no") && test "$with_lua" != "no"; then
with_auto4="yes" with_auto4="yes"
AC_DEFINE(WITH_AUTOMATION, 1, [Enable Automation (auto4), requires lua]) with_automation="yes"
AC_DEFINE(WITH_AUTO4_LUA, 1, [Enable Automation (auto4), requires lua])
else else
with_auto4="no" with_auto4="no"
fi fi
@ -346,6 +347,7 @@ if test -z "$perl_disabled"; then
if $PERL_BIN -e 'require 5.004'; then if $PERL_BIN -e 'require 5.004'; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
with_perl=yes with_perl=yes
with_automation="yes"
AC_DEFINE(WITH_PERL, 1, [Enable PERL support.]) AC_DEFINE(WITH_PERL, 1, [Enable PERL support.])
AC_MSG_CHECKING([checking $PERL_BIN clfags]) AC_MSG_CHECKING([checking $PERL_BIN clfags])
PERL_CFLAGS=`$PERL_BIN -MExtUtils::Embed -eccflags -eperl_inc` PERL_CFLAGS=`$PERL_BIN -MExtUtils::Embed -eccflags -eperl_inc`
@ -383,6 +385,7 @@ if test -z "$ruby_disabled"; then
if $RUBY_BIN -r rbconfig -e 'if Config::CONFIG@<:@"ruby_version"@:>@.to_f >= 1.8 then exit(0) else exit(1) end' ; then if $RUBY_BIN -r rbconfig -e 'if Config::CONFIG@<:@"ruby_version"@:>@.to_f >= 1.8 then exit(0) else exit(1) end' ; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
with_ruby=yes with_ruby=yes
with_automation="yes"
AC_DEFINE(WITH_RUBY, 1, [Enable RUBY Automation.]) AC_DEFINE(WITH_RUBY, 1, [Enable RUBY Automation.])
AC_MSG_CHECKING([checking $RUBY_BIN -r rbconfig archdir, cflags]) AC_MSG_CHECKING([checking $RUBY_BIN -r rbconfig archdir, cflags])
@ -431,8 +434,8 @@ if ! test -z "$lua50_lib_dir" && ! test -z "$lua50_include_dir"; then
fi fi
if test "$lua50_lib" = "yes" && test "$lua50_include" = "yes"; then if test "$lua50_lib" = "yes" && test "$lua50_include" = "yes"; then
with_auto3="yes" with_auto3="yes"
AC_DEFINE(WITH_AUTO3, 1, [Enable Automation (auto3, DEPRECIATED!), requires lua 5.0]) AC_DEFINE(WITH_AUTO3, 1, [Enable Automation (auto3, DEPRECIATED!), requires lua 5.0])
else else
with_auto3="no" with_auto3="no"
fi fi
@ -441,7 +444,13 @@ AM_CONDITIONAL([HAVE_AUTO3_LUA], [test "$with_auto3" != "no"])
AC_SUBST(LUA50_CPPFLAGS) AC_SUBST(LUA50_CPPFLAGS)
AC_SUBST(LUA50_LDFLAGS) AC_SUBST(LUA50_LDFLAGS)
echo "with_automation: ($with_automation)"
if test "$with_automation" = "yes"; then
echo "here"
AC_DEFINE(WITH_AUTOMATION, 1, [Enable Automation support, requires any automation language.])
fi
AM_CONDITIONAL([HAVE_AUTOMATION], [test "$with_auto3" = "yes"])
################ ################