Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv31807 Modified Files: configure Makefile Log Message: 10l noticed by Steven M. Schultz <sms@2BSD.COM> and a bit cleaned up Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.685 retrieving revision 1.686 diff -u -r1.685 -r1.686 --- configure 21 Mar 2003 18:11:18 -0000 1.685 +++ configure 21 Mar 2003 18:21:00 -0000 1.686 @@ -2340,7 +2340,7 @@ #include <libsmbclient.h> int main(void) { smbc_opendir("smb://"); return 0; } EOF - if cc_check $_ld_smb $_inc_smb ; then + if cc_check -lsmbclient ; 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 @@ -2348,13 +2348,10 @@ fi if test "$_smbsupport" = yes; then - _ld_smb=" -L/usr/lib -lsmbclient" - _inc_smb=" -I/usr/include " + _ld_smb="-lsmbclient" _def_smbsupport="#define LIBSMBCLIENT" _inputmodules="smb $_inputmodules" else - _ld_smb="" - _inc_smb="" _def_smbsupport="#undef LIBSMBCLIENT" _noinputmodules="smb $_noinputmodules" fi @@ -5096,7 +5093,6 @@ 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 Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- Makefile 21 Mar 2003 16:54:03 -0000 1.260 +++ Makefile 21 Mar 2003 18:21:00 -0000 1.261 @@ -38,7 +38,7 @@ 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) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) -CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(SMBSUPPORT_INC) $(FRIBIDI_INC) # -Wall +CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(FRIBIDI_INC) # -Wall ifeq ($(TARGET_ALTIVEC),yes) ifeq ($(TARGET_OS),Darwin)