dnl Check for dbus
AC_ARG_ENABLE(dbus,
[ --enable-dbus Linux D-BUS message bus system (default enabled)])
-
-if test "${enable_dbus}" != "no" -a "$SYS" = "Linux"
+
+if test "${enable_dbus}" != "no" -a "${SYS}" = "linux"
then
dnl api stable dbus
PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0.0,
if test "${ac_cv_c_altivec}" != "no"; then
CPPFLAGS="${CPPFLAGS_save} ${ac_cv_c_altivec}"
fi
-AC_CHECK_HEADERS(altivec.h)
-CPPFLAGS="${CPPFLAGS_save}"
-if test "${ac_cv_c_altivec}" != "no" -a "${enable_altivec}" != "no" ; then
- AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.)
- VLC_ADD_CFLAGS([libvlc],[${ac_cv_c_altivec}])
- VLC_ADD_CFLAGS([idctaltivec motionaltivec],[${ac_cv_c_altivec}])
- VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}])
- if test "${ac_cv_altivec_inline}" = "no"; then
- ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
+AS_IF( test "${enable_altivec}" != "no",
+[
+ AC_CHECK_HEADERS(altivec.h)
+ CPPFLAGS="${CPPFLAGS_save}"
+
+ if test "${ac_cv_c_altivec}" != "no"; then
+ AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.)
+ VLC_ADD_CFLAGS([libvlc],[${ac_cv_c_altivec}])
+ VLC_ADD_CFLAGS([idctaltivec motionaltivec],[${ac_cv_c_altivec}])
+ VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}])
+ if test "${ac_cv_altivec_inline}" = "no"; then
+ ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
+ fi
fi
-fi
+],[
+ CPPFLAGS="${CPPFLAGS_save}"
+])
AC_CACHE_CHECK([if linker needs -framework vecLib],
[ac_cv_ld_altivec],
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
AC_CHECK_HEADERS(ffmpeg/avformat.h)
- AC_CHECK_HEADERS(ffmpeg/swscale.h)
AC_CHECK_HEADERS(ffmpeg/avutil.h)
AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
CPPFLAGS="${CPPFLAGS_save}"
AC_CHECK_LIB(swscale, sws_getContext, [
+ AC_CHECK_HEADERS(ffmpeg/swscale.h)
VLC_ADD_LDFLAGS([ffmpeg],[-lswscale]) ], [], [-lavcodec $LDAVUTIL])
LDFLAGS="${LDFLAGS_save}"
CPPFLAGS="${CPPFLAGS_save}"
dnl
enableqt4=false
AC_ARG_ENABLE(qt4,
- [ --enable-qt4 QT 4 support (default disabled) ])
-AS_IF([test "${enable_qt4}" = "yes"], [
+ [ --enable-qt4 QT 4 support (default enabled) ])
+AS_IF([test "${enable_qt4}" != "no" &&
+ (test "${SYS}" != "darwin" || test "${enable_qt4}" = "yes")], [
PKG_CHECK_MODULES(QT4, QtCore QtGui,
[ VLC_ADD_PLUGINS([qt4])
ALIASES="${ALIASES} qvlc"
MOC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/moc
RCC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/rcc
UIC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/uic],
- [AC_MSG_ERROR(QT4 library not found)])
+ AS_IF([test "${enable_qt4}" = "yes"],[
+ AC_MSG_ERROR(QT4 library not found)
+ ],[
+ AC_MSG_WARN(QT4 library not found)
+ ])
+ )
])
AM_CONDITIONAL(ENABLE_QT4, test "$enableqt4" = "true")
[ --enable-macosx MacOS X support (default enabled on MacOS X)],
[if test "${enable_macosx}" = "yes"
then
- VLC_ADD_BUILTINS([macosx])
- VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL])
+ VLC_ADD_PLUGINS([access_eyetv])
+ VLC_ADD_LDFLAGS([access_eyetv], [-framework CoreFoundation])
+ VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL -framework QTKit])
VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] )
fi],
[AC_CHECK_HEADERS(Cocoa/Cocoa.h,
+ VLC_ADD_PLUGINS([access_eyetv])
+ VLC_ADD_LDFLAGS([access_eyetv], [-framework CoreFoundation])
VLC_ADD_BUILTINS([macosx])
- VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL])
+ VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL -framework QTKit])
VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] )
)])
CFLAGS=$ORIGCFLAGS
])
])
+AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"])
+AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"])
+
dnl
dnl Endianness check, AC_C_BIGENDIAN doesn't work if we are cross-compiling
AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"])
AS_IF([test "${enable_loader}" = "yes"],
[ VLC_ADD_PLUGINS([dmo])
- VLC_ADD_CPPFLAGS([dmo],[-I../../../@top_srcdir@/loader])
- VLC_ADD_LDFLAGS([dmo],[../../../loader/libloader.la -lpthread])
- VLC_ADD_CPPFLAGS([quicktime],[-I../../@top_srcdir@/loader])
- VLC_ADD_LDFLAGS([quicktime],[../../loader/libloader.la -lpthread])
- VLC_ADD_CPPFLAGS([realaudio],[-I../../@top_srcdir@/loader -DLOADER])
- VLC_ADD_LDFLAGS([realaudio],[../../loader/libloader.la -ldl -lpthread])
+ VLC_ADD_CPPFLAGS([dmo],[-I../../../@top_srcdir@/libs/loader])
+ VLC_ADD_LDFLAGS([dmo],[../../../libs/loader/libloader.la -lpthread])
+ VLC_ADD_CPPFLAGS([quicktime],[-I../../@top_srcdir@/libs/loader])
+ VLC_ADD_LDFLAGS([quicktime],[../../libs/loader/libloader.la -lpthread])
+ VLC_ADD_CPPFLAGS([realaudio],[-I../../@top_srcdir@/libs/loader -DLOADER])
+ VLC_ADD_LDFLAGS([realaudio],[../../libs/loader/libloader.la -ldl -lpthread])
])
dnl
doc/Makefile
intl/Makefile
ipkg/Makefile
- loader/Makefile
+ libs/Makefile
+ libs/loader/Makefile
+ libs/srtp/Makefile
modules/Makefile
mozilla/Makefile
m4/Makefile