dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.178 2004/02/10 17:36:45 gbazin Exp $
+dnl $Id$
-AC_INIT(vlc,0.7.1-test1)
+AC_INIT(vlc,0.7.2-cvs)
CONFIGURE_LINE="$0 $*"
CODENAME="Bond"
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.7.1-test1)
+AM_INIT_AUTOMAKE(vlc,0.7.2-cvs)
AM_CONFIG_HEADER(config.h)
dnl
AM_PROG_CC_C_O
AC_PROG_CPP
AC_PROG_CXX
+AC_PROG_CXXCPP
AC_PROG_MAKE_SET
AC_PROG_INSTALL
# add ws2_32 for closesocket, select, recv
CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
AX_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows])
- AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http httpd stream_out_standard],[-lws2_32])
+ AX_ADD_LDFLAGS([vcdx cddax],[-lwinmm])
+ AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard telnet],[-lws2_32])
fi
;;
*nto*)
AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes")
XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS"
+AC_ARG_ENABLE(utf8,
+ [ --enable-utf8 unicode utf8 support (default enabled on darwin/beos/win32)])
+if test "${enable_utf8}" = "yes" || (test "${enable_utf8}" != "no" && (test "${SYS}" = "mingw32" || test "${SYS}" = "beos" || test "${SYS}" = "darwin" ) )
+then
+ AC_DEFINE(ENABLE_UTF8, 1,
+ Define if you want utf8 support)
+fi
+
AC_MSG_CHECKING(for suffix of libraries)
AC_MSG_RESULT(${LIBEXT})
dnl Check for system libs needed
need_libc=false
-AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r)
+AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r)
dnl Check for usual libc functions
AC_CHECK_FUNCS(strdup strndup atof lseek)
AC_CHECK_FUNCS(send,,[
AC_CHECK_LIB(socket,send,[
- AX_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp sap httpd access_output_udp stream_out_standard],[-lsocket])
+ AX_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp sap access_output_udp stream_out_standard],[-lsocket])
])
])
AC_CHECK_FUNCS(gethostbyname,,[
AC_CHECK_LIB(nsl,gethostbyname,[
- AX_ADD_LDFLAGS([cddax ipv4 httpd vlc],[-lnsl])
+ AX_ADD_LDFLAGS([cddax ipv4 vlc],[-lnsl])
],[
AC_CHECK_LIB(bind,gethostbyname,[
- AX_ADD_LDFLAGS([ipv4 access_mms httpd],[-lbind])
+ AX_ADD_LDFLAGS([ipv4 access_mms],[-lbind])
])
])
])
AC_CHECK_FUNCS(inet_aton,,[
AC_CHECK_LIB(resolv,inet_aton,[
- AX_ADD_LDFLAGS([ipv4 httpd],[-lresolv])
+ AX_ADD_LDFLAGS([ipv4 vlc],[-lresolv])
])
])
AC_MSG_RESULT(no)])
dnl Check for headers
-AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h)
+AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h stdbool.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h)
AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h)
AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
if test "${SYS}" != "mingw32"; then
dnl
dnl default modules
dnl
-AX_ADD_PLUGINS([dummy rc logger gestures memcpy hotkeys])
+AX_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys])
AX_ADD_PLUGINS([mpgv mpga m4v mpeg_system ps ps2 pva ts avi asf aac mp4 rawdv demux2 nsv real aiff])
AX_ADD_PLUGINS([cvdsub svcdsub spudec dvbsub mpeg_audio lpcm a52 dts cinepak])
AX_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur])
AX_ADD_PLUGINS([trivial_channel_mixer headphone_channel_mixer])
AX_ADD_PLUGINS([trivial_mixer spdif_mixer float32_mixer])
AX_ADD_PLUGINS([aout_file])
-#AX_ADD_PLUGINS([scope])
AX_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga])
-AX_ADD_PLUGINS([id3 m3u])
+AX_ADD_PLUGINS([id3 m3u playlist export])
AX_ADD_PLUGINS([rawvideo])
AX_ADD_PLUGINS([wav araw demuxdump demuxsub adpcm a52sys dtssys au])
AX_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms])
-AX_ADD_PLUGINS([access_ftp access_directory sap httpd http])
+AX_ADD_PLUGINS([access_ftp access_directory sap http])
dnl
dnl Switch to enable a version of VLC where most modules will be builtin
if test "${SYS}" = "darwin"
then
AX_ADD_PLUGINS([vcd cdda])
- AX_ADD_LDFLAGS([vcd cdda],[-framework IOKit -framework CoreFoundation])
+ AX_ADD_LDFLAGS([vcd vcdx cdda],[-framework IOKit -framework CoreFoundation])
fi
fi
AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
AX_ADD_BUILTINS([ffmpeg stream_out_transcode])
AX_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec -lavcodec])
- AX_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavcodec])
+ AX_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat])
if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then
AC_DEFINE(HAVE_LIBAVFORMAT, 1, [Define if you have ffmpeg's libavformat.])
dnl XXX: we don't link with -lavcodec a 2nd time because the OS X
dnl linker would miserably barf on multiple definitions.
AX_ADD_LDFLAGS([stream_out_transcode],[-L${real_ffmpeg_tree}/libavcodec])
- AX_ADD_CPPFLAGS([stream_out_transcode],[-I${real_ffmpeg_tree}/libavcodec])
+ AX_ADD_CPPFLAGS([stream_out_transcode],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat])
fi
fi
[ --enable-dts DTS Coherent Acoustics support with libdts (default enabled)])
if test "${enable_dts}" != "no"; then
AC_ARG_WITH(dts-tree,
- [ --with-dts-tree=PATH dtsdec tree for static linking ],[],[])
+ [ --with-dts-tree=PATH libdts tree for static linking ],[],[])
if test "${with_dts_tree}" != "no" -a -n "${with_dts_tree}"
then
real_dts_tree="`cd ${with_dts_tree} 2>/dev/null && pwd`"
AC_MSG_RESULT(no)
AC_MSG_ERROR([${with_dts_tree} directory doesn't exist])
fi
- dnl Use a custom dtsdec
+ dnl Use a custom libdts
AC_MSG_CHECKING(for dts.h in ${real_dts_tree}/include)
if test -f ${real_dts_tree}/include/dts.h
then
AC_MSG_RESULT(yes)
- AX_ADD_CPPFLAGS([dtstofloat32],[-I${real_dts_tree}])
- AX_ADD_LDFLAGS([dtstofloat32],[-L${real_dts_tree}/libdts/.libs])
+ AX_ADD_CPPFLAGS([dtstofloat32],[-I${real_dts_tree}/include])
+ AX_ADD_LDFLAGS([dtstofloat32],[-L${real_dts_tree}/libdts])
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_dtstofloat32}"
AC_CHECK_LIB(dts, dts_free, [
AX_ADD_BUILTINS([dtstofloat32])
- AX_ADD_CPPFLAGS([dtstofloat32],[-DUSE_DTSDEC_TREE])
AX_ADD_LDFLAGS([dtstofloat32],[-ldts])
],[
- if test -f ${real_dts_tree}/libdts/.libs/libdts.a
+ if test -f ${real_dts_tree}/libdts/libdts.a
then
- AC_MSG_ERROR([make sure you have at least dtsdec-0.1.0])
+ AC_MSG_ERROR([make sure you have at least libdts-0.0.2])
else
AC_MSG_ERROR([the specified tree hasn't been compiled])
fi
AC_MSG_ERROR([the specified tree doesn't have dts.h])
fi
else
- AC_CHECK_HEADERS(dtsdec/dts.h, [
+ AC_CHECK_HEADERS(dts.h, [
AC_CHECK_LIB(dts, dts_free, [
AX_ADD_PLUGINS([dtstofloat32])
AX_ADD_LDFLAGS([dtstofloat32],[-ldts])
AX_ADD_LDFLAGS([freetype],[`${FREETYPE_CONFIG} --libs` ${LIBICONV}])
AC_CHECK_HEADERS(Carbon/Carbon.h,
[AX_ADD_LDFLAGS([freetype],[-framework Carbon])])
- CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_freetype}"
elif test "${enable_freetype}" = "yes"
then
AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2
if test "${XML2_CONFIG}" != "no"; then
AX_ADD_CPPFLAGS([skins2],[`${XML2_CONFIG} --cflags`])
AX_ADD_LDFLAGS([skins2],[`${XML2_CONFIG} --libs`])
+ dnl skins2 depends on the xmlTextReader extension
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_skins2}"
+ AC_CHECK_LIB(xml2,xmlTextReaderConstName,[],[
+ skins2_missing_lib="yes"
+ AC_MSG_WARN([libxml2 missing the xmlTextReader extension, you should update your version])
+ if test "${enable_skins2}" = "yes"; then
+ AC_MSG_ERROR([libxml2 missing the xmlTextReader extension (required for skins2)])
+ fi])
+ LDFLAGS="${LDFLAGS_save}"
else
skins2_missing_lib="yes"
if test "${enable_skins2}" = "yes"; then
dnl
dnl PDA Gtk+2 module
dnl
-#AC_ARG_ENABLE(pda,
-# [ --enable-pda PDA interface needs Gtk2 support (default disabled)])
-#if test "x${enable_pda}" = "xyes"
-#then
- # PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
-# AX_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}])
-# AX_ADD_LDFLAGS([gtk2],[${GTK2_LIBS}])
-# AX_ADD_CFLAGS([pda],[${GTK2_CFLAGS} ${CFLAGS_pda}])
-# AX_ADD_LDFLAGS([pda],[${GTK2_LIBS} ${LDFLAGS_pda}])
-# AX_ADD_PLUGINS([pda])
-# if test "${SYS}" != "mingw32"; then
-# NEED_GTK2_MAIN=yes
-# fi
-#fi
+AC_ARG_ENABLE(pda,
+ [ --enable-pda PDA interface needs Gtk2 support (default disabled)])
+if test "x${enable_pda}" = "xyes"
+then
+ PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
+ AX_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}])
+ AX_ADD_LDFLAGS([gtk2],[${GTK2_LIBS}])
+ AX_ADD_CFLAGS([pda],[${GTK2_CFLAGS} ${CFLAGS_pda}])
+ AX_ADD_LDFLAGS([pda],[${GTK2_LIBS} ${LDFLAGS_pda}])
+ AX_ADD_PLUGINS([pda])
+ if test "${SYS}" != "mingw32"; then
+ NEED_GTK2_MAIN=yes
+ fi
+fi
dnl
dnl Gnome module
modules/codec/spudec/Makefile
modules/control/Makefile
modules/control/corba/Makefile
- modules/control/lirc/Makefile
- modules/control/rc/Makefile
+ modules/control/telnet/Makefile
modules/demux/Makefile
modules/demux/asf/Makefile
modules/demux/avi/Makefile
modules/gui/wxwindows/Makefile
modules/misc/Makefile
modules/misc/dummy/Makefile
- modules/misc/logger/Makefile
modules/misc/memcpy/Makefile
modules/misc/network/Makefile
modules/misc/testsuite/Makefile
modules/stream_out/transrate/Makefile
modules/video_chroma/Makefile
modules/video_filter/Makefile
- modules/video_filter/deinterlace/Makefile
modules/video_output/Makefile
modules/video_output/directx/Makefile
- modules/video_output/mga/Makefile
modules/video_output/qte/Makefile
modules/video_output/x11/Makefile
modules/visualization/Makefile
- modules/visualization/scope/Makefile
- modules/visualization/xosd/Makefile
modules/visualization/visual/Makefile
])
projects / vlc / blobdiff