mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity
2554 commits 10 branches 31 tags 48 MiB
Commit graph

142 commits

Author SHA1 Message Date
Amar Takhar
b9e9ab7906 The swscale check was enabling ffmpeg without checking if ffmpeg had been 
detected or not.  This reworks how ffmpeg is detected and it is now _disabled_
if swscale does not exist.  Also fix some nearby style issues.

Originally committed to SVN as r2192.
 2008-05-14 15:15:52 +00:00
Amar Takhar
37a50cd97d Fix hunspell run-check, NULL,NULL used to work fine for the aff/dic path in 
<1.2 but it segfaults in >1.2.  They've been changed to ".","." which works
fine.

Originally committed to SVN as r2188.
 2008-04-25 20:47:13 +00:00
Amar Takhar
86d02ede5e Make hunspell 1.2.0 the default, no sense in supporting the old version. 
Originally committed to SVN as r2187.
 2008-04-25 04:39:49 +00:00
Amar Takhar
ecf30d37d7 Make --without-hunspell work correctly. 
Originally committed to SVN as r2186.
 2008-04-25 02:28:05 +00:00
Amar Takhar
fa125abc3a s/.../../ and s/.././ where required for consistency. 
Originally committed to SVN as r2183.
 2008-04-20 14:53:59 +00:00
Amar Takhar
03953062c2 Add missing AC_DEFINE for WITH_HUNSPELL, without this hunspell was not being 
activated.  I've just verified that it works fine.

Originally committed to SVN as r2182.
 2008-04-20 14:52:09 +00:00
Amar Takhar
d0de1fe366 s/return;/return 0;/ for the Freetype run-check, bug #700, thank you! 
Originally committed to SVN as r2181.
 2008-04-14 20:47:22 +00:00
Amar Takhar
b012a3149c Freetype/Fontconfig were pushed under two conditionals beacuse on Darwin we use 
Freetype to list fonts (it uses native features).  When support for glibc iconv
was added the case broke and set $build_linux, the conditional for the
fontconfig font lister was $build_default which no longer got triggered.  Puts
the font listers under FONTLISTER_(FONTCONFIG|FREETYPE) conditional upon
$build_darwin being no/yes.

Originally committed to SVN as r2180.
 2008-04-13 17:44:54 +00:00
Amar Takhar
806ba1eb5a Fix with_csri test, I typoed it without spaces which test requires. This was 
forcing CSRI on in every condition.

Originally committed to SVN as r2179.
 2008-04-13 17:00:23 +00:00
Amar Takhar
4966c21cc8 Fix alignment of --help messages. 
Originally committed to SVN as r2176.
 2008-04-13 05:55:40 +00:00
Amar Takhar
870b2cf2e7 Fix --enable-wx-styledtextctrl,--enable-wx-opengl and rename them to 
--disable-check-wx-stc / --disable-check-wx-opengl which makes more sense.

Originally committed to SVN as r2175.
 2008-04-13 05:52:24 +00:00
Amar Takhar
aa7cc5a2dc Add support for CSRI (ASA), this has been tested and confirmed as working. 
Compiling libass/asa in at the same time is OK.

Originally committed to SVN as r2174.
 2008-04-13 05:10:27 +00:00
Amar Takhar
a2d584c115 Add missing 'test' before iconv linux check. 
Originally committed to SVN as r2172.
 2008-04-11 16:13:08 +00:00
Amar Takhar
b19daec0ae Move iconv out of the libass check block and under 'program features' (in 
preperation for asa support which requires iconv as well.)

Originally committed to SVN as r2171.
 2008-04-11 15:17:00 +00:00
Amar Takhar
041820e259 Remove -liconv from the default LDFLAGS if we're building on linux, since iconv 
support is built-in.  If this ever causes an issue between glibc and iconv
support I'll add a warning.

Originally committed to SVN as r2170.
 2008-04-10 16:15:26 +00:00
Amar Takhar
016dbfca80 add a missing } in the hunspell run-check (reported by sl1pkn07 via IRC) 
Originally committed to SVN as r2168.
 2008-04-06 03:12:35 +00:00
Amar Takhar
c03fc5b447 Switch iconv support to use AC_AGI_COMPILE. 
Originally committed to SVN as r2165.
 2008-04-01 18:49:01 +00:00
Amar Takhar
b38e6582c2 Fix Lua 5.0 (auto3) and Lua 5.1 (auto4) detection to use AC_AGI_COMPILE, Lua 5.1 
requires LIBS= to be set to pull the Lua symbols in properly, this is a temp
solution until we move to modules.

