Mercurial > mplayer.hg

comparison configure @ 18262:83f2f6cb329a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make _res_comment usage consistent
author rathann
date Mon, 24 Apr 2006 21:50:06 +0000
parents 7fc264d87f83
children 2bf9ae91ff54
comparison
equal deleted inserted replaced
18261:5bf6b74e793c 18262:83f2f6cb329a
2862 cc_check $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break 2862 cc_check $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break
2863 done 2863 done
2864 fi 2864 fi
2865 fi 2865 fi
2866 if test "$_pthreads" = yes ; then 2866 if test "$_pthreads" = yes ; then
2867 _res_comment="(using $_ld_pthread)" 2867 _res_comment="using $_ld_pthread"
2868 _def_pthreads='#define HAVE_PTHREADS 1' 2868 _def_pthreads='#define HAVE_PTHREADS 1'
2869 _def_threads='#define HAVE_THREADS 1' 2869 _def_threads='#define HAVE_THREADS 1'
2870 else 2870 else
2871 _res_comment="(v4l, vo_gl, ao_alsa, ao_nas, ao_macosx, win32 loader disabled)" 2871 _res_comment="v4l, vo_gl, ao_alsa, ao_nas, ao_macosx, win32 loader disabled"
2872 _def_pthreads='#undef HAVE_PTHREADS' 2872 _def_pthreads='#undef HAVE_PTHREADS'
2873 _nas=no ; _tv_v4l=no ; _macosx=no 2873 _nas=no ; _tv_v4l=no ; _macosx=no
2874 if not mingw32 ; then 2874 if not mingw32 ; then
2875 _win32=no 2875 _win32=no
2876 fi 2876 fi
4312 _def_gif='#define HAVE_GIF 1' 4312 _def_gif='#define HAVE_GIF 1'
4313 _vosrc="$_vosrc vo_gif89a.c" 4313 _vosrc="$_vosrc vo_gif89a.c"
4314 _codecmodules="gif $_codecmodules" 4314 _codecmodules="gif $_codecmodules"
4315 _vomodules="gif89a $_vomodules" 4315 _vomodules="gif89a $_vomodules"
4316 _mkf_gif="yes" 4316 _mkf_gif="yes"
4317 _res_comment="(old version, some encoding functions disabled)" 4317 _res_comment="old version, some encoding functions disabled"
4318 _def_gif_4='#undef HAVE_GIF_4' 4318 _def_gif_4='#undef HAVE_GIF_4'
4319 4319
4320 cat > $TMPC << EOF 4320 cat > $TMPC << EOF
4321 #include <signal.h> 4321 #include <signal.h>
4322 #include <gif_lib.h> 4322 #include <gif_lib.h>
4414 else 4414 else
4415 _def_sdlbuggy='#undef BUGGY_SDL' 4415 _def_sdlbuggy='#undef BUGGY_SDL'
4416 fi 4416 fi
4417 _sdl=yes 4417 _sdl=yes
4418 else 4418 else
4419 _res_comment=outdated 4419 _res_comment="outdated"
4420 fi 4420 fi
4421 fi 4421 fi
4422 fi 4422 fi
4423 fi 4423 fi
4424 if test "$_sdl" = yes ; then 4424 if test "$_sdl" = yes ; then
5155 _inputmodules="cdda $_inputmodules" 5155 _inputmodules="cdda $_inputmodules"
5156 _inc_libcdio=`pkg-config --cflags libcdio` 5156 _inc_libcdio=`pkg-config --cflags libcdio`
5157 _ld_libcdio=`pkg-config --libs libcdio_paranoia` 5157 _ld_libcdio=`pkg-config --libs libcdio_paranoia`
5158 else 5158 else
5159 if test "$_cdparanoia" = yes ; then 5159 if test "$_cdparanoia" = yes ; then
5160 _res_comment="(using cdparanoia)" 5160 _res_comment="using cdparanoia"
5161 fi 5161 fi
5162 _def_libcdio='#undef HAVE_LIBCDIO' 5162 _def_libcdio='#undef HAVE_LIBCDIO'
5163 _def_havelibcdio='no' 5163 _def_havelibcdio='no'
5164 fi 5164 fi
5165 echores "$_libcdio" 5165 echores "$_libcdio"
5944 _live_dist=yes 5944 _live_dist=yes
5945 fi 5945 fi
5946 fi 5946 fi
5947 fi 5947 fi
5948 if test "$_live" = yes && test "$_network" = yes ; then 5948 if test "$_live" = yes && test "$_network" = yes ; then
5949 _res_comment="(using $_livelibdir)" 5949 _res_comment="using $_livelibdir"
5950 _def_live='#define STREAMING_LIVE555 1' 5950 _def_live='#define STREAMING_LIVE555 1'
5951 _live_libs_def="# LIVE555 Streaming Media libraries: 5951 _live_libs_def="# LIVE555 Streaming Media libraries:
5952 LIVE_LIB_DIR = $_livelibdir 5952 LIVE_LIB_DIR = $_livelibdir
5953 LIVE_LIBS = \$(LIVE_LIB_DIR)/liveMedia/libliveMedia.a 5953 LIVE_LIBS = \$(LIVE_LIB_DIR)/liveMedia/libliveMedia.a
5954 LIVE_LIBS += \$(LIVE_LIB_DIR)/groupsock/libgroupsock.a 5954 LIVE_LIBS += \$(LIVE_LIB_DIR)/groupsock/libgroupsock.a
5960 LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/BasicUsageEnvironment/include 5960 LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/BasicUsageEnvironment/include
5961 LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/groupsock/include" 5961 LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/groupsock/include"
5962 _ld_live='$(LIVE_LIBS)' 5962 _ld_live='$(LIVE_LIBS)'
5963 _inputmodules="live555 $_inputmodules" 5963 _inputmodules="live555 $_inputmodules"
5964 elif test "$_live_dist" = yes && test "$_network" = yes ; then 5964 elif test "$_live_dist" = yes && test "$_network" = yes ; then
5965 _res_comment="(using distribution version)" 5965 _res_comment="using distribution version"
5966 _live="yes" 5966 _live="yes"
5967 _def_live='#define STREAMING_LIVE555 1' 5967 _def_live='#define STREAMING_LIVE555 1'
5968 _live_libs_def="# LIVE555 Streaming Media libraries: 5968 _live_libs_def="# LIVE555 Streaming Media libraries:
5969 LIVE_LIB_DIR = $_livelibdir 5969 LIVE_LIB_DIR = $_livelibdir
5970 LIVE_LIBS = -lliveMedia 5970 LIVE_LIBS = -lliveMedia