dnl Autoconf settings for vlc
-AC_INIT(vlc,0.5.3-cvs)
+AC_INIT(vlc,0.5.4-cvs)
CONFIGURE_LINE="$0 $*"
CODENAME="Natalya"
dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.5.3-cvs)
+AM_INIT_AUTOMAKE(vlc,0.5.4-cvs)
AM_CONFIG_HEADER(config.h)
dnl
# add ws2_32 for closesocket, select, recv
CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"
CPPFLAGS="${CPPFLAGS_save}"
- LDFLAGS_vlc="${LDFLAGS_vlc} -lws2_32 -lnetapi32 -mwindows"
+ LDFLAGS_vlc="${LDFLAGS_vlc} -lws2_32 -lnetapi32 -lwinmm -mwindows"
LDFLAGS_ipv4="${LDFLAGS_ipv4} -lws2_32"
LDFLAGS_ipv6="${LDFLAGS_ipv6} -lws2_32"
LDFLAGS_access_http="${LDFLAGS_access_http} -lws2_32"
LDFLAGS_vlc="${LDFLAGS_vlc} -lbe"
LDFLAGS_plugins="${LDFLAGS_plugins} -nostart"
LDFLAGS_beos="${LDFLAGS_beos} -lbe -lmedia -lroot -ltracker -lstdc++.r4 -ltranslation"
- dnl BONE or not BONE ?
+ dnl BONE or not BONE ? only BONE has libbind.so
AC_CHECK_LIB( bind, inet_ntoa,
- [ LDFLAGS_access_mms="${LDFLAGS_access_mms} -lbind"
- LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind"
- LDFLAGS_httpd="${LDFLAGS_httpd} -lbind"],
+ [ LDFLAGS_access_mms="${LDFLAGS_access_mms} -lsocket -lbind"
+ LDFLAGS_ipv4="${LDFLAGS_ipv4} -lsocket -lbind"
+ LDFLAGS_httpd="${LDFLAGS_httpd} -lsocket -lbind"],
[])
;;
x*)
dnl Gettext stuff
dnl
ALL_LINGUAS="de en_GB fr it ja no ru nl pl sv"
-AM_GNU_GETTEXT_VERSION(0.10.40)
+AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT
if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl)
fi
dnl Check for -funroll-loops
-AC_CACHE_CHECK([if \$CC accepts -funroll-loops],
- [ac_cv_c_unroll_loops],
- [CFLAGS="${CFLAGS_save} -funroll-loops"
- AC_TRY_COMPILE([],,ac_cv_c_unroll_loops=yes, ac_cv_c_unroll_loops=no)])
-if test "x${ac_cv_c_unroll_loops}" != "xno"; then
- CFLAGS_OPTIM="${CFLAGS_OPTIM} -funroll-loops"
+dnl Disabled on BeOS because BeOS' gcc is buggy and may crash with it
+if test "x${SYS}" != "xbeos"
+then
+ AC_CACHE_CHECK([if \$CC accepts -funroll-loops],
+ [ac_cv_c_unroll_loops],
+ [CFLAGS="${CFLAGS_save} -funroll-loops"
+ AC_TRY_COMPILE([],,ac_cv_c_unroll_loops=yes, ac_cv_c_unroll_loops=no)])
+ if test "x${ac_cv_c_unroll_loops}" != "xno"; then
+ CFLAGS_OPTIM="${CFLAGS_OPTIM} -funroll-loops"
+ fi
fi
dnl Check for -fomit-frame-pointer
dnl default modules
dnl
BUILTINS="${BUILTINS} mpeg_video idct idctclassic motion"
-PLUGINS="${PLUGINS} dummy rc logger gestures access_file memcpy"
+PLUGINS="${PLUGINS} dummy rc logger gestures memcpy"
PLUGINS="${PLUGINS} es audio m4v mpeg_system ps ts avi asf aac mp4 rawdv"
PLUGINS="${PLUGINS} spudec mpeg_audio lpcm a52 dts cinepak"
PLUGINS="${PLUGINS} deinterlace invert adjust wall transform distort clone crop motionblur"
#PLUGINS="${PLUGINS} scope"
PLUGINS="${PLUGINS} i420_rgb i420_yuy2 i422_yuy2 i420_ymga"
PLUGINS="${PLUGINS} id3 m3u"
+PLUGINS="${PLUGINS} rawvideo"
PLUGINS="${PLUGINS} wav araw demuxdump demuxsub adpcm a52sys au"
-PLUGINS="${PLUGINS} access_udp access_http ipv4 access_mms access_ftp"
-PLUGINS="${PLUGINS} sap httpd"
+PLUGINS="${PLUGINS} access_file access_udp access_http ipv4 access_mms"
+PLUGINS="${PLUGINS} access_ftp access_directory sap httpd"
dnl
dnl Some plugins aren't useful on some platforms
[ --enable-v4l Video4Linux input support (default disabled)])
if test "x${enable_v4l}" = "xyes"
then
- AC_CHECK_HEADERS(libv4l/v4l.h, [
+ AC_CHECK_HEADERS(linux/videodev.h, [
PLUGINS="${PLUGINS} v4l"
],[])
fi
dnl
AC_CHECK_HEADERS(zlib.h, [
LDFLAGS_mp4="${LDFLAGS_mp4} -lz"
+ LDFLAGS_skins="${LDFLAGS_skins} -lz"
] )
+
+dnl
+dnl skins module
+dnl
+AC_CHECK_HEADERS(libtar.h, [
+ LDFLAGS_skins="${LDFLAGS_skins} -ltar"
+] )
+
+
+
dnl
dnl a52 AC3 decoder plugin
dnl
fi
fi
+dnl
+dnl freetype module
+dnl
+AC_ARG_ENABLE(freetype,
+ [ --enable-freetype freetype support (default enabled)])
+if test "x${enable_freetype}" != "xno"
+then
+ FREETYPE_PATH="${PATH}"
+ AC_ARG_WITH(freetype-config-path,
+ [ --with-freetype-config-path=PATH freetype-config path (default search in \$PATH)],
+ [ if test "x${with_freetype_config_path}" != "xno"
+ then
+ FREETYPE_PATH="${with_freetype_config_path}:${PATH}"
+ fi ])
+ AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no, ${FREETYPE_PATH})
+
+ if test "x${FREETYPE_CONFIG}" != "xno" -a "x${have_xosd}" = "xtrue"
+ then
+ PLUGINS="${PLUGINS} osdtext"
+ CFLAGS_osdtext="${CFLAGS_osdtext} `${FREETYPE_CONFIG} --cflags`"
+ LDFLAGS_osdtext="${LDFLAGS_osdtext} `${FREETYPE_CONFIG} --libs`"
+ CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_freetype}"
+ elif test "x${enable_freetype}" = "xyes"
+ then
+ AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2
+from http://www.freetype.org/, or configure with --disable-freetype. Have a nice day.
+ ])
+ fi
+fi
+
dnl
dnl Qt Embedded module
dnl (disabled by default)
fi
fi
+dnl
+dnl CoreAudio plugin
+dnl
+AC_ARG_ENABLE(coreaudio,
+ [ --enable-coreaudio CoreAudio module (default enabled on MacOS X)])
+if test "x${enable_coreaudio}" != "xno" &&
+ (test "x${SYS}" = "xdarwin" || test "x${enable_coreaudio}" = "xyes")
+then
+ AC_CHECK_HEADERS(CoreAudio/CoreAudio.h,
+ [ BUILTINS="${BUILTINS} coreaudio"
+ LDFLAGS_coreaudio="${LDFLAGS_coreaudio} -framework CoreAudio"
+ AC_MSG_CHECKING(for kAudioConverterPrimeMethod in AudioToolbox/AudioConverter.h)
+ AC_EGREP_HEADER(kAudioConverterPrimeMethod,AudioToolbox/AudioConverter.h,[
+ AC_MSG_RESULT(yes)
+ PLUGINS="${PLUGINS} coreaudio_resampler"
+ LDFLAGS_coreaudio_resampler="${LDFLAGS_coreaudio_resampler} -framework AudioToolbox"
+ ],[ AC_MSG_RESULT(no) ])
+ ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ])
+fi
+
dnl
dnl Interface plugins
dnl
PLUGINS="${PLUGINS} beos"
fi
+dnl
+dnl Skins module
+dnl
+AC_ARG_ENABLE(skins,
+ [ --enable-skins Win32 skins module (default enabled on Win32)])
+if test "x${enable_skins}" != "xno"; then
+ if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"; then
+ PLUGINS="${PLUGINS} skins"
+ CPPFLAGS_skins="${CPPFLAGS_skins} -O2 -fno-rtti -Imodules/gui/skins -Imodules/gui/skins/src -Imodules/gui/skins/win32 -Imodules/gui/skins/controls"
+ LDFLAGS_skins="${LDFLAGS_skins} -lstdc++ -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32 -lmsimg32"
+ fi
+fi
+
dnl
dnl Gtk+ module
dnl
[if test "x${enable_macosx}" = "xyes"
then
BUILTINS="${BUILTINS} macosx"
- LDFLAGS_macosx="${LDFLAGS_macosx} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC"
+ LDFLAGS_macosx="${LDFLAGS_macosx} -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC"
fi],
[AC_CHECK_HEADERS(Cocoa/Cocoa.h,
BUILTINS="${BUILTINS} macosx"
- LDFLAGS_macosx="${LDFLAGS_macosx} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC"
+ LDFLAGS_macosx="${LDFLAGS_macosx} -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC"
)])
dnl
if test "x${have_slp}" = "xtrue"
then
PLUGINS="${PLUGINS} slp"
- LDFLAGS_slp="${LDFLAGS_slp} -lslp"
+ LDFLAGS_slp="-lslp ${LDFLAGS_slp}"
fi
else
AC_MSG_CHECKING(for slp headers in ${with_slp})
dnl Use ${with_slp}/libslp/slp.h
AC_MSG_RESULT(yes)
PLUGINS="${PLUGINS} slp"
- LDFLAGS_slp="${LDFLAGS_slp} -L${with_slp} -lslp"
+ LDFLAGS_slp="-L${with_slp} -lslp ${LDFLAGS_slp}"
CPPFLAGS_slp="${CPPFLAGS_slp} -I${with_slp}"
else
dnl No libslp could be found, sorry
then
PLUGINS="${PLUGINS} qte_main"
CPPFLAGS_qte="${CPPFLAGS_qte} -DNEED_QTE_MAIN"
- CPPFLAGS_opie="${CPPFLAGS_opie} -DNEED_QTE_MAIN"
+ CPPFLAGS_opie="${CPPFLAGS_opie} -DNEED_QTE_MAIN"
+ CFLAGS_vout_sdl="${CFLAGS_vout_sdl} -DNEED_QTE_MAIN"
CPPFLAGS_qte_main="${CFLAGS_qte_main} ${CPPFLAGS_qte}"
LDFLAGS_qte_main="${LDFLAGS_qte_main} ${LDFLAGS_qte}"
fi
projects / vlc / blobdiff