Originally committed to SVN as r2164.
 2008-04-01 01:56:49 +00:00
Amar Takhar
bc0811d4f3 Fix a cut-and-paste-o. (s/LUA50/LUA/) 
Originally committed to SVN as r2163.
 2008-03-31 19:28:56 +00:00
Amar Takhar
aaa6d081d3 Fix typo in help message, alignment. 
Originally committed to SVN as r2160.
 2008-03-30 15:37:12 +00:00
Amar Takhar
7746efa54e * Fix ICONV_CFLAGS / ICONV_LDFLAGS so they're properly propogated during the 
build.
* s/ICONV_LIBS/ICONV_LDFLAGS/ to fix the addtion of ICONV_LDFLAGS during final
  linking.

Originally committed to SVN as r2159.
 2008-03-30 08:08:43 +00:00
Amar Takhar
ad63c0fbac Add a check for avutil, conditional on BUILD_DARWIN which is required on OSX. 
Originally committed to SVN as r2155.
 2008-03-30 06:11:45 +00:00
Amar Takhar
8b7ddf12aa Allow PERL_(CFLAGS|LDFLAGS) and RUBY_(CFLAGS|LDFLAGS) to be set, which overrides 
using the perl and ruby binaries to get them.

Originally committed to SVN as r2154.
 2008-03-29 23:56:44 +00:00
Amar Takhar
0f196ca1f9 Add missing $ to ICONV_CFLAGS/ICONV_LDFLAGS, also change CFLAGS tp CPPCFLAGS for 
the header check. (this fixes the libass build)

Originally committed to SVN as r2153.
 2008-03-29 23:09:55 +00:00
Amar Takhar
0fb1fee1a8 * Add target platform detection, at the moment this only uses OS info. 
* Fix font_file_lister to use fontconfig for unix, freetype for OS X
* Set bevelbutton to be conditional for Darwin only. (this fixes the header
  missing header as well)

Originally committed to SVN as r2152.
 2008-03-29 22:30:30 +00:00
Amar Takhar
b7af0a06d5 * Add a detection for platform/arch. 
* Add a new condtitional BUILD_DARWIN for fontconfig/freetype font listing
  support.

Originally committed to SVN as r2150.
 2008-03-26 23:58:39 +00:00
Amar Takhar
bd836309be Make ICONV_CFLAGS/ICONV_LDFLAGS override the default flags like everything else. 
(required for OS X)

Originally committed to SVN as r2142.
 2008-03-25 20:03:26 +00:00
Amar Takhar
d82bf5ec6f Change the WX tests for OpenGL and StyledTextControl to use AC_AGI_LINK, which 
is similar to AC_AGI_COMPILE, instead it checks for a header + links the library
in seperate tests.

Originally committed to SVN as r2140.
 2008-03-25 00:24:39 +00:00
Amar Takhar
1b6fa7c9a6 Add run-check for Ruby. 
Originally committed to SVN as r2136.
 2008-03-24 04:17:25 +00:00
Amar Takhar
1deae83222 Move AC_DEFINE conditional outside side of the Perl-check block. 
Originally committed to SVN as r2135.
 2008-03-24 03:45:49 +00:00
Amar Takhar
f7288d0e95 Switch Ruby support check to use AC_CACHE_CHECK. 
Originally committed to SVN as r2134.
 2008-03-24 03:43:53 +00:00
Amar Takhar
faff96d0f6 Add a run check for Perl support. 
Originally committed to SVN as r2133.
 2008-03-24 03:04:29 +00:00
Amar Takhar
5c66e27c9b Change PERL to use AC_CACHE_CHECK. 
Originally committed to SVN as r2132.
 2008-03-24 02:55:10 +00:00
Amar Takhar
3fb93565f5 Remove extra '$CFLAGS', PulseAudio is managed by pkg-config so it's not 
nessicary (user should set LIBPULSE_CFLAGS.)

Originally committed to SVN as r2129.
 2008-03-23 23:39:01 +00:00
Amar Takhar
6f54aa0e38 Add a run-test for OpenAL. 
Originally committed to SVN as r2128.
 2008-03-23 23:37:57 +00:00
Amar Takhar
f8600b921d Add a run test for PulseAudio. 
Originally committed to SVN as r2126.
 2008-03-23 23:07:47 +00:00
Amar Takhar
e4d77f6474 Completely remove support for an external libass: 
* The internal libass will always be newer than external packages.
  * aegisub requires fontconfig _and_ iconv support, some systems have
    either/or but rarely both.
  * There's zero benifit to supporting an external version.

