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

Remove Auto4 PERL from the build system, updates #840 and #938.

Browse source 
Originally committed to SVN as r3203.
This commit is contained in:
Amar Takhar 2009-07-23 01:18:51 +00:00
parent d8c7515975
commit 3403a5faea
3 changed files with 0 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
aegisub/automation/Makefile.am
View file

@ -21,10 +21,6 @@ data_auto4_lua = \
include/utils-auto4.lua \
include/utils.lua
data_auto4_perl = \
autoload/macro-1p-edgeblur.pl \
include/Aegisub/PerlConsole.pm
data_auto4_ruby = \
include/karaoke.rb \
include/utils.rb
@ -47,10 +43,6 @@ data_auto4_lua_doc = \
demos/future-windy-blur.lua \
demos/raytracer.lua
data_auto4_perl_doc = \
demos/perl-console.pl \
v4-docs/perl-api.txt
data_auto4_ruby_doc = \
demos/k-replacer.rb
@ -68,11 +60,6 @@ nobase_automation_DATA += $(data_auto4_lua)
nobase_share_doc_DATA += $(data_auto4_lua_doc)
endif
if HAVE_AUTO4_PERL
nobase_automation_DATA += $(data_auto4_perl)
nobase_share_doc_DATA += $(data_auto4_perl_doc)
endif
if HAVE_AUTO4_RUBY
nobase_automation_DATA += $(data_auto4_ruby)
nobase_share_doc_DATA += $(data_auto4_ruby_doc)
@ -82,9 +69,7 @@ endif
EXTRA_DIST = \
$(data_general) \
$(data_auto4_lua) \
$(data_auto4_perl) \
$(data_auto4_ruby) \
$(data_general_doc) \
$(data_auto4_lua_doc) \
$(data_auto4_perl_doc) \
$(data_auto4_ruby_doc)

74
aegisub/configure.in
View file

@ -25,7 +25,6 @@ m4_define([pulseaudio_required_version], [0.5])
m4_define([fontconfig_required_version], [2.4])
m4_define([freetype_required_version], [9.7.0])
m4_define([perl_required_version], [5.004])
m4_define([pkgconfig_required_version], [0.20])
m4_define([ruby_required_version], [1.8])
m4_define([wx_required_version], [2.8.1])
@ -254,7 +253,6 @@ if test "$enable_compiler_flags" != "no"; then
AC_CXX_FLAG([-Wno-long-long])
AC_CXX_FLAG([-fpermissive])
AC_CXX_FLAG([-fno-strict-aliasing])
AC_CXX_FLAG([-std=c++98])
AC_CXX_FLAG([-pipe])
# -O* messes with debugging.
@ -809,78 +807,6 @@ AC_SUBST(LUA_CFLAGS)
AC_SUBST(LUA_LDFLAGS)
#############
## Auto4 PERL
#############
AC_ARG_WITH(perl, [ --without-perl build without PERL Automation. (default: auto)], perl_disabled="(disabled)")
AC_ARG_WITH(perl-bin, [ --with-perl-bin=PATH location of PERL binary. (default: $PATH)], [WITH_PERL_BIN="$withval"])
AC_ARG_VAR([PERL_CFLAGS], [CFLAGS to use for Perl (default: -MExtUtils::Embed -eccflags -eperl_inc)])
AC_ARG_VAR([PERL_LDFLAGS], [LDFLAGS to use for Perl (default: -MExtUtils::Embed -eldopts)])
if test "$with_perl" != "no"; then
if test -z "$WITH_PERL_BIN"; then
AC_PATH_PROG([PERL_BIN],perl,no)
else
PERL_BIN="$WITH_PERL_BIN"
fi
if test "$PERL_BIN" != "no"; then
AC_CACHE_CHECK(
[checking for perl version >= perl_required_version], [with_cv_perl],
[if $PERL_BIN -e 'require perl_required_version'; then with_cv_perl="yes"; else with_cv_perl="no"; fi])
if test "$with_cv_perl" = "yes"; then
AC_MSG_CHECKING([$PERL_BIN cflags])
if test -z "$PERL_CFLAGS"; then
PERL_CFLAGS=`$PERL_BIN -MExtUtils::Embed -eccflags -eperl_inc`
fi
AC_MSG_RESULT([$PERL_CFLAGS])
AC_MSG_CHECKING([$PERL_BIN libs])
if test -z "$PERL_LDFLAGS"; then
PERL_LDFLAGS=`$PERL_BIN -MExtUtils::Embed -eldopts`
fi
AC_MSG_RESULT([$PERL_LDFLAGS])
AC_AGI_COMPILE([Perl], [perl], [$PERL_CFLAGS], [$PERL_LDFLAGS],[
#include <EXTERN.h>
#include <perl.h>
int main(int argc, char **argv, char **env) {
static PerlInterpreter *my_perl;
PERL_SYS_INIT3(&argc,&argv,&env);
my_perl = perl_alloc();
if (!my_perl) return 1;
return 0;
}])
fi
fi
fi
if test "$agi_cv_with_perl" = "no" && test "$with_cv_perl" = "yes"; then
AC_MSG_WARN([Perl detected, but it doesn't work...])
with_cv_perl="no"
fi
if test "$agi_cv_with_perl" = "yes" && test "$with_cv_perl" = "yes"; then
with_automation="yes"
AC_DEFINE(WITH_PERL, 1, [Enable PERL support.])
else
with_cv_perl="no"
fi
AM_CONDITIONAL([HAVE_AUTO4_PERL], [test "$with_cv_perl" != "no"])
AC_SUBST(PERL_CFLAGS)
AC_SUBST(PERL_LDFLAGS)
AC_ARG_ENABLE(perl-console, [ --disable-perl-console disable PERL console (default=enabled)],perlconsole_disabled="(disabled)")
if test "$with_cv_perl" = "yes" && test "$enable_perlconsole" != "no"; then
AC_DEFINE(WITH_PERLCONSOLE, 1, [Enable PERL Console support (for debugging purposes)])
fi
#############
## Auto4 Ruby
#############

10
aegisub/src/Makefile.am
View file

@ -104,14 +104,6 @@ LIBS += @LUA_LDFLAGS@
aegisub_2_2_LDADD += libauto4_lua.a
endif
if HAVE_AUTO4_PERL
noinst_LIBRARIES += libauto4_perl.a
libauto4_perl_a_SOURCES = auto4_perl.cpp auto4_perl_script.cpp auto4_perl_dialogs.cpp auto4_perl_ass.cpp auto4_perl_console.cpp auto4_perl.h auto4_perl_console.h
libauto4_perl_a_CPPFLAGS = @PERL_CFLAGS@
LIBS += @PERL_LDFLAGS@
aegisub_2_2_LDADD += libauto4_perl.a
endif
if HAVE_AUTO4_RUBY
noinst_LIBRARIES += libauto4_ruby.a
libauto4_ruby_a_SOURCES = auto4_ruby_assfile.cpp auto4_ruby.cpp auto4_ruby_dialog.cpp
@ -337,5 +329,3 @@ noinst_HEADERS = \
$(srcdir)/*.hxx \
osx_bevelButton.h
EXTRA_DIST = \
auto4_perldata.inc