dnl Autoconf settings for vlc
-AC_INIT(vlc,0.5.0-test3)
+AC_INIT(vlc,0.5.2)
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-test3)
+AM_INIT_AUTOMAKE(vlc,0.5.2)
AM_CONFIG_HEADER(config.h)
dnl
CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="${OBJCFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; OBJCFLAGS="${OBJCFLAGS_save}"
LDFLAGS_vlc="${LDFLAGS_vlc} -all_load"
+ LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -all_load"
LIBEXT=".dylib"
;;
x*mingw32* | x*cygwin*)
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_slp="${LDFLAGS_slp} -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*)
])
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})
[CFLAGS="${CFLAGS_save} -mms-bitfields"
AC_TRY_COMPILE([],,ac_cv_c_mms_bitfields=yes, ac_cv_c_mms_bitfields=no)])
if test x"$ac_cv_c_mms_bitfields" != x"no"; then
- CFLAGS_mingw32_special="-mms-bitfields"
+ CFLAGS_save="${CFLAGS_save} -mms-bitfields";
+ CXXFLAGS_save="${CXXFLAGS_save} -mms-bitfields";
else
- CFLAGS_mingw32_special="-fnative-struct"
+ AC_CACHE_CHECK([if \$CC accepts -fnative-struct],
+ [ac_cv_c_fnative_struct],
+ [CFLAGS="${CFLAGS_save} -fnative-struct"
+ AC_TRY_COMPILE([],,ac_cv_c_fnative_struct=yes, ac_cv_c_fnative_struct=no)])
+ if test x"$ac_cv_c_fnative_struct" != x"no"; then
+ CFLAGS_save="${CFLAGS_save} -fnative-struct";
+ CXXFLAGS_save="${CXXFLAGS_save} -fnative-struct";
+ fi
fi
- CFLAGS_save="${CFLAGS_save} ${CFLAGS_mingw32_special}";
- CXXFLAGS_save="${CXXFLAGS_save} ${CFLAGS_mingw32_special}";
CFLAGS="${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
fi
)])
AC_CHECK_FUNCS(gethostbyname,,[
- AC_CHECK_LIB(nsl,gethostbyname,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lnsl",[
- AC_CHECK_LIB(bind,gethostbyname,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lbind")])
-])
-
-have_nanosleep=false
-AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[
- AC_CHECK_LIB(rt,nanosleep,
- [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"; have_nanosleep=:],
- [AC_CHECK_LIB(posix4,nanosleep,
- [LDFLAGS_vlc="${LDFLAGS_vlc} -lposix4"; have_nanosleep=:])]
- )
+ 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")])
])
-if ${have_nanosleep}; then
- AC_DEFINE(HAVE_NANOSLEEP, 1,
- Define if nanosleep is available.)
-fi
dnl Check for socklen_t
AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
Define if <sys/socket.h> defines socklen_t.)
fi
-dnl HP/UX port
-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
LDFLAGS_i420_rgb="${LDFLAGS_i420_rgb} -lm"
LDFLAGS_faad="${LDFLAGS_faad} -lm"
)
+AC_CHECK_LIB(m,sqrt,
+ LDFLAGS_headphone_channel_mixer="${LDFLAGS_headphone_channel_mixer} -lm"
+)
dnl Check for pthreads - borrowed from XMMS
THREAD_LIB=error
dnl Check for cthreads under GNU/Hurd for instance
AC_CHECK_LIB(threads,cthread_fork,THREAD_LIB="-lthreads")
+dnl
+dnl GNU portable threads
+dnl
+AC_ARG_ENABLE(pth,
+ [ --enable-pth GNU Pth support (default disabled)],
+ [ if test "x${enable_pth}" = "xyes"; then
+ AC_CHECK_LIB(pth,pth_init)
+ AC_MSG_CHECKING(for pth_init in pth.h)
+ AC_EGREP_HEADER(pth_init,pth.h,[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(PTH_INIT_IN_PTH_H, 1,
+ Define if <pth.h> defines pth_init)
+ THREAD_LIB="-lpth"
+ ],[
+ AC_MSG_RESULT(no)
+ ])
+ fi
+])
+
+dnl
+dnl State Threads
+dnl
+AC_ARG_ENABLE(st,
+ [ --enable-st State Threads (default disabled)],
+ [ if test "x${enable_st}" = "xyes"; then
+ AC_CHECK_LIB(st,st_init)
+ AC_MSG_CHECKING(for st_init in st.h)
+ AC_EGREP_HEADER(st_init,st.h,[
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(ST_INIT_IN_ST_H, 1,
+ Define if <st.h> defines st_init)
+ THREAD_LIB="-lst"
+ ],[
+ AC_MSG_RESULT(yes)
+ ])
+ fi
+])
+
+if test "x${SYS}" != "xmingw32"; then
+ LDFLAGS_vlc="${LDFLAGS_vlc} ${THREAD_LIB}"
+ LDFLAGS_plugins="${LDFLAGS_plugins} ${THREAD_LIB}"
+fi
+
+dnl Don't link with rt when using GNU-pth
+if test "x${THREAD_LIB}" != "x-lpth" && test "x${THREAD_LIB}" != "x-lst"; then
+ dnl HP/UX port
+ AC_CHECK_LIB(rt,sem_init, [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"])
+
+ have_nanosleep=false
+ AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[
+ AC_CHECK_LIB(rt,nanosleep,
+ [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"; have_nanosleep=:],
+ [AC_CHECK_LIB(posix4,nanosleep,
+ [LDFLAGS_vlc="${LDFLAGS_vlc} -lposix4"; have_nanosleep=:])]
+ )
+ ])
+ if ${have_nanosleep}; then
+ AC_DEFINE(HAVE_NANOSLEEP, 1,
+ Define if nanosleep is available.)
+ fi
+fi
+
dnl Check for misc headers
AC_MSG_CHECKING(for pthread_cond_t in pthread.h)
AC_EGREP_HEADER(pthread_cond_t,pthread.h,[
AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)])
if test "x${ac_cv_c_o3}" != "xno"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3"
-else
- AC_CACHE_CHECK([if \$CC accepts -O2],
- [ac_cv_c_o2],
- [CFLAGS="${CFLAGS_save} -O2"
- AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)])
- if test "x${ac_cv_c_o2}" != "xno"; then
+fi
+
+AC_CACHE_CHECK([if \$CC accepts -O2],
+ [ac_cv_c_o2],
+ [CFLAGS="${CFLAGS_save} -O2"
+ AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)])
+if test "x${ac_cv_c_o2}" != "xno"; then
+ if test "x${ac_cv_c_o3}" = "xno"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2"
- else
- AC_CACHE_CHECK([if \$CC accepts -O],
- [ac_cv_c_o],
- [CFLAGS="${CFLAGS_save} -O"
- AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
- if test "x${ac_cv_c_o}" != "xno"; then
+ fi
+ CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O2"
+else
+ AC_CACHE_CHECK([if \$CC accepts -O],
+ [ac_cv_c_o],
+ [CFLAGS="${CFLAGS_save} -O"
+ AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)])
+ if test "x${ac_cv_c_o}" != "xno"; then
+ if test "x${ac_cv_c_o3}" = "xno"; then
CFLAGS_OPTIM="${CFLAGS_OPTIM} -O"
- fi
+ fi
+ CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O"
fi
fi
;;
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} 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} lpcm a52"
+BUILTINS="${BUILTINS} mpeg_video idct idctclassic motion"
+PLUGINS="${PLUGINS} dummy rc logger gestures access_file 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} float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif fixed32tofloat32 fixed32tos16 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32"
-PLUGINS="${PLUGINS} trivial_resampler ugly_resampler linear_resampler"
+PLUGINS="${PLUGINS} float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 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} aout_file"
#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} wav araw demuxdump demuxsub adpcm a52sys au"
PLUGINS="${PLUGINS} access_udp access_http ipv4 access_mms access_ftp"
-PLUGINS="${PLUGINS} sap"
+PLUGINS="${PLUGINS} 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
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}"
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
[ --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
-AC_ARG_ENABLE(avi,
- [ --enable-avi AVI demux module (default enabled)])
-if test "x${enable_avi}" != "xno"
-then
- PLUGINS="${PLUGINS} avi"
-fi
-
-dnl
-dnl ASF demux plugin
-dnl
-AC_ARG_ENABLE(asf,
- [ --enable-asf ASF demux module (default enabled)])
-if test "x${enable_asf}" != "xno"
-then
- PLUGINS="${PLUGINS} asf"
-fi
-
-dnl
-dnl AAC demux plugin
-dnl
-AC_ARG_ENABLE(aac,
- [ --enable-aac AAC demux module (default enabled)])
-if test "x${enable_aac}" != "xno"
-then
- PLUGINS="${PLUGINS} aac"
-fi
-
dnl
dnl ogg plugin
dnl
],[])
fi
-dnl
-dnl raw dv demux plugin
-dnl
-AC_ARG_ENABLE(rawdv,
- [ --enable-rawdv raw dv demux module (default enabled)])
-if test "x${enable_rawdv}" != "xno"
-then
- PLUGINS="${PLUGINS} rawdv"
-fi
-
dnl
dnl Codec plugins
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],[],[])
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
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}"
dnl
dnl MP4 module
dnl
-AC_ARG_ENABLE(mp4,
- [ --enable-mp4 MP4 demux module (default enabled)])
-if test "x${enable_mp4}" != "xno"
-then
-
- PLUGINS="${PLUGINS} mp4"
- AC_CHECK_HEADERS(zlib.h,
- [ LDFLAGS_mp4="${LDFLAGS_mp4} -lz" ] )
-fi
+AC_CHECK_HEADERS(zlib.h, [
+ LDFLAGS_mp4="${LDFLAGS_mp4} -lz"
+] )
dnl
dnl a52 AC3 decoder plugin
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
fi
-dnl
-dnl cinepak plugin
-dnl
-AC_ARG_ENABLE(cinepak,
- [ --enable-cinepak Cinepak decoder (default enabled)])
-if test "x${enable_cinepak}" != "xno"
-then
- PLUGINS="${PLUGINS} cinepak"
-fi
-
dnl
dnl DV plugin
dnl
],[])
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
+ AC_MSG_ERROR([Could not find ALSA development headers])
fi
fi])
[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
if test "x${enable_xosd}" = "xyes"
then
AC_CHECK_HEADER(xosd.h, have_xosd="true", have_xosd="false")
- AC_TRY_COMPILE([#include <xosd.h>],
- [void foo() { xosd_init("foo","bar",12,XOSD_top,2,12,42); }],,
- AC_DEFINE(HAVE_OLD_XOSD_H, 1, Define if <xosd.h> is pre-1.0.0))
+ AC_CHECK_LIB(xosd,xosd_set_offset,
+ AC_DEFINE(HAVE_XOSD_VERSION_1, 1, Define if <xosd.h> is 1.0.x),
+ AC_CHECK_LIB(xosd,xosd_set_horizontal_offset,
+ AC_DEFINE(HAVE_XOSD_VERSION_2, 1, Define if <xosd.h> is 2.0.x),
+ AC_TRY_COMPILE([#include <xosd.h>],
+ [void foo() { xosd_init("foo","bar",12,XOSD_top,2,12,42); }],,
+ AC_DEFINE(HAVE_XOSD_VERSION_0, 1, Define if <xosd.h> is pre-1.0.0))))
if test "x${have_xosd}" = "xtrue"
then
PLUGINS="${PLUGINS} xosd"
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
-AC_ARG_ENABLE(pth,
- [ --enable-pth GNU Pth support (default disabled)],
- [ if test "x${enable_pth}" = "xyes"; then
- AC_CHECK_LIB(pth,pth_init)
- AC_MSG_CHECKING(for pth_init in pth.h)
- AC_EGREP_HEADER(pth_init,pth.h,[
- AC_MSG_RESULT(yes)
- AC_DEFINE(PTH_INIT_IN_PTH_H, 1,
- Define if <pth.h> defines pth_init)
- THREAD_LIB="-lpth"
- ],[
- AC_MSG_RESULT(no)
- ])
- fi
-])
-
-dnl
-dnl State Threads
-dnl
-AC_ARG_ENABLE(st,
- [ --enable-st State Threads (default disabled)],
- [ if test "x${enable_st}" = "xyes"; then
- AC_CHECK_LIB(st,st_init)
- AC_MSG_CHECKING(for st_init in st.h)
- AC_EGREP_HEADER(st_init,st.h,[
- AC_MSG_RESULT(yes)
- AC_DEFINE(ST_INIT_IN_ST_H, 1,
- Define if <st.h> defines st_init)
- THREAD_LIB="-lst"
- ],[
- AC_MSG_RESULT(yes)
- ])
- fi
-])
-
-if test "x${SYS}" != "xmingw32"; then
- LDFLAGS_vlc="${LDFLAGS_vlc} ${THREAD_LIB}"
- LDFLAGS_plugins="${LDFLAGS_plugins} ${THREAD_LIB}"
-fi
-
dnl
dnl Mozilla plugin
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
AC_SUBST(XPIDL)
AC_SUBST(LIBEXT)
AC_SUBST(INCLUDES)
+AC_SUBST(ALL_LINGUAS)
AC_SUBST(CFLAGS_TUNING)
AC_SUBST(CFLAGS_OPTIM)
AC_SUBST(CFLAGS_OPTIM_NODEBUG)
+AC_SUBST(CFLAGS_NOOPTIM)
AC_SUBST(LDFLAGS)
AC_SUBST(CFLAGS_vlc)