In the future I might add some flags to allow it, if there is a compelling
reason to.

Originally committed to SVN as r2125.
 2008-03-23 22:56:21 +00:00
Amar Takhar
7a423e02b3 Add a run test for PortAudio 
Originally committed to SVN as r2124.
 2008-03-23 22:23:59 +00:00
Amar Takhar
1a68069ee2 If the Hunspell test fails, then hunspell should be disabled, I'll do this for 
all the tests eventually.

Originally committed to SVN as r2123.
 2008-03-23 22:12:25 +00:00
Amar Takhar
0bb2c0733e Only print a warning if hunspell is detected, but the test program fails to 
compile or work.

Originally committed to SVN as r2122.
 2008-03-23 15:56:50 +00:00
Amar Takhar
d9ea5d272c s/LUA/Lua/ per jfs. 
Originally committed to SVN as r2121.
 2008-03-23 15:55:15 +00:00
Amar Takhar
1f5e67b9fc Add a program check for Hunspell. 
Originally committed to SVN as r2120.
 2008-03-23 15:54:33 +00:00
Amar Takhar
9b2bb18a92 Add a run check for Fontconfig. 
Originally committed to SVN as r2118.
 2008-03-23 00:36:36 +00:00
Amar Takhar
7a87d3a2ee Change AC_AGI_COMPILE to use AC_RUN_IFELSE instead of AC_COMPILE_IFELSE which 
only checks if the program links correctly, this way we can make functional
programs to check for library sanity.  Also disable the GL check until amz
writes us a slice that uses gl.h/glext.h.

Originally committed to SVN as r2117.
 2008-03-22 23:10:55 +00:00
Amar Takhar
28a6ceab78 Add a new (custom) macro AC_AGI_COMPILE to help with writing tests that use the 
headers+libraries into runnable programs.  Hopefully this will solve all the
-dev package situations on Linux.

Originally committed to SVN as r2113.
 2008-03-22 19:43:23 +00:00
Amar Takhar
a8cf14b714 set with_libass and with_internal_libass to no when --without-libass is 
supplied.

Originally committed to SVN as r2112.
 2008-03-22 11:46:18 +00:00
Amar Takhar
879db30e21 Fix conditional for libass support in Makefiles. 
Originally committed to SVN as r2100.
 2008-03-22 08:23:54 +00:00
Amar Takhar
ae3f8a037b Fix usage of LDFLAGS / ICONV_LDFLAGS. 
Originally committed to SVN as r2098.
 2008-03-22 07:37:38 +00:00
Amar Takhar
664af8498a Fix the detection of libiconv (for required for internal libass support), also 
fix libiconv ldflags, and the detection order for libass (internal first,
external second).

Originally committed to SVN as r2097.
 2008-03-22 07:33:57 +00:00
Amar Takhar
04e9ff224f Add support for an 'internal' libass, with this we can chase changes to the 
libass in MPlayer which is more up-to-date than the external library that's
available.

Originally committed to SVN as r2096.
 2008-03-21 21:01:03 +00:00
Amar Takhar
b969f382c6 Remove old (legacy) variables that were commented out. 
Originally committed to SVN as r2090.
 2008-03-21 04:56:14 +00:00
