dnl Autoconf settings for vlc
-AC_INIT(vlc,0.5.0-test4)
+AC_INIT(vlc,0.5.2-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.0-test4)
+AM_INIT_AUTOMAKE(vlc,0.5.2-cvs)
AM_CONFIG_HEADER(config.h)
dnl
LDFLAGS_access_udp="${LDFLAGS_access_udp} -lws2_32"
LDFLAGS_access_ftp="${LDFLAGS_access_ftp} -lws2_32"
LDFLAGS_access_output_udp="${LDFLAGS_access_output_udp} -lws2_32"
- LDFLAGS_rc="${LDFLAGS_rc} -lws2_32"
LDFLAGS_sap="${LDFLAGS_sap} -lws2_32"
+ LDFLAGS_httpd="${LDFLAGS_httpd} -lws2_32"
fi
;;
x*nto*)
dnl BONE or not BONE ?
AC_CHECK_LIB( bind, inet_ntoa,
[ LDFLAGS_access_mms="${LDFLAGS_access_mms} -lbind"
- LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind"],
+ LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind"
+ LDFALGS_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)
)])
AC_CHECK_FUNCS(gethostbyname,,[
- AC_CHECK_LIB(nsl,gethostbyname,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lnsl",[
- AC_CHECK_LIB(bind,gethostbyname,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind")])
+ AC_CHECK_LIB(nsl,gethostbyname,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lnsl" LDFLAGS_httpd="${LDFLAGS_httpd} -lnsl",[
+ AC_CHECK_LIB(bind,gethostbyname,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind" LDFLAGS_httpd="${LDFLAGS_httpd} -lbind")])
])
have_nanosleep=false
AC_CHECK_LIB(rt,sem_init, [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"])
AC_CHECK_FUNCS(inet_aton,,[
- AC_CHECK_LIB(resolv,inet_aton,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lresolv")
+ AC_CHECK_LIB(resolv,inet_aton,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lresolv" LDFLAGS_httpd="${LDFLAGS_httpd} -lresolv")
])
dnl Check for getopt
;;
esac
+dnl
+dnl Enable profiling
+dnl
+AC_ARG_ENABLE(gprof,
+[ --enable-gprof gprof profiling (default disabled)])
+AC_ARG_ENABLE(cprof,
+[ --enable-cprof cprof profiling (default disabled)])
+AM_CONDITIONAL(GPROF, test "${enable_gprof}" = "yes")
+AM_CONDITIONAL(CPROF, test "${enable_gprof}" = "yes")
+
dnl
dnl default modules
dnl
-PLUGINS="${PLUGINS} dummy rc logger access_file memcpy"
+PLUGINS="${PLUGINS} dummy rc logger gestures access_file memcpy"
PLUGINS="${PLUGINS} es audio m4v mpeg_system ps ts"
PLUGINS="${PLUGINS} idct idctclassic motion mpeg_video spudec mpeg_audio"
#PLUGINS="${PLUGINS} a52old imdct downmix imdct3dn downmix3dn imdctsse downmixsse"
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"
+PLUGINS="${PLUGINS} sap screensaver"
+PLUGINS="${PLUGINS} httpd"
dnl
dnl Accelerated modules
dnl
-MMX_MODULES="memcpymmx idctmmx motionmmx i420_rgb_mmx i420_yuy2_mmx i422_yuy2_mmx i420_ymga_mmx"
+MMX_MODULES="memcpymmx idctmmx motionmmx i420_rgb_mmx i422_yuy2_mmx i420_ymga_mmx"
MMXEXT_MODULES="memcpymmxext idctmmxext motionmmxext"
THREEDNOW_MODULES="memcpy3dn"
SSE_MODULES=""
ALTIVEC_MODULES="idctaltivec motionaltivec memcpyaltivec"
+if test "${enable_gprof}" != "yes"
+then
+ MMX_MODULES="${MMX_MODULES} i420_yuy2_mmx"
+fi
+
AC_CACHE_CHECK([if \$CC groks MMX inline assembly],
[ac_cv_mmx_inline],
[CFLAGS="${CFLAGS_save}"
[ --enable-sout Stream output modules (default enabled)])
if test "x${enable_sout}" != "xno"
then
- PLUGINS="${PLUGINS} access_output_dummy access_output_udp access_output_file"
+ PLUGINS="${PLUGINS} access_output_dummy access_output_udp access_output_file access_output_http"
PLUGINS="${PLUGINS} mux_ts mux_ps mux_avi mux_dummy"
PLUGINS="${PLUGINS} packetizer_mpegaudio packetizer_mpegvideo packetizer_a52"
PLUGINS="${PLUGINS} packetizer_mpeg4video packetizer_mpeg4audio"
PLUGINS="${PLUGINS} packetizer_copy"
PLUGINS="${PLUGINS} vout_encoder"
+
+ dnl Ogg/ogm
+ AC_CHECK_HEADERS(ogg/ogg.h, [
+ AC_CHECK_LIB( ogg, ogg_stream_packetin, [
+ PLUGINS="${PLUGINS} mux_ogg"
+ LDFLAGS_mux_ogg="${LDFLAGS_mux_ogg} -logg" ])
+ ],[])
fi
PLUGINS="${PLUGINS} ipv6"],[AC_MSG_RESULT(no)])
fi
+
dnl
dnl AVI demux plugin
dnl
dnl
AC_ARG_ENABLE(mad,
[ --enable-mad libmad module (default disabled)])
-if test "x${enable_mad}" = "xyes"
+if test "x${enable_mad}" != "xno"
then
AC_ARG_WITH(mad,
[ --with-mad=PATH path to libmad],[],[])
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_xvid}"
AC_CHECK_HEADERS(xvid.h, ,
[ AC_MSG_ERROR([Cannot find development headers for libxvidcore...]) ])
- AC_CHECK_LIB(xvid, xvid_init, [
+ AC_CHECK_LIB(xvidcore, xvid_init, [
PLUGINS="${PLUGINS} xvid"
- LDFLAGS_xvid="${LDFLAGS_xvid} -lxvid" ],
+ LDFLAGS_xvid="${LDFLAGS_xvid} -lxvidcore" ],
[ AC_MSG_ERROR([Cannot find libxvidcore library...]) ])
LDFLAGS="${LDFLAGS_save}"
CPPFLAGS="${CPPFLAGS_save}"
LDFLAGS_a52tofloat32="${LDFLAGS_test} -la52 ${LDFLAGS_a52tofloat32}"
CPPFLAGS_a52tofloat32="${CPPFLAGS_a52tofloat32} ${CPPFLAGS_test}"
],[
- if test "x${enable_dvbpsi}" != "x"
- then
- AC_MSG_ERROR([Could not find a52 on your system: you may get it from http://liba52.sf.net])
- fi
+ AC_MSG_ERROR([Could not find a52 on your system: you may get it from http://liba52.sf.net/. Alternatively you can use --disable-a52 to disable the a52 plugin.])
])
])
CPPFLAGS="${CPPFLAGS_save}"
],[])
fi
+dnl
+dnl Flac plugin
+dnl
+AC_ARG_ENABLE(flac,
+ [ --enable-flac flac decoder support (default disabled)])
+if test "x${enable_flac}" = "xyes"
+then
+ AC_CHECK_HEADERS(FLAC/stream_decoder.h, [
+ PLUGINS="${PLUGINS} flac flacdec"
+ LDFLAGS_flacdec="${LDFLAGS_flacdec} -lFLAC"
+ ],[])
+fi
+
+dnl
+dnl Libmpeg2 plugin
+dnl
+AC_ARG_ENABLE(libmpeg2,
+ [ --enable-libmpeg2 libmpeg2 decoder support (default disabled)])
+if test "x${enable_libmpeg2}" = "xyes"
+then
+ AC_CHECK_HEADERS(mpeg2dec/mpeg2.h, [
+ PLUGINS="${PLUGINS} libmpeg2"
+ LDFLAGS_libmpeg2="${LDFLAGS_libmpeg2} -lmpeg2"
+ ],[])
+fi
+
dnl
dnl Vorbis plugin
dnl
LDFLAGS_vorbis="${LDFLAGS_vorbis} -lvorbis -logg"
],[])
fi
-
+
dnl
dnl Tremor plugin
dnl
AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false")
if test "x${have_alsa}" = "xtrue"
then
+ AC_TRY_COMPILE([#define ALSA_PCM_NEW_HW_PARAMS_API
+ #define ALSA_PCM_NEW_SW_PARAMS_API
+ #include <alsa/asoundlib.h>],
+ [void foo() { snd_pcm_hw_params_get_period_time(0,0,0); }],
+ AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4))
PLUGINS="${PLUGINS} alsa"
LDFLAGS_alsa="${LDFLAGS_alsa} -lasound -lm -ldl"
else
[if test "x${enable_kde}" = "xyes"; then
PLUGINS="${PLUGINS} kde"
ALIASES="${ALIASES} kvlc"
- LDFLAGS_kde="${LDFLAGS_kde} -L${KDEDIR}/lib -lkfile"
+ LDFLAGS_kde="${LDFLAGS_kde} -L${KDEDIR}/lib"
+ dnl Check for -lkfile (only in KDE 2) or -lkdeui -lkio (KDE 3)
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}"
+ AC_CHECK_LIB(kfile,main,[
+ LDFLAGS_kde="${LDFLAGS_kde} -lkfile"
+ ])
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}"
+ AC_CHECK_LIB(kdeui,main,[
+ LDFLAGS_kde="${LDFLAGS_kde} -lkdeui"
+ ])
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}"
+ AC_CHECK_LIB(kio,main,[
+ 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${KDEDIR}/include -I${QTDIR}/include"
if test -x ${QTDIR}/bin/moc
AC_DEFINE(WORDS_BIGENDIAN, 1, big endian system)
fi
-dnl
-dnl Profiling
-dnl
-AC_ARG_ENABLE(gprof,
-[ --enable-gprof gprof profiling (default disabled)])
-AC_ARG_ENABLE(cprof,
-[ --enable-cprof cprof profiling (default disabled)])
-AM_CONDITIONAL(GPROF, test "x${enable_gprof}" = "xyes")
-AM_CONDITIONAL(CPROF, test "x${enable_gprof}" = "xyes")
-
dnl
dnl GNU portable threads
dnl
dnl Stuff used by the program
dnl
AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string])
-AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VideoLAN Client - version ${VERSION} ${CODENAME} - (c) 1996-2003 VideoLAN", [Copyright string])
+AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2003 VideoLAN", [Copyright string])
AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line])
VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-/__/'`"
AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
AC_DEFINE_UNQUOTED(LIBEXT, "${LIBEXT}", [Dynamic object extension])
-DATA_PATH="${ac_tool_prefix}/share/videolan"
+DATA_PATH="${ac_tool_prefix}/share/vlc"
AC_SUBST(DATA_PATH)
-PLUGIN_PATH="${ac_tool_prefix}/share/videolan"
+PLUGIN_PATH="${ac_tool_prefix}/lib/vlc"
AC_SUBST(PLUGIN_PATH)
dnl
projects / vlc / blobdiff