dnl Autoconf settings for vlc
-AC_INIT(vlc,0.5.0-test4)
+AC_INIT(vlc,0.5.1-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.1-cvs)
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*)
[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_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
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"
dnl
dnl Accelerated modules
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_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}"
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_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"
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_SUBST(CFLAGS_TUNING)
AC_SUBST(CFLAGS_OPTIM)
AC_SUBST(CFLAGS_OPTIM_NODEBUG)
+AC_SUBST(CFLAGS_NOOPTIM)
AC_SUBST(LDFLAGS)
AC_SUBST(CFLAGS_vlc)