Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv26231 Modified Files: configure Makefile Log Message: libsmbclient detection support, slightly rewritten the original patch sent by Vladimir Moushkov <vlindos_mpdev@abv.bg> Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.681 retrieving revision 1.682 diff -u -r1.681 -r1.682 --- configure 16 Mar 2003 20:13:06 -0000 1.681 +++ configure 21 Mar 2003 16:06:11 -0000 1.682 @@ -154,6 +154,7 @@ --disable-rtc disable RTC (/dev/rtc) on Linux [autodetect] --disable-streaming disable network streaming support (support for: http/mms/rtp) [enable] + --enable-smb enable Samba (SMB) input support [autodetect] --enable-live enable LIVE.COM Streaming Media support [disable] --enable-dvdnav enable dvdnav support [disable] --disable-dvdread Disable libdvdread support [autodetect] @@ -1034,6 +1035,7 @@ _tv_bsdbt848=auto _edl=yes _streaming=yes +_smbsupport=auto _vidix=auto _joystick=no _xvid=auto @@ -1200,6 +1202,8 @@ --disable-fastmemcpy) _fastmemcpy=no ;; --enable-streaming) _streaming=yes ;; --disable-streaming) _streaming=no ;; + --enable-smb) _smbsupport=yes ;; + --disable-smb) _smbsupport=no ;; --enable-vidix) _vidix=yes ;; --disable-vidix) _vidix=no ;; --enable-joystick) _joystick=yes ;; @@ -2318,6 +2322,32 @@ echores "$_macosx" +echocheck "Samba support (libsmbclient)" +if test "$_smbsupport" = auto; then + _smbsupport=no + cat > $TMPC << EOF +#include <libsmbclient.h> +int main(void) { smbc_opendir("smb://"); return 0; } +EOF + _ld_smb=" -L/usr/lib -lsmbclient" + _inc_smb=" -I/usr/include " + if cc_check $_ld_smb $_inc_smb ; then +# this is not working for me becouse it needs -ldl and some NIS (YP) libs +# $_ld_dl and -lyp ? should be added + _smbsupport=yes + fi +fi + +if test "$_smbsupport" = yes; then + _def_smbsupport="#define LIBSMBCLIENT" + _inputmodules="smb $_inputmodules" +else + _def_smbsupport="#undef LIBSMBCLIENT" + _noinputmodules="smb $_noinputmodules" +fi +echores "$_smbsupport" + + ######### # VIDEO # ######### @@ -5018,6 +5048,8 @@ MAD_LIB = $_ld_mad VORBIS_LIB = $_ld_vorbis $_ld_libdv FAAD_LIB = $_ld_faad +SMBSUPPORT_INC = $_inc_smb +SMBSUPPORT_LIB = $_ld_smb XMMS_PLUGINS = $_xmms XMMS_LIB = $_xmms_lib MACOSX = $_macosx @@ -5380,6 +5412,9 @@ /* nanosleep support */ $_def_nanosleep + +/* SMB support */ +$_def_smbsupport /* termcap flag for getch2.c */ $_def_termcap Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- Makefile 15 Mar 2003 19:52:11 -0000 1.258 +++ Makefile 21 Mar 2003 16:06:11 -0000 1.259 @@ -36,9 +36,9 @@ VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(NAS_LIB) $(SGIAUDIO_LIB) CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) -COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) +COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) -CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) # -Wall +CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(SMBSUPPORT_INC) # -Wall ifeq ($(TARGET_ALTIVEC),yes) ifeq ($(TARGET_OS),Darwin)