Commit graph

156 commits

Author SHA1 Message Date
Amar Takhar
9a6265afb6 * Switch FFMPEG detection to use pkg-config.
* Add an FFMPEG compile check from TheFluff, thanks! (modified)
* Add a libpostproc check from Myrsloik, thanks!. (reqired by ffms)
* Rework how ffms / FFMPEG providers are enabled/disabled.
* Fix PulseAudio check to use pulseaudio_required_version.

Originally committed to SVN as r2705.
2009-01-28 03:19:53 +00:00
Amar Takhar
1fc063f759 * Swap with*=1|0 to with*=yes|no in wx-config check.
* Fix misnamed variable which disabled the wx opengl test.

Originally committed to SVN as r2698.
2009-01-15 01:14:41 +00:00
Amar Takhar
a196f1efbb Only substitude RUBY_(C|LD)FLAGS and PERL_(C|LD)FLAGS if either are actually
detected as working.

Originally committed to SVN as r2697.
2009-01-15 01:06:21 +00:00
Amar Takhar
dafcf9badd * Cleanup Hunspell block (remove legacy code)
* Fix disabling of hunspell if compile test fails.

Originally committed to SVN as r2696.
2009-01-15 01:04:55 +00:00
Amar Takhar
0035436eff Fix ALSA block (remove legacy code)
Originally committed to SVN as r2695.
2009-01-15 01:02:57 +00:00
Amar Takhar
c37e33e29c Move PKG_CHECK_MODULES(ASA.. within the $with_csri block, also check for
detection of CSRI _and_ ASA before enabling CSRI.

Originally committed to SVN as r2694.
2009-01-14 06:10:03 +00:00
Amar Takhar
fa240bc665 Really disable libass if --disable-libass is provided.
Originally committed to SVN as r2693.
2009-01-14 06:06:37 +00:00
Amar Takhar
b6661ec3a4 Re-format PulseAudio detection block. (legacy)
Originally committed to SVN as r2692.
2009-01-14 04:58:35 +00:00
Amar Takhar
57bdedbaa7 Fix pulseaudio/portaudio detection.
Originally committed to SVN as r2691.
2009-01-13 09:43:24 +00:00
Amar Takhar
fcf671da96 Use 'aegisub' as the locale file name(s) versus 'aegisub21' on unix.
Originally committed to SVN as r2688.
2009-01-12 22:52:52 +00:00
Amar Takhar
2e4d751407 Cleanup portaudio detection.
Originally committed to SVN as r2683.
2009-01-12 00:20:47 +00:00
Amar Takhar
811505ee83 Fix perl compile test, char **env was missing from main, it doesn't fail
on gcc 4.2.1 but it does with 4.3.2 (which may or not be the issues) in
any case it's correct to pass it.

Originally committed to SVN as r2681.
2009-01-08 17:01:24 +00:00
Amar Takhar
4dc6d0eca8 Fix a duplicate _cv_ entry for ruby/perl that was stopping the AGI macro
from detecting proper support.

Originally committed to SVN as r2678.
2009-01-08 09:34:17 +00:00
Amar Takhar
6c41f69443 * AC_SUBST(AEGISUB_VERSION_DATA) configure.in
* Add second argument to osx-bundle.sh ($AEGISUB_VERSION_DATA)
* Modify osx-bundle.sh to copy correct binary name.

Originally committed to SVN as r2671.
2009-01-07 08:48:33 +00:00
Amar Takhar
954e93f638 Add desktop support as specified in http://freedesktop.org/wiki/Specifications/desktop-entry-spec .
Originally committed to SVN as r2668.
2009-01-07 05:27:16 +00:00
Amar Takhar
d5f5e66e33 * Split HAVE_FFMPEG into HAVE_FFMPEG / HAVE_PROVIDER_FFMPEG
* s/HAVE_FFMPEGSOURCE/HAVE_PROVIDER_FFMPEGSOURCE/
* Add FFMPEG_CFLAGS / FFMPEG_LDFLAGS as configure env vars for FFMPEG
  detection.

Originally committed to SVN as r2664.
2009-01-06 13:59:15 +00:00
Amar Takhar
7e764f2ab1 Remove old legacy code: don't set LUA_CFLAGS and LUA50_CFLAGS to $CPPFLAGS.
Originally committed to SVN as r2660.
2009-01-06 11:20:56 +00:00
Amar Takhar
675c4caa09 Add multiple version support, everything is now suffixed with MAJOR.MINOR, this
will allow users on unix to install and operate different versions of aegisub a$
the same time.  Note: auto3 linking is broken it will be fixed in the next
commit as it's unrelated to these changes.

Originally committed to SVN as r2659.
2009-01-06 10:44:49 +00:00
Amar Takhar
6d172232c6 Comments start with a '#' not '*'.
Originally committed to SVN as r2655.
2009-01-06 03:48:36 +00:00
Amar Takhar
0d84a87098 Don't traverse m4macros/ and add the files to EXTRA_DIST in ./Makefile.am for speed.
Originally committed to SVN as r2652.
2009-01-05 11:51:56 +00:00
Amar Takhar
15239a8409 That's '! test' not '!test'.
Originally committed to SVN as r2649.
2009-01-05 11:40:52 +00:00
Amar Takhar
25ca1497ab * Add support for setting the default A/V provider and audio player using
--with-provider-(video|audio) and --with-player-audio.
* Cleanup --help alignment
* Print default values at the end of configure
* Remove :'s in end status section headings in configure.

Originally committed to SVN as r2648.
2009-01-05 11:07:14 +00:00
Amar Takhar
bf09c76081 Remove posix dir and 'libposix' and create 'libresrc' which includes
resources from res.rc and and future resources required.

Originally committed to SVN as r2631.
2009-01-04 09:01:49 +00:00
Amar Takhar
0763541848 Change how configuration works.
* move win32/config0.h -> config/config_windows0.h
  * move win32/stdint.h -> msvc/stdint.h
  * move posix/defines.h -> config/config_unix.h
  * add config.h - brings in config_(windows|unix).h as required
  * add config.h to *.cpp
  * Self-contain FFmpegSource2 with required function defines wrapped with
    __UNIX__ instead of the now removed defines.h.
  * Edit aegisub_vs2008.vcproj to remove explicit inclusion of config.h, also
    change VCPreBuildEventTool to create windows_config.h from
    windows_config0.h.  Add msvc to include path.
  * Change configure to create ./acconf.h instead of posix/acconf.h

This will allow us to create a more standard and platform agnostic way of
configuration aegsisub during build time.

Originally committed to SVN as r2621.
2009-01-04 06:31:48 +00:00
Amar Takhar
eb328262c3 Print some useful messages at the end of configure: Install prefix, SVN
Revision, Debug (yes+flags/no), CPPFLAGS, LDFLAGS.  Hopefully this will stop
any wonky settings from sliding in without being noticed.

Originally committed to SVN as r2620.
2009-01-04 04:48:55 +00:00
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