LDFLAGS_access_output_udp="${LDFLAGS_access_output_udp} -lws2_32"
LDFLAGS_sap="${LDFLAGS_sap} -lws2_32"
LDFLAGS_slp="${LDFLAGS_slp} -lws2_32"
+ LDFLAGS_http="${LDFLAGS_http} -lws2_32"
LDFLAGS_httpd="${LDFLAGS_httpd} -lws2_32"
fi
;;
else
AC_CHECK_FUNCS(textdomain,,[
AC_CHECK_LIB(intl,textdomain,
- LDFLAGS_vlc="${LDFLAGS_vlc} -lintl"
- LDFLAGS_plugins="${LDFLAGS_plugins} -lintl"
+ LDFLAGS_vlc="${LDFLAGS_vlc} ${LIBINTL}"
+ LDFLAGS_plugins="${LDFLAGS_plugins} ${LIBINTL}",,
+ ${LIBINTL}
)
])
fi
LDFLAGS_access_udp="${LDFLAGS_access_udp} -lsocket"
LDFLAGS_access_ftp="${LDFLAGS_access_ftp} -lsocket"
LDFLAGS_sap="${LDFLAGS_sap} -lsocket"
+ LDFLAGS_http="${LDFLAGS_http} -lsocket"
LDFLAGS_access_output_udp="${LDFLAGS_access_output_udp} -lsocket"
)])
PLUGINS="${PLUGINS} rawvideo"
PLUGINS="${PLUGINS} wav araw demuxdump demuxsub adpcm a52sys au"
PLUGINS="${PLUGINS} access_file access_udp access_http ipv4 access_mms"
-PLUGINS="${PLUGINS} access_ftp access_directory sap httpd"
+PLUGINS="${PLUGINS} access_ftp access_directory sap httpd http"
dnl
dnl Some plugins aren't useful on some platforms
PLUGINS="${PLUGINS} mux_ts_dvbpsi"
LDFLAGS_mux_ts_dvbpsi="${LDFLAGS_mux_ts_dvbpsi} -ldvbpsi" ],
[ AC_MSG_WARN([cannot find libdvbpsi headers]) ],
- [#include <stdint.h>
+ [#if defined( HAVE_STDINT_H )
+# include <stdint.h>
+#elif defined( HAVE_INTTYPES_H )
+# include <inttypes.h>
+#endif
#include <dvbpsi/dvbpsi.h>
#include <dvbpsi/descriptor.h>
#include <dvbpsi/pat.h>
fi
dnl Duplicate the ffmpeg CPPFLAGS and LDFLAGS for the encoder
- LDFLAGS_encoder_ffmpeg=${LDFLAGS_ffmpeg}
- CPPFLAGS_encoder_ffmpeg=${CPPFLAGS_ffmpeg}
+ CPPFLAGS_encoder_ffmpeg="${CPPFLAGS_ffmpeg}"
+ dnl XXX: we don't link with -lavcodec blah blah blah
+ #LDFLAGS_encoder_ffmpeg="${LDFLAGS_ffmpeg}"
dnl Add postprocessing modules
PLUGINS="${PLUGINS} postprocessing_c"
AC_CHECK_HEADERS(zlib.h, [
LDFLAGS_mp4="${LDFLAGS_mp4} -lz"
LDFLAGS_skins="${LDFLAGS_skins} -lz"
+ LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -lz"
] )
dnl
AC_CHECK_HEADERS(libtar.h, [
LDFLAGS_skins="${LDFLAGS_skins} -ltar"
+ LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -ltar"
] )
[ --enable-libmpeg2 libmpeg2 decoder support (default enabled)])
if test "x${enable_libmpeg2}" != "xno"
then
- AC_CHECK_HEADERS(mpeg2dec/mpeg2.h, [
- AC_MSG_CHECKING(for libmpeg2 version >= 0.3.2)
- AC_EGREP_CPP(yes,
- [#include <mpeg2dec/mpeg2.h>
- #ifdef MPEG2_RELEASE
- #if MPEG2_RELEASE >= MPEG2_VERSION(0,3,2)
- yes
- #endif
- #endif],
- [AC_MSG_RESULT([yes])
- PLUGINS="${PLUGINS} libmpeg2"
- LDFLAGS_libmpeg2="${LDFLAGS_libmpeg2} -lmpeg2"],
- [AC_MSG_RESULT([no])
- AC_MSG_ERROR([Your libmpeg2 is too old (you need the cvs version): you may get a more recent one from http://libmpeg2.sf.net/. Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])])],
-
- [AC_MSG_ERROR([Could not find libmpeg2 on your system: you may get it from http://libmpeg2.sf.net/ (you need the cvs version). Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])]
- )
+ AC_ARG_WITH(libmpeg2-tree,
+ [ --with-libmpeg2-tree=PATH libmpeg2 tree for static linking])
+ if test "x${with_libmpeg2_tree}" != "x"
+ then
+ AC_MSG_CHECKING(for libmpeg2.a in ${with_libmpeg2_tree})
+ real_libmpeg2_tree="`cd ${with_libmpeg2_tree} 2>/dev/null && pwd`"
+ if test "x${real_libmpeg2_tree}" = x
+ then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${with_libmpeg2_tree}])
+ fi
+ if test -f "${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a"
+ then
+ dnl Use a custom libmpeg2
+ AC_MSG_RESULT(${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a)
+ PLUGINS="${PLUGINS} libmpeg2"
+ LDFLAGS_libmpeg2="${LDFLAGS_libmpeg2} -L${real_libmpeg2_tree}/libmpeg2/.libs -lmpeg2"
+ CFLAGS_libmpeg2="${CFLAGS_libmpeg2} -I${real_libmpeg2_tree}/include"
+ eval "`cd ${real_libmpeg2_tree}/include && ln -sf . mpeg2dec 2>/dev/null`"
+ else
+ dnl The given libmpeg2 wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a, make sure you compiled libmpeg2 in ${with_libmpeg2_tree}])
+ fi
+ else
+ AC_CHECK_HEADERS(mpeg2dec/mpeg2.h, [
+ AC_MSG_CHECKING(for libmpeg2 version >= 0.3.2)
+ AC_EGREP_CPP(yes,
+ [#include <mpeg2dec/mpeg2.h>
+ #ifdef MPEG2_RELEASE
+ #if MPEG2_RELEASE >= MPEG2_VERSION(0,3,2)
+ yes
+ #endif
+ #endif],
+ [AC_MSG_RESULT([yes])
+ PLUGINS="${PLUGINS} libmpeg2"
+ LDFLAGS_libmpeg2="${LDFLAGS_libmpeg2} -lmpeg2"],
+ [AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Your libmpeg2 is too old (you need the cvs version): you may get a more recent one from http://libmpeg2.sf.net/. Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])])],
+
+ [AC_MSG_ERROR([Could not find libmpeg2 on your system: you may get it from http://libmpeg2.sf.net/ (you need the cvs version). Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])]
+ )
+ fi
fi
dnl
dnl Skins module
dnl
AC_ARG_ENABLE(skins,
- [ --enable-skins Win32 skins module (default enabled on Win32)])
+ [ --enable-skins Skins interface module (default enabled on Win32)])
if test "x${enable_skins}" != "xno"; then
WXWINDOWS_PATH="${PATH}"
- AC_ARG_WITH(wx-config-path,
- [ --with-wx-config-path=PATH wx-config path (default search in \$PATH)],
- [ if test "x${with_wx_config_path}" != "xno"
+ AC_ARG_WITH(skins-wx-config-path,
+ [ --with-skins-wx-config-path=PATH wx-config path for the skins plugin (default search in \$PATH)],
+ [ if test "x${with_skins_wx_config_path}" != "xno"
then
- WXWINDOWS_PATH="${with_wx_config_path}:${PATH}"
+ WXWINDOWS_PATH="${with_skins_wx_config_path}:${PATH}"
fi ])
# look for wx-config
- AC_PATH_PROG(WX_CONFIG, wx-config, no, ${WXWINDOWS_PATH})
- if test "x${WX_CONFIG}" != "xno"
+ AC_PATH_PROG(WX_CONFIG_SKINS, wx-config, no, ${WXWINDOWS_PATH})
+ if test "x${WX_CONFIG_SKINS}" != "xno"
then
- if expr 2.3.0 \> `${WX_CONFIG} --version` >/dev/null
+ if expr 2.3.0 \> `${WX_CONFIG_SKINS} --version` >/dev/null
then
AC_MSG_ERROR([Your development package for wxWindows is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-skins.])
fi
- CPPFLAGS_skins="${CPPFLAGS_skins} `${WX_CONFIG} --cxxflags`"
- LDFLAGS_skins="${LDFLAGS_skins} `${WX_CONFIG} --libs`"
+ CPPFLAGS_skins="${CPPFLAGS_skins} `${WX_CONFIG_SKINS} --cxxflags` -DWX_SKINS"
+ LDFLAGS_skins="${LDFLAGS_skins} `${WX_CONFIG_SKINS} --libs`"
fi
if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"; then
PLUGINS="${PLUGINS} skins"
CPPFLAGS_skins="${CPPFLAGS_skins} -O2 -U_OFF_T_ -U_off_t -fno-rtti -Imodules/gui/skins"
- LDFLAGS_skins="${LDFLAGS_skins} -loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lstdc++ -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32 -lmsimg32"
+ LDFLAGS_skins="${LDFLAGS_skins} -loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lstdc++ -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32"
else
if test "x${enable_skins}" = "xyes"; then
PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
PLUGINS="${PLUGINS} skins"
- CPPFLAGS_skins="${CPPFLAGS_skins} -O2 -fno-rtti -Imodules/gui/skins -Imodules/gui/skins/src -Imodules/gui/skins/gtk2 -Imodules/gui/skins/controls -Imodules/gui/skins/parser ${GTK2_CFLAGS}"
+ CPPFLAGS_skins="${CPPFLAGS_skins} -O2 -fno-rtti -Imodules/gui/skins ${GTK2_CFLAGS} -DGTK2_SKINS"
LDFLAGS_skins="${LDFLAGS_skins} -lstdc++ ${GTK2_LIBS}"
fi
fi
fi
+dnl
+dnl Basic skins module (i.e. without wxWindows dialogs)
+dnl
+AC_ARG_ENABLE(basic-skins,
+ [ --enable-basic-skins Skins interface module without wxWindows dialogs (default disabled)])
+if test "x${enable_basic_skins}" = "xyes"; then
+ if test "x${SYS}" = "xmingw32" -o "x${SYS}" = "xcygwin"; then
+ PLUGINS="${PLUGINS} basic_skins"
+ CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -O2 -U_OFF_T_ -U_off_t -fno-rtti -Imodules/gui/skins"
+ LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lstdc++ -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32"
+ else
+ PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
+ PLUGINS="${PLUGINS} basic_skins"
+ CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -O2 -fno-rtti -Imodules/gui/skins ${GTK2_CFLAGS} -DGTK2_SKINS"
+ LDFLAGS_basic_skins="${LDFLAGS_basic_skins} -lstdc++ ${GTK2_LIBS}"
+ fi
+ CPPFLAGS_basic_skins="${CPPFLAGS_basic_skins} -DBASIC_SKINS"
+fi
+
dnl
dnl Gtk+ module
dnl