dnl Autoconf settings for vlc
-AC_INIT(vlc,0.5.1-cvs)
+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.1-cvs)
+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"
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} 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"
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}"
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}"
[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
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