dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.68 2003/08/24 11:17:39 gbazin Exp $
+dnl $Id: configure.ac,v 1.79 2003/10/01 22:19:57 gbazin Exp $
AC_INIT(vlc,0.6.3-cvs)
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}"
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
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])
],[])
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
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)
modules/codec/mpeg_video/idct/Makefile
modules/codec/mpeg_video/motion/Makefile
modules/codec/spudec/Makefile
- modules/codec/subsdec/Makefile
modules/control/Makefile
modules/control/corba/Makefile
modules/control/lirc/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