dnl Autoconf settings for vlc
-AC_INIT(vlc,0.5.2-test2)
+AC_INIT(vlc,0.5.3-test1)
CONFIGURE_LINE="$0 $*"
CODENAME="Natalya"
AC_PREREQ(2.50)
AC_CONFIG_SRCDIR(src/libvlc.c)
+AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_SYSTEM
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.2-test2)
+AM_INIT_AUTOMAKE(vlc,0.5.3-test1)
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_access_ftp="${LDFLAGS_access_ftp} -lws2_32"
LDFLAGS_access_output_udp="${LDFLAGS_access_output_udp} -lws2_32"
LDFLAGS_sap="${LDFLAGS_sap} -lws2_32"
+ LDFLAGS_slp="${LDFLAGS_slp} -lws2_32"
LDFLAGS_httpd="${LDFLAGS_httpd} -lws2_32"
fi
;;
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"
- LDFALGS_httpd="${LDFLAGS_httpd} -lbind"],
+ LDFLAGS_httpd="${LDFLAGS_httpd} -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
AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes")
-XGETTEXT="${XGETTEXT} --keyword=_NS"
+XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS"
AC_MSG_CHECKING(for suffix of libraries)
AC_MSG_RESULT(${LIBEXT})
dnl Build the gtk_main plugins?
NEED_GTK_MAIN=no
NEED_GNOME_MAIN=no
+NEED_GTK2_MAIN=no
+NEED_GNOME2_MAIN=no
dnl build the qte plugin ?
NEED_QTE_MAIN=no
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
dnl default modules
dnl
-PLUGINS="${PLUGINS} dummy rc logger gestures access_file memcpy"
+BUILTINS="${BUILTINS} mpeg_video idct idctclassic motion"
+PLUGINS="${PLUGINS} dummy rc logger gestures memcpy"
PLUGINS="${PLUGINS} es audio m4v mpeg_system ps ts avi asf aac mp4 rawdv"
-PLUGINS="${PLUGINS} idct idctclassic motion mpeg_video spudec mpeg_audio"
-#PLUGINS="${PLUGINS} a52old imdct downmix imdct3dn downmix3dn imdctsse downmixsse"
-PLUGINS="${PLUGINS} lpcm a52 cinepak"
+PLUGINS="${PLUGINS} spudec mpeg_audio lpcm a52 dts cinepak"
PLUGINS="${PLUGINS} deinterlace invert adjust wall transform distort clone crop motionblur"
-PLUGINS="${PLUGINS} float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif fixed32tofloat32 fixed32tos16 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32"
+PLUGINS="${PLUGINS} float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32"
PLUGINS="${PLUGINS} trivial_resampler ugly_resampler linear_resampler bandlimited_resampler"
PLUGINS="${PLUGINS} trivial_channel_mixer headphone_channel_mixer"
PLUGINS="${PLUGINS} trivial_mixer spdif_mixer float32_mixer"
#PLUGINS="${PLUGINS} scope"
PLUGINS="${PLUGINS} i420_rgb i420_yuy2 i422_yuy2 i420_ymga"
PLUGINS="${PLUGINS} id3 m3u"
-PLUGINS="${PLUGINS} wav araw demuxdump demuxsub adpcm a52sys"
-PLUGINS="${PLUGINS} access_udp access_http ipv4 access_mms access_ftp"
-PLUGINS="${PLUGINS} sap screensaver"
-PLUGINS="${PLUGINS} httpd"
+PLUGINS="${PLUGINS} wav araw demuxdump demuxsub adpcm a52sys au"
+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
+dnl
+if test "x${SYS}" != "xmingw32"; then
+ PLUGINS="${PLUGINS} screensaver"
+fi
dnl
dnl Accelerated modules
if test "x${target_cpu}" = "xi686" -o "x${target_cpu}" = "xi586" -o "x${target_cpu}" = "xx86" -o "x${target_cpu}" = "xi386"
then
ARCH="${ARCH} mmx"
- PLUGINS="${PLUGINS} ${ACCEL_MODULES}"
+ BUILTINS="${BUILTINS} ${ACCEL_MODULES}"
fi
dnl
dnl libid3tag support
dnl
AC_CHECK_HEADERS(id3tag.h, [
- LDFLAGS_id3tag="${LDFLAGS_id3tag} -lz -lid3tag"
- PLUGINS="${PLUGINS} id3tag"])
+ AC_CHECK_HEADERS(zlib.h, [
+ LDFLAGS_id3tag="${LDFLAGS_id3tag} -lid3tag -lz"
+ PLUGINS="${PLUGINS} id3tag"]) ])
dnl
dnl ffmpeg decoder plugin
dnl
dnl MP4 module
dnl
-AC_CHECK_HEADERS(zlib.h, [ LDFLAGS_mp4="${LDFLAGS_mp4} -lz" ] )
+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
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)
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
fi
fi
+dnl
+dnl Gtk+2 module
+dnl
+AC_ARG_ENABLE(gtk2,
+ [ --enable-gtk2 Gtk2 support (default disabled)])
+if test "x${enable_gtk2}" = "xyes"
+then
+ PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
+ CFLAGS_gtk2="${CFLAGS_gtk2} ${GTK2_CFLAGS}"
+ LDFLAGS_gtk2="${LDFLAGS_gtk2} ${GTK2_LIBS}"
+ PLUGINS="${PLUGINS} gtk2"
+ if test "x${SYS}" != "xmingw32"; then
+ NEED_GTK2_MAIN=yes
+ fi
+fi
+
dnl
dnl Familiar module uses Gtk+ library
dnl
CPPFLAGS="${CPPFLAGS_save}"
fi])
+dnl
+dnl Gnome2 module
+dnl
+AC_ARG_ENABLE(gnome2,
+ [ --enable-gnome2 Gnome2 support (default disabled)])
+if test "x${enable_gnome2}" = "xyes"
+then
+ PKG_CHECK_MODULES(GNOME2, [libgnomeui-2.0])
+ CFLAGS_gnome2="${CFLAGS_gnome2} ${GNOME2_CFLAGS}"
+ LDFLAGS_gnome2="${LDFLAGS_gnome2} ${GNOME2_LIBS}"
+ PLUGINS="${PLUGINS} gnome2"
+ if test "x${SYS}" != "xmingw32"; then
+ NEED_GNOME2_MAIN=yes
+ fi
+fi
+
dnl
dnl wxWindows module
dnl
[if test "x${enable_qt}" = "xyes"; then
PLUGINS="${PLUGINS} qt"
ALIASES="${ALIASES} qvlc"
- LDFLAGS_qt="${LDFLAGS_qt} -lqt -L${QTDIR}/lib"
- CPPFLAGS_qt="${CPPFLAGS_qt} -I/usr/include/qt -I${QTDIR}/include"
+ LDFLAGS_qt="${LDFLAGS_qt} -L${QTDIR}/lib"
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt}"
+ AC_CHECK_LIB(qt-mt,main,[
+ LDFLAGS_qt="${LDFLAGS_qt} -lqt-mt"
+ ],[
+ AC_CHECK_LIB(qt,main,[
+ LDFLAGS_qt="${LDFLAGS_qt} -lqt"
+ ])
+ ])
+ LDFLAGS="${LDFLAGS_save}"
+ CPPFLAGS_qt="${CPPFLAGS_qt} -I/usr/include/qt3 -I/usr/include/qt -I${QTDIR}/include"
if test -x ${QTDIR}/bin/moc
then
MOC=${QTDIR}/bin/moc
LDFLAGS_kde="${LDFLAGS_kde} -lkio"
])
LDFLAGS="${LDFLAGS_save}"
- CPPFLAGS_kde="${CPPFLAGS_kde} -I/usr/include/kde -I/usr/include/qt"
+ CPPFLAGS_kde="${CPPFLAGS_kde} -I/usr/include/kde -I/usr/include/qt3 -I/usr/include/qt"
CPPFLAGS_kde="${CPPFLAGS_kde} -I${KDEDIR}/include -I${QTDIR}/include"
if test -x ${QTDIR}/bin/moc
then
[if test "x${enable_macosx}" = "xyes"
then
BUILTINS="${BUILTINS} macosx"
+ PLUGINS="${PLUGINS} coreaudio_resampler"
LDFLAGS_macosx="${LDFLAGS_macosx} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC"
+ LDFLAGS_coreaudio_resampler="${LDFLAGS_coreaudio_resampler} -framework AudioToolbox"
fi],
[AC_CHECK_HEADERS(Cocoa/Cocoa.h,
BUILTINS="${BUILTINS} macosx"
+ PLUGINS="${PLUGINS} coreaudio_resampler"
LDFLAGS_macosx="${LDFLAGS_macosx} -framework CoreAudio -framework AudioToolbox -framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC"
+ LDFLAGS_coreaudio_resampler="${LDFLAGS_coreaudio_resampler} -framework AudioToolbox"
)])
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} gtk_main"
CFLAGS_gtk="${CFLAGS_gtk} -DNEED_GTK_MAIN"
- CFLAGS_familiar="${CFLAGS_familiar} -DNEED_GTK_MAIN"
+ CFLAGS_familiar="${CFLAGS_familiar} -DNEED_GTK_MAIN"
CFLAGS_gtk_main="${CFLAGS_gtk_main} ${CFLAGS_gtk} ${CFLAGS_familiar}"
LDFLAGS_gtk_main="${LDFLAGS_gtk_main} ${LDFLAGS_gtk} ${LDFLAGS_familiar}"
fi
LDFLAGS_gnome_main="${LDFLAGS_gnome_main} ${LDFLAGS_gtk} ${LDFLAGS_familiar} ${LDFLAGS_gnome}"
fi
+if test "x${NEED_GTK2_MAIN}" != "xno"
+then
+ PLUGINS="${PLUGINS} gtk2_main"
+ CFLAGS_gtk2="${CFLAGS_gtk2} -DNEED_GTK2_MAIN"
+ CFLAGS_gtk2_main="${CFLAGS_gtk2_main} ${CFLAGS_gtk2}"
+ LDFLAGS_gtk2_main="${LDFLAGS_gtk2_main} ${LDFLAGS_gtk2}"
+fi
+
+if test "x${NEED_GNOME2_MAIN}" != "xno"
+then
+ PLUGINS="${PLUGINS} gnome2_main"
+ CFLAGS_gnome2_main="${CFLAGS_gnome2_main} ${CFLAGS_gtk2} ${CFLAGS_gnome2}"
+ LDFLAGS_gnome2_main="${LDFLAGS_gnome2_main} ${LDFLAGS_gtk2} ${LDFLAGS_gnome2}"
+fi
+
dnl
dnl qte_main plugin
dnl
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
AC_OUTPUT([
Makefile
+ autotools/Makefile
debian/Makefile
doc/Makefile
intl/Makefile