dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.54 2003/08/05 11:54:11 jpsaman Exp $
+dnl $Id: configure.ac,v 1.78 2003/09/27 10:09:57 gbazin Exp $
-AC_INIT(vlc,0.6.2-cvs)
+AC_INIT(vlc,0.6.3-cvs)
CONFIGURE_LINE="$0 $*"
CODENAME="Trevelyan"
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.6.2-cvs)
+AM_INIT_AUTOMAKE(vlc,0.6.3-cvs)
AM_CONFIG_HEADER(config.h)
dnl
# 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_ftp access_output_udp sap slp http httpd],[-lws2_32])
+ AX_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_ftp access_output_udp sap slp http httpd stream_out_standard],[-lws2_32])
fi
;;
*nto*)
CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}"
AX_ADD_LDFLAGS([vlc beos],[-lbe])
- AX_ADD_CXXFLAGS([beos],[])
AX_ADD_LDFLAGS([beos],[-lmedia -ltranslation -ltracker -lgame])
dnl Check for BONE presence
AC_CHECK_LIB(socket, connect,
AX_ADD_LDFLAGS([vlc access_mms ipv4 httpd],[-lsocket -lbind]))
- dnl Check for Zeta
- AC_CHECK_LIB(zeta, find_directory_r, AX_ADD_LDFLAGS([vlc beos],[-lzeta]))
+ dnl Kludgy check for Zeta
+ if test -f /boot/beos/system/lib/libzeta.so; then
+ AX_ADD_LDFLAGS([beos],[-lzeta])
+ fi
;;
*)
SYS="${target_os}"
dnl
dnl Gettext stuff
dnl
-ALL_LINGUAS="de en_GB fr it ja no ru nl pl sv"
+ALL_LINGUAS="de en_GB es fr it ja nl no pl pt_BR ru sv"
AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT
if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)])
AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)])
+dnl Check for setlocal and langinfo
+AC_CHECK_FUNCS(setlocale)
+AC_CHECK_HEADERS(langinfo.h)
+AC_CHECK_FUNCS(nl_langinfo)
+
+AC_CACHE_CHECK([for nl_langinfo and CODESET], ac_cv_langinfo_codeset,
+ [AC_TRY_LINK([#include <langinfo.h>],
+ [char* cs = nl_langinfo(CODESET);],
+ ac_cv_langinfo_codeset=yes,
+ ac_cv_langinfo_codeset=no)
+ ])
+if test ${ac_cv_langinfo_codeset} = yes; then
+ AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+ [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+fi
+
AC_CHECK_FUNCS(connect,,[
AC_CHECK_LIB(socket,connect,[
AX_ADD_LDFLAGS([vlc ipv4],-lsocket)
dnl
if test "${SYS}" != "mingw32"; then
AX_ADD_PLUGINS([screensaver])
+else
+ AX_ADD_PLUGINS([ntservice])
fi
dnl
if test "${enable_sout}" != "no"
then
AX_ADD_PLUGINS([access_output_dummy access_output_udp access_output_file access_output_http])
- AX_ADD_PLUGINS([mux_ts mux_ps mux_avi mux_mp4 mux_dummy])
- AX_ADD_PLUGINS([packetizer_mpegaudio packetizer_mpegvideo packetizer_a52])
+ AX_ADD_PLUGINS([mux_ts mux_ps mux_avi mux_mp4 mux_asf mux_dummy])
+ AX_ADD_PLUGINS([packetizer_mpegaudio packetizer_mpegvideo])
AX_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
AX_ADD_PLUGINS([packetizer_copy])
AX_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es])
- AX_ADD_PLUGINS([stream_out_duplicate stream_out_display])
+ AX_ADD_PLUGINS([stream_out_duplicate stream_out_display stream_out_gather])
dnl Ogg and vorbis are handled in their respective section
fi
fi
fi
+dnl
+dnl Windows DirectShow access module
+dnl
+AC_ARG_ENABLE(dshow,
+ [ --enable-dshow Win32 DirectShow support (default enabled on Win32)])
+if test "${enable_dshow}" != "no"
+then
+ if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
+ then
+ AC_CHECK_HEADERS(dshow.h,
+ [ AX_ADD_PLUGINS([dshow])
+ AX_ADD_CXXFLAGS([dshow],[])
+ AX_ADD_LDFLAGS([dshow],[-lole32 -loleaut32]) ])
+ fi
+fi
+
dnl
dnl libdvbpsi ts demux/mux
dnl
then
AX_ADD_CFLAGS([dvb],[-I${with_dvb}/include])
fi
-
- CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_dvb}"
+ CPPFLAGS="${CPPFLAGS_save} -I${with_dvb}/include"
AC_CHECK_HEADERS(linux/dvb/version.h linux/dvb/frontend.h, [
AX_ADD_PLUGINS([dvb])
],[])
dnl matroska headers include ebml headers directly... pouah that stinks
CPPFLAGS="${CPPFLAGS_save} -I/usr/local/include/ebml -I/usr/include/ebml"
AC_CHECK_HEADERS(EbmlVersion.h matroska/KaxVersion.h, [
+ AC_CHECK_HEADERS(matroska/KaxAttachments.h)
AX_ADD_PLUGINS([mkv])
AX_ADD_CXXFLAGS([mkv],[-I/usr/local/include/ebml -I/usr/include/ebml])
AC_CHECK_LIB(ebml_pic,main,[
fi
fi
- dnl Duplicate the ffmpeg CPPFLAGS and LDFLAGS for the encoder
- AX_ADD_CPPFLAGS([encoder_ffmpeg],[${CPPFLAGS_ffmpeg}])
- dnl XXX: we don't link with -lavcodec blah blah blah
- dnl AX_ADD_LDFLAGS([encoder_ffmpeg],[${LDFLAGS_ffmpeg}])
-
ac_have_vorbis_headers=yes
AC_CHECK_HEADERS(vorbis/vorbisenc.h vorbis/codec.h,,
ac_have_vorbis_headers=no)
LDFLAGS="${LDFLAGS_save}"
CPPFLAGS="${CPPFLAGS_save}"
fi
-
- dnl Duplicate the xvid CPPFLAGS and LDFLAGS for the encoder
- AX_ADD_LDFLAGS([encoder_xvid],[${LDFLAGS_xvid}])
- AX_ADD_CPPFLAGS([encoder_xvid],[${CPPFLAGS_xvid}])
fi
dnl
then
AC_CHECK_HEADERS(vorbis/codec.h, [
AX_ADD_PLUGINS([vorbis])
- AX_ADD_LDFLAGS([vorbis],[-lvorbis -logg])
- if test "${enable_sout}" != "no"; then
- AX_ADD_PLUGINS([packetizer_vorbis])
- AX_ADD_LDFLAGS([packetizer_vorbis],[-lvorbis -logg])
- fi ],[])
+ AX_ADD_LDFLAGS([vorbis],[-lvorbis -logg]) ],[])
fi
dnl
[ --enable-mga Linux kernel Matrox support (default disabled)],
[ if test "${enable_mga}" = "yes"
then
- AX_ADD_PLUGINS([mga xmga])
+ AX_ADD_PLUGINS([mga])
fi ])
dnl
dnl PDA Gtk+2 module
dnl
AC_ARG_ENABLE(pda,
- [ --enable-pda PDA interface needs Gtk2 suport (default disabled)])
+ [ --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])
fi
fi
+dnl
+dnl Visualisation plugin
+dnl
+AC_ARG_ENABLE(visual,
+ [ --enable-visual visualisation plugin (default enabled)])
+if test "${enable_visual}" != "no"
+then
+ AX_ADD_PLUGINS([visual])
+fi
+
+dnl
+dnl goom visualization plugin
+dnl
+AC_ARG_ENABLE(goom,
+[ --enable-goom goom visualisation plugin (default disabled)])
+if test "${enable_goom}" = "yes"
+then
+ AC_ARG_WITH(goom-tree,
+ [ --with-goom-tree=PATH goom tree for static linking (required)])
+
+ dnl
+ dnl test for --with-goom-tree
+ dnl
+ if test "${with_goom_tree}" != "no" -a -n "${with_goom_tree}";then
+ AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree})
+ real_goom_tree="`cd ${with_goom_tree} 2>/dev/null && pwd`"
+ if test -z "${real_goom_tree}"; then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${with_goom_tree}])
+ fi
+ if test -f "${real_goom_tree}/libgoom.a"; then
+ AC_MSG_RESULT(${real_goom_tree}/libgoom.a)
+ AX_ADD_BUILTINS([goom])
+ AX_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom])
+ AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree}])
+ else
+ dnl The given libgoom wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${real_goom_tree}/libgoom.a, make sure you compiled goom in ${with_goom_tree}])
+ fi
+ else
+ dnl The --with-goom-tree isn't specified wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([You have to specify a tree with --with-goom-tree])
+ fi
+fi
+
dnl
dnl SLP access plugin
dnl
[ --with-slp=PATH libslp headers and libraries])
if test -z "${with_slp}"
then
- AC_CHECK_HEADER(slp.h, have_slp="true", have_slp="false")
+ AC_CHECK_HEADERS(slp.h, have_slp="true", have_slp="false")
if test "${have_slp}" = "true"
then
AX_ADD_PLUGINS([slp])
AX_ADD_LDFLAGS([slp],[-lslp])
+ AX_ADD_LDFLAGS([stream_out_standard],[-lslp])
fi
else
AC_MSG_CHECKING(for slp headers in ${with_slp})
AC_MSG_RESULT(yes)
AX_ADD_PLUGINS([slp])
AX_ADD_LDFLAGS([slp],[-L${with_slp} -lslp])
+ AX_ADD_LDFLAGS([stream_out_standard],[-L${with_slp} -lslp])
AX_ADD_CPPFLAGS([slp],[-I${with_slp}])
+ AC_DEFINE(HAVE_SLP_H)
else
dnl No libslp could be found, sorry
AC_MSG_RESULT(no)
mozilla=false
AC_ARG_ENABLE(mozilla,
[ --enable-mozilla build a vlc-based Mozilla plugin (default disabled)])
-if test "${enable_mozilla}" = "yes"
+if test "${enable_mozilla}" = "yes" -a "${SYS}" != "mingw32"
then
AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
if test "${MOZILLA_CONFIG}" = "no"
dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490
AX_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]])
AX_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`])
- dnl Not necessarily in ${PATH}
- if test -z "${XPIDL}" -o ! -x "${XPIDL}"
- then
- XPIDL="/usr/lib/mozilla/xpidl"
- fi
fi
+
+dnl special case for mingw32
+elif test "${enable_mozilla}" = "yes"
+then
+ AC_ARG_WITH(mozilla-sdk-path,
+ [ --with-mozilla-sdk-path=PATH path to win32 mozilla sdk], [
+ AC_MSG_CHECKING(for mozilla-config.h in ${with_mozilla_sdk_path})
+ real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`"
+ if test -z "${real_mozilla_sdk}"; then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${with_mozilla_sdk_path}])
+ fi
+ if test -f "${real_mozilla_sdk}/mozilla-config.h"; then
+ AC_MSG_RESULT(${real_mozilla_sdk}/mozilla-config.h)
+ mozilla=:
+ AX_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -I${real_mozilla_sdk} -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include])
+ AX_ADD_LDFLAGS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -lnspr4 -lplds4 -lplc4 -lembedstring -lxpcomglue -Wl,--kill-at])
+ XPIDL_INCL="-I${real_mozilla_sdk}/xpcom/idl"
+ else
+ dnl The given path is incorrect
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${real_mozilla_sdk}/mozilla-config.h])
+ fi
+ ])
+fi
+
+dnl Not necessarily in ${PATH}
+if test -z "${XPIDL}" -o ! -x "${XPIDL}"; then
+ XPIDL="/usr/lib/mozilla/xpidl"
fi
AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
if test "${NEED_GTK_MAIN}" != "no"
then
AX_ADD_PLUGINS([gtk_main])
- AX_ADD_CFLAGS([gtk pda],[-DNEED_GTK_MAIN])
- AX_ADD_CFLAGS([gtk_main],[${CFLAGS_gtk} ${CFLAGS_pda}])
- AX_ADD_LDFLAGS([gtk_main],[${LDFLAGS_gtk} ${LDFLAGS_pda}])
+ AX_ADD_CFLAGS([gtk_main],[${CFLAGS_gtk}])
+ AX_ADD_LDFLAGS([gtk_main],[${LDFLAGS_gtk}])
fi
if test "${NEED_GNOME_MAIN}" != "no"
then
AX_ADD_PLUGINS([gtk2_main])
AX_ADD_CFLAGS([gtk2],[-DNEED_GTK2_MAIN])
- AX_ADD_CFLAGS([gtk2_main],[${CFLAGS_gtk2}])
- AX_ADD_LDFLAGS([gtk2_main],[${LDFLAGS_gtk2}])
+ AX_ADD_CFLAGS([pda],[-DNEED_GTK2_MAIN])
+ AX_ADD_CFLAGS([gtk2_main],[${CFLAGS_gtk2} ${CFLAGS_pda}])
+ AX_ADD_LDFLAGS([gtk2_main],[${LDFLAGS_gtk2} ${LDFLAGS_pda}])
fi
if test "${NEED_GNOME2_MAIN}" != "no"
AC_SUBST(MOC)
AC_SUBST(WINDRES)
AC_SUBST(XPIDL)
+AC_SUBST(XPIDL_INCL)
AC_SUBST(LIBEXT)
AC_SUBST(INCLUDES)
AC_SUBST(ALL_LINGUAS)
src/Makefile
modules/access/Makefile
+ modules/access/dshow/Makefile
modules/access/dvb/Makefile
modules/access/dvd/Makefile
modules/access/dvdplay/Makefile
modules/demux/mp4/Makefile
modules/demux/mpeg/Makefile
modules/demux/util/Makefile
- modules/encoder/Makefile
- modules/encoder/ffmpeg/Makefile
modules/gui/Makefile
modules/gui/beos/Makefile
modules/gui/pda/Makefile
modules/visualization/Makefile
modules/visualization/scope/Makefile
modules/visualization/xosd/Makefile
+ modules/visualization/visual/Makefile
],[
chmod 0755 vlc-config
])
projects / vlc / blobdiff