mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity
2635 commits 10 branches 31 tags 51 MiB
Commit graph

181 commits

Author SHA1 Message Date
Amar Takhar
c5ccada420 if $prefix = "NONE" then set $prefix to $ac_default_prefix. I didn't realise 
at the time $prefix isn't populated unless --prefix is provided.  This broke
paths for any situation where --prefix wasn't provided.  On Linux wx can figure
out the install prefix automatically at the moment we use SetInstallPrefix in w
to set the prefix which was being set to 'NONE' if --prefix wasn't used.
(broken locale on linux reported by tomman)

Originally committed to SVN as r2619.
 2009-01-04 04:38:32 +00:00
Amar Takhar
478b3b6996 Add BUILD_CREDIT support using --with-build-credit which shows up in the 
titlebar (I didn't want to add this but it keeps coming up.)  I also hope it is
not abused by setting usernames during package builds for distributions.  It
should only be used for personal builds only or shared builds by individuals.

Originally committed to SVN as r2614.
 2009-01-02 09:13:22 +00:00
Amar Takhar
9cd72c21c9 Set BUILD_SVN_REVISION which fixes saving config.dat between instances. This 
uses 'svnversion $srcdir' for svn builds, and the file svn_revision which is
supplied with tarballs.

Originally committed to SVN as r2612.
 2009-01-02 08:48:13 +00:00
Amar Takhar
d935c3fdd3 Add INSTALL_PREFIX to config.h, this will be used to add proper relocation 
support in UNIX.  Windows and OS X are done differently.

Originally committed to SVN as r2605.
 2009-01-01 12:58:47 +00:00
Amar Takhar
85e91c8a98 Fix --help message alignment (annoying) 
Originally committed to SVN as r2604.
 2009-01-01 12:47:20 +00:00
Amar Takhar
8a778ffd82 Fix --disable-check-wx-opengl --disable-check-wx-stc which forces opengl/stc 
support on.  These two checks take a long time, before you use this know what
you are doing!

Originally committed to SVN as r2603.
 2009-01-01 12:43:17 +00:00
Amar Takhar
1f19d5fc8b Move AC_ARG_ENABLE(debug.. to the very end, adding it before slows down 
configure immensly.  If anyone wants to use it during configure they should add
-g to their CXXFLAGS.

Originally committed to SVN as r2602.
 2009-01-01 12:32:58 +00:00
Amar Takhar
5ba0f587d8 Remove a couple commented lines that are not needed anymore. 
Originally committed to SVN as r2601.
 2009-01-01 12:30:00 +00:00
Amar Takhar
ebc21524cf I'm not sure how long this bug has been around, probably several months if not 
from around r2140. An artifact from the very  first commit of the new build
system was wiping CPPFLAGS, which removed -g if --enable-debug was used.  I
didn't notice it locally as I was setting the flag differently.  I wonder how
it went on this long without anyone noticing, next: useful crashdumps for all.

Originally committed to SVN as r2599.
 2009-01-01 10:34:00 +00:00
Amar Takhar
946acb99dd The check for enable_check_wx_stc should be = 'no' no != 'no' 
Originally committed to SVN as r2597.
 2009-01-01 05:48:49 +00:00
Amar Takhar
cab9ba86b0 Fix StyledTextCtrl detection support, no idea how long this has been broken for. 
Originally committed to SVN as r2596.
 2009-01-01 05:41:07 +00:00
Amar Takhar
1fd3ffc313 Add 'libosxutil' which gives us functions to locate paths within bundles, for 
now this is used by libass to load fontconfig's fonts.conf.

Originally committed to SVN as r2585.
 2008-12-31 09:20:50 +00:00
Amar Takhar
93002cf4a8 * s/SVN_VERSION/SVN_REVISION/ in configure.in 
* Prefix PLIST_ to swappable variables in Plist.info
* Add scripts/osx-bundle.sed.in which swaps the variables in Info.plist
* Split AC_OUTPUT into AC_CONFIG_FILES for Makefiles/config scripts
  (osx-bundle.sed.in) and add AC_OUTPUT below.
* svn:ignore property on . and scripts/
* Fix bug in Info.plist (---> to --> for ending XML comment)

Originally committed to SVN as r2581.
 2008-12-31 05:52:52 +00:00
Amar Takhar
c03b3f4069 * Get SVN_VERSION properly. 
* Add BUILD_DATE

Originally committed to SVN as r2578.
 2008-12-31 05:07:58 +00:00
Amar Takhar
f838d6172d Set with_provider_ffmpegsource="no" if libpostproc is not detected. 
Originally committed to SVN as r2536.
 2008-12-27 11:45:38 +00:00
Amar Takhar
85f0e5e7f0 Add --enable-perl-console, enabled by default (untested) 
Originally committed to SVN as r2535.
 2008-12-27 11:42:12 +00:00
Amar Takhar
e7f057a2b1 Instead of checking if (perl|ruby)_disabled exists, check with_(perl|ruby) = 
"no".  This is probably expected behaviour as the --with-XXX=BLAH flags will
pass along BLAH.  Most of the time if users want it turned on they'll set it to
something else other than no. (they shouldn't though)

Originally committed to SVN as r2534.
 2008-12-27 10:03:37 +00:00
Amar Takhar
c0374c55d4 Set with_cv_(perl|ruby) = no if --without-(perl|ruby) is set. 
Originally committed to SVN as r2533.
 2008-12-27 09:42:31 +00:00
Amar Takhar
bdbf8f4fe0 Finally use (fontconfig|freetype|perl|pkgconfig|ruby)_required_version to check 
against required versions.  lua|portaudio|pulseaudio|ffmpeg are not used yet as
they require compile tests.

Originally committed to SVN as r2532.
 2008-12-27 09:32:47 +00:00
Amar Takhar
04047e8f95 Add detection for universalchardet config detection. This isn't used or hooked 
up at the moment but will be eventually.

Originally committed to SVN as r2506.
 2008-12-17 03:52:33 +00:00
Amar Takhar
bcb5258d7a Fix FFMPEG/Provider support (PART 2) 
Originally committed to SVN as r2504.
 2008-12-16 03:18:02 +00:00
Amar Takhar
07b2eeeb42 Fix versioning and add in a 'revision' version (set to 6) 
Originally committed to SVN as r2503.
 2008-12-16 02:17:29 +00:00
Amar Takhar
42b57fb526 * Fix those annoying _cv_ cache warning messages. 
Originally committed to SVN as r2502.
 2008-12-16 02:03:01 +00:00
Amar Takhar
f36986a072 * Seperate FFMPEG support and FFMPEG/FFmpegSource Provider detection. (PART 1) 
* Fix CSRI detection.
* Fix capitalisation on ending support status.
* s/ANCIENT/OLD/ tag for older FFMPEG headers.
* Fix --enable-old-ffmpeg to work as advertised.

Originally committed to SVN as r2501.
 2008-12-16 01:59:38 +00:00
Amar Takhar
2b13dfbb43 Add support for FFmpegSource2, it's enabled by default if libpostproc is there. 
Originally committed to SVN as r2425.
 2008-10-28 02:18:14 +00:00
Karl Blomster
7c970aa91b whoops, bogus description of define in last commit. also r2400 GET. 
Originally committed to SVN as r2400.
 2008-09-28 13:06:15 +00:00
Karl Blomster
aa539a5e9e add --enable-old-ffmpeg switch to configure; using it changes the includes to use ffmpeg headers from the old locations (ffmpeg/libav*.h). 
Originally committed to SVN as r2399.
 2008-09-28 13:04:57 +00:00
Amar Takhar
9826d5bd58 Set GETTEXT_PACKAGE to 'aegisub' from 'aegisub21', I want to handle this 
a better way but for now the old way is just fine.  Bug #761

Originally committed to SVN as r2295.
 2008-08-04 03:05:07 +00:00
Amar Takhar
ab0d5377e8 Add wxGLContext to the wxWdiget OpenGL 'check'. 
Originally committed to SVN as r2247.
 2008-07-13 18:42:48 +00:00
Amar Takhar
25ece3ab55 sigh, swap || for &&. 
Originally committed to SVN as r2243.
 2008-07-05 18:51:30 +00:00
Amar Takhar
ef481e8045 GLU is included with -framework OpenGL, avoid the failure message if 
$build_darwin is set.

Originally committed to SVN as r2242.
 2008-07-05 18:48:29 +00:00
Karl Blomster
c4285b87fd revert r2240 changes to configure.in 
Originally committed to SVN as r2241.
 2008-07-05 13:01:39 +00:00
Niels Martin Hansen
923b347356 Some more checking in PCM provider. Had apparently missed a way EnsureRangeAceesibleble() could fail. This means of failure should no longer be possible. 
Originally committed to SVN as r2240.
 2008-07-05 12:50:49 +00:00
Amar Takhar
d14d6b4b36 use the AC_C_BIGENDIAN macro to set HAVE_BIG_ENDIAN, HAVE_LITTLE_ENDIAN, 
HAVE_DYNAMIC_ENDIAN and HAVE_UNIVERSAL_ENDIAN (universal binaries for the mac).$
The default is to use HAVE_DYNAMIC_ENDIAN in the code if it is not BIG or
LITTLE, HAVE_UNIVERSAL_ENDIAN is added only for clarity in config.h.

Originally committed to SVN as r2229.
 2008-07-04 00:41:28 +00:00
Niels Martin Hansen
ddaf85f650 s/Audio Providers/Audio Players/ 
Originally committed to SVN as r2213.
 2008-06-29 18:56:46 +00:00
Amar Takhar
f1c89cb4bc Add a check for OpenGLU. bug #720 
Originally committed to SVN as r2207.
 2008-06-21 16:14:13 +00:00
Amar Takhar
a7e8d0e535 Fix the lua(50|51)_disabled variables so it shows up properly in the 
configure status block.

Originally committed to SVN as r2206.
 2008-06-16 04:50:48 +00:00
Amar Takhar
b9d8f72838 Remove '2.1' from automationdir, it's a legacy artifact. 
Originally committed to SVN as r2203.
 2008-06-15 13:36:30 +00:00
Amar Takhar
74913197fb Set AM_CONDITIONAL(HAVE_FFMPEG) to test for ffmpeg = yes versus ffmpeg != 'no' 
which can be touchy.  This really needs a run-through to make sure it's
consistent in the entire script.

Originally committed to SVN as r2193.
 2008-05-15 03:06:44 +00:00
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