mirror of https://github.com/odrling/Aegisub
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.
This commit is contained in:
parent
39d0e31fa5
commit
35f7f82415
10
configure.in
10
configure.in
|
@ -187,13 +187,15 @@ fi
|
||||||
AC_ARG_WITH(openal,[ --without-openal build without OpenAL audio provider.
|
AC_ARG_WITH(openal,[ --without-openal build without OpenAL audio provider.
|
||||||
(default: auto)], openal_disabled="(disabled)")
|
(default: auto)], openal_disabled="(disabled)")
|
||||||
if test "x$with_openal" != xno; then
|
if test "x$with_openal" != xno; then
|
||||||
PKG_CHECK_MODULES(OPENAL, libpulse >= 0.0.8, [found_audio=yes; with_openal=yes], [with_openal=no])
|
PKG_CHECK_MODULES(OPENAL, openal >= 0.0.8, [found_audio=yes; with_openal=yes], [with_openal=no])
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL([HAVE_OPENAL], [test "$with_openal" != "no"])
|
AM_CONDITIONAL([HAVE_OPENAL], [test "$with_openal" != "no"])
|
||||||
if test "$with_openal" = "yes"; then
|
if test "$with_openal" = "yes"; then
|
||||||
AC_DEFINE(WITH_OPENAL, 1, [Enable OpenAL support])
|
AC_DEFINE(WITH_OPENAL, 1, [Enable OpenAL support])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_SUBST(OPENAL_CFLAGS)
|
||||||
|
AC_SUBST(OPENAL_LIBS)
|
||||||
|
|
||||||
#################
|
#################
|
||||||
# Video Providers
|
# Video Providers
|
||||||
|
@ -296,8 +298,8 @@ AC_SUBST(HUNSPELL_LDFLAGS)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
AC_ARG_WITH(univchardet, [ --without-univchardet build without universalchardet support], univchardet_disabled="(disabled)")
|
AC_ARG_ENABLE(univchardet, [ --enable-univchardet enable universalchardet support.], univchardet_disabled="(disabled)")
|
||||||
if test "$with_univchardet" != "no"; then
|
if test "$with_univchardet" = "yes"; then
|
||||||
with_univchardet="yes"
|
with_univchardet="yes"
|
||||||
AC_DEFINE(WITH_UNIVCHARDET, 1, [Enable universalchardet support])
|
AC_DEFINE(WITH_UNIVCHARDET, 1, [Enable universalchardet support])
|
||||||
else
|
else
|
||||||
|
@ -599,5 +601,5 @@ Subtitle Providers:
|
||||||
|
|
||||||
Misc Packages:
|
Misc Packages:
|
||||||
hunspell: $with_hunspell $hunspell_disabled
|
hunspell: $with_hunspell $hunspell_disabled
|
||||||
universalchardet: $with_univchardet $univchardet_disabled
|
universalchardet: $with_univchardet $univchardet_disabled (broken)
|
||||||
]);
|
]);
|
||||||
|
|
Loading…
Reference in New Issue