Amar Takhar
90e9e6fef1 Re-enable univerchardet (for now), also make it use STL rather than stdio (which 
isn't complete)

Originally committed to SVN as r2085.
 2008-03-20 22:24:28 +00:00
Amar Takhar
1f23637cd2 Fix auto4/auto3 (lua51/lua50) support, this removes the --with-* flags in favor 
of LUA_(C|LD)FLAGS and LUA50_(C|LD)FLAGS, also add the LUA LDFLAGS to LIBS like
perl in order to have it bring in the symbols properly, this is a temp measure
until we have modules.

Originally committed to SVN as r2082.
 2008-03-20 21:24:01 +00:00
Amar Takhar
e0d98de508 Fix one more conditional (for lua51). 
Originally committed to SVN as r2040.
 2008-03-13 07:35:39 +00:00
Amar Takhar
dff23e8cd3 Fix typo(s), also fix the conditionals that enabled/disabled auto3/4 supported 
based on the --with* flags being supplied.  Not sure what I was thinking
originally, or if I was at all.

Originally committed to SVN as r2038.
 2008-03-13 07:16:53 +00:00
Karl Blomster
e6b2bfd74b libmp3lame cannot actually be used as a decoder in ffmpeg. Removed --enable-broken-mp3 switch from configure.in. Note to self: yell at verm__ for this. 
Originally committed to SVN as r2036.
 2008-03-13 06:34:58 +00:00
Amar Takhar
3ab038d373 Whoops, missed some of the lua50 glue, also remove some old crufted that was 
commented out.

Originally committed to SVN as r2033.
 2008-03-13 03:36:09 +00:00
Amar Takhar
44acbee51f Add some more headings to make the script more readable. (it's about to get a 
lot more complex)  Also move the lua50 block below the lua51 block.

Originally committed to SVN as r2032.
 2008-03-13 03:25:29 +00:00
Amar Takhar
4c3dde50f6 Add two new switches --enable-wx-opengl and --enable-wx-styledtextctrl, useful 
for development purposes, but also useful to avoid invoking the wonderfully slow
g++ to test for availability during multiple ./configure runs.

Originally committed to SVN as r2020.
 2008-03-11 07:24:10 +00:00
Amar Takhar
1e6956338f Align --help messages (what a pain.) 
Originally committed to SVN as r2011.
 2008-03-11 05:11:19 +00:00
Amar Takhar
8749c97d9f Whoops, originally the switch was --with-broken-mp3 but I changed it to 
--enable-broken-mp3 (correct) but forgot to update the notice.  (noticed by amz)

Originally committed to SVN as r2010.
 2008-03-11 05:02:29 +00:00
Amar Takhar
5776b387a2 Fix conditional for 'with_automation' in the lua50 case, also fix 
WITH_AUTOMATION conditional which was enabling if auto3 support was turnd on
(should have been conditional on $with_automation)

Originally committed to SVN as r2009.
 2008-03-11 05:01:30 +00:00
Amar Takhar
20eb82d397 Fix AC_MSG_RESULT for perl == no (it was set to print "yes"). 
Originally committed to SVN as r1990.
 2008-03-09 07:40:07 +00:00
Amar Takhar
6c7b619c83 Add a configure-time check using avcodec_find_encoder_by_name("libmp3lame") to 
look for LAME support.  Unfortunatly FFMPEG's internal MP3 support is rather
broken.  If --enable-broken-mp3 is supplied configure will continue otherwise
LAME must be compiled into FFMPEG.

Originally committed to SVN as r1989.
 2008-03-09 07:38:49 +00:00
Amar Takhar
10f3efba52 Fix status message at the bottom of configure output for hunspell. 
Originally committed to SVN as r1978.
 2008-03-08 20:47:36 +00:00
Amar Takhar
09abd27acf Fix Hunspell support for the older versions (1.1.10 and older?) 
Originally committed to SVN as r1955.
 2008-03-07 16:38:55 +00:00
Amar Takhar
c31afc4018 Remove un-needed AC_SUBST() for OpenAL (PKG_CHECK_MODULES does this). 
Originally committed to SVN as r1954.
 2008-03-07 15:45:12 +00:00
Amar Takhar
35f7f82415 Fix cutandpasto s/libpulse/openal/, also change --without-unversalcharset 
(should have been --disasble!) to --enable-universalcharset and leave it
disabled by default until an fopen() method is created for opening files in the
aegisub support.

Originally committed to SVN as r1949.
 2008-03-07 03:52:47 +00:00
Amar Takhar
98b868f55f Whoops the wrong OpenMP detection support got committed, this is the correct 
version.

Originally committed to SVN as r1917.
 2008-03-06 18:18:09 +00:00
Amar Takhar
20f0f52cec Add detection for OpenMP, this isn't hooked up yet but will be later. 
Originally committed to SVN as r1913.
 2008-03-06 16:49:24 +00:00
Amar Takhar
f740634a3b Add a convenience to help me build distfiles. 
Originally committed to SVN as r1912.
 2008-03-06 01:16:07 +00:00
Amar Takhar
454b0101d7 Fix auto3 support. 
Originally committed to SVN as r1911.
 2008-03-05 21:03:05 +00:00
Amar Takhar
22a0dca696 * Add m4macros/Makefile so Makefile.in gets parsed 
* Remove nodist_* and change it to noinst_* for universalchardet
  (cut-and-paste-o)

Originally committed to SVN as r1909.
 2008-03-05 20:20:23 +00:00
Amar Takhar
f55ffd6d91 * Add support for universalchardet 
* Fix #ifdef for STIDO/fstream with a proper ifdef/else
 * Make auto3 subdir inclusion conditional
 * Rename libspell_hunspell to libmisc*

Please note that universalchardet is only set to work with X86 for now, I'll fi$
the rest later.

Originally committed to SVN as r1907.
 2008-03-05 18:52:09 +00:00
Amar Takhar
850a280ef1 PulseAudio and OpenAL were being forced on due to typos, also add some 
quotes for cleanliness.

Originally committed to SVN as r1905.
 2008-03-05 17:15:55 +00:00
Amar Takhar
51561cee79 The (disabled) people were seeing beside ALSA support was actually 
hunspell being disabled, due to --without-hunspell definfing
alsa_disabled, fix this and add it to the final package status of
configure.

Originally committed to SVN as r1902.
 2008-03-05 15:35:47 +00:00
Amar Takhar
ef09793948 Remove some debugging cruft that was left in by accident. 
Originally committed to SVN as r1901.
 2008-03-05 15:34:50 +00:00
Amar Takhar
5286ae1eb3 WITH_AUTOMATION used to include auto4 (LUA 5.1), however it was not condusive 
to including PERL or Ruby support.  This change supports the conditionals added
in r1889`.

Originally committed to SVN as r1899.
 2008-03-05 04:09:04 +00:00
Amar Takhar
42cd531584 s/LIBS/LIBRUBYARG/ to get the ldflags for ruby. 
Originally committed to SVN as r1888.
 2008-03-04 20:08:06 +00:00
Amar Takhar
3ec3b42c3d Add a --enable-debug flag, with a DEBUG_FLAGS env variable to set the 
debugging flag (default: -g)

Originally committed to SVN as r1886.
 2008-03-04 16:59:01 +00:00
Amar Takhar
a55e392fc2 In r1876 the compiler flags were pushed up from the AC_CHECK* commands. 
However they wern't removed from the CPP/LDFLAG settings so we ended up
with -I-I and -L-L.

Originally committed to SVN as r1882.
 2008-03-04 01:11:22 +00:00
Amar Takhar
eee84bced9 Fix ffmpeg support, -lavcodec was added to both libs (avcodec/avformat), fix 
the 2nd to be -lavformat.

Originally committed to SVN as r1881.
 2008-03-04 01:02:13 +00:00
Amar Takhar
f5764fa2e4 Add support for OpenAL. 
Originally committed to SVN as r1880.
 2008-03-04 00:59:02 +00:00
Amar Takhar
448add536a Fix --without-lua and --without-ffmpeg so they work as expected. 
Originally committed to SVN as r1879.
 2008-03-03 21:52:41 +00:00
Amar Takhar
c44dd80448 Sigh.. _really_ remove the flags, -1 point for comitting before breakfast. 
Originally committed to SVN as r1877.
 2008-03-03 17:41:53 +00:00
Amar Takhar
c86d525d98 Push linker/compiler flages up into the --with-lua* functions, this stops 
empty flags from being passed.  I didn't notice beacuse I always have them
set.

Originally committed to SVN as r1876.
 2008-03-03 17:39:39 +00:00
Amar Takhar
c9b8969c6d Align the help for the --with* flags. 
Originally committed to SVN as r1874.
 2008-03-03 09:12:12 +00:00
Amar Takhar
964a710403 Add a --without-hunspell switch. 
Originally committed to SVN as r1873.
 2008-03-03 09:09:34 +00:00
Amar Takhar
ed4e70fae8 Add preliminary support for the swscale library if swscale is not included 
in ffmpeg, there are some linux distro's running ancient versions still.

Originally committed to SVN as r1872.
 2008-03-03 08:57:08 +00:00
Amar Takhar
65ed5fa6b8 Fix typo s/LUA_CPPLAGS/LUA_CPPFLAGS/ 
Originally committed to SVN as r1871.
 2008-03-03 08:45:15 +00:00
Amar Takhar
14b319414f Add the 13 required AC_DEFINE lines to actually enable the 
detected packages, I meant to do this but completely forgot.

Originally committed to SVN as r1867.
 2008-03-03 07:54:19 +00:00
Amar Takhar
b1c441ff73 Commit the new build system (complete re-write), this includes several changes: 
* Sane C/CXX/CPP/LDFLAGS
 * --with/--without settings
 * Proper gettext support
 * System portability changes (to support OS X and all other unix-like osen)
 * Features to allow for proper compile time settings (support exists features
   need to be added)

This comes with no warrenty at the moment, auto3 and asa support are both
incomplete/non-existent, there is no documentation and some conftests still nee$
to be written.

It's still incomplete try it at your own risk!

Originally committed to SVN as r1865.
 2008-03-03 07:22:58 +00:00