Commit graph

89 commits

Author SHA1 Message Date
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