Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-27 12:37:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed LDFLAGS inclusion. Changed AVI library defaults to "classes + 0.6.10".

Browse Source
This commit is contained in:
Moritz Bunkus 2003-10-15 14:44:00 +00:00
parent c507a3dcf1
commit 38b1a79b5b
2 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
configure.in
View File

@ -805,43 +805,57 @@ dnl
dnl Option to use the (old) avilib library instead of the AVI classes
dnl
AC_ARG_WITH(avilib,
[ --with-avilib=version Which avilib should be used (old, classes or 0.6.10)],
[ --with-avilib=version Which avilib should be used (old, noclasses, 0.6.10)],
with_avilib_given=yes, with_avilib_given=no)
if test "x$with_avilib_given" = "xyes"; then
case "${with_avilib}" in
old)
have_avilib=yes
;;
classes)
have_aviclasses=yes
;;
"0.6.10")
have_avilib0_6_10=yes
;;
*)
echo "*** Unknown AVI library string \"${with_avilib}\". Supported "
echo "*** values are:"
echo "*** old - the old and tested avilib, no OpenDML support"
echo "*** 0.6.10 - the new avilib with OpenDML support"
echo "*** classes - AVI access classes by Cyrius with OpenDML support"
exit 1
;;
esac
fi
AC_MSG_CHECKING(which AVI libraries to use)
# Defaults: use aviclasses and prefer the new avilib.
have_aviclasses=yes
if test "x$with_avilib_given" = "xyes"; then
set - `echo ${with_avilib} | sed 's/,/ /g'`
while test "x$1" != "x"; do
case "$1" in
old)
have_avilib=yes
;;
noclasses)
have_aviclasses=no
;;
"0.6.10")
have_avilib0_6_10=yes
;;
*)
echo ""
echo "*** Unknown AVI library \"$1\" in \"${with_avilib}\". "
echo "*** Supported values are:"
echo "*** old - the old and tested avilib, no OpenDML support"
echo "*** 0.6.10 - the new avilib with OpenDML support"
echo "*** noclasses - Do not use the AVI classes by Cyrius with "
echo "*** OpenDML support"
exit 1
;;
esac
shift
done
fi
if test "x$have_aviclasses" = "xyes"; then
AC_DEFINE(HAVE_AVICLASSES, 1,
[Define if the newer AVIclasses should be used.])
AVICLASSES_LIBS="-laviclasses"
avi_libs_to_use="classes "
fi
if test "x$have_avilib0_6_10" = "xyes"; then
if test "x$have_avilib0_6_10" = "xyes" -a "x$have_avilib" = "xyes"; then
echo ""
echo "*** You cannot include both the old avilib and the new"
echo "*** one (0.6.10)."
exit 1
fi
if test "x$have_avilib" = "xyes"; then
avi_libs_to_use="${avi_libs_to_use}old "
else
AC_DEFINE(HAVE_AVILIB0_6_10, 1,
[Define if the newer avilib from transcode 0.6.10 should be used.])
avi_libs_to_use="${avi_libs_to_use}0.6.10 "
else
avi_libs_to_use="${avi_libs_to_use}old "
fi
AM_CONDITIONAL(HAVE_AVILIB, test x"$have_avilib0_6_10" != "xyes")
AM_CONDITIONAL(HAVE_AVILIB0_6_10, test x"$have_avilib0_6_10" == "xyes")

3
src/Makefile.am
View File

@ -16,7 +16,8 @@ endif
DEFAULT_INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src \
$(avilib_incdirs) $(avilib0_6_10_incdirs) $(aviclasses_incdirs)
LDFLAGS += $(avilib_libdirs) $(avilib0_6_10_libdirs) $(aviclasses_libdirs)
LDFLAGS = @LDFLAGS@ $(avilib_libdirs) $(avilib0_6_10_libdirs) \
$(aviclasses_libdirs)
if HAVE_WXWINDOWS
SUBDIRS = mmg