Mercurial > mplayer.hg

comparison configure @ 19282:5ff55ce59ab4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify LIVE555 test and make it more consistent with the other tests.
author diego
date Tue, 01 Aug 2006 07:34:32 +0000
parents 3fc39ced158e
children 605fdd855181
comparison
equal deleted inserted replaced
19281:3cc2fa8ecb0d 19282:5ff55ce59ab4
6059 fi 6059 fi
6060 fi 6060 fi
6061 if test "$_live" = yes && test "$_network" = yes ; then 6061 if test "$_live" = yes && test "$_network" = yes ; then
6062 _res_comment="using $_livelibdir" 6062 _res_comment="using $_livelibdir"
6063 _def_live='#define STREAMING_LIVE555 1' 6063 _def_live='#define STREAMING_LIVE555 1'
6064 _live_libs_def="# LIVE555 Streaming Media libraries: 6064 _ld_live="-lstdc++ $_livelibdir/liveMedia/libliveMedia.a \
6065 LIVE_LIB_DIR = $_livelibdir 6065 $_livelibdir/groupsock/libgroupsock.a \
6066 LIVE_LIBS = \$(LIVE_LIB_DIR)/liveMedia/libliveMedia.a 6066 $_livelibdir/UsageEnvironment/libUsageEnvironment.a \
6067 LIVE_LIBS += \$(LIVE_LIB_DIR)/groupsock/libgroupsock.a 6067 $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a"
6068 LIVE_LIBS += \$(LIVE_LIB_DIR)/UsageEnvironment/libUsageEnvironment.a 6068 _inc_extra="$_inc_extra -I$_livelibdir/liveMedia/include \
6069 LIVE_LIBS += \$(LIVE_LIB_DIR)/BasicUsageEnvironment/libBasicUsageEnvironment.a 6069 -I$_livelibdir/UsageEnvironment/include \
6070 LIVE_LIBS += -lstdc++ 6070 -I$_livelibdir/BasicUsageEnvironment/include \
6071 LIVE_INCLUDES = -I\$(LIVE_LIB_DIR)/liveMedia/include 6071 -I$_livelibdir/groupsock/include"
6072 LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/UsageEnvironment/include
6073 LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/BasicUsageEnvironment/include
6074 LIVE_INCLUDES += -I\$(LIVE_LIB_DIR)/groupsock/include"
6075 _ld_live='$(LIVE_LIBS)'
6076 _inputmodules="live555 $_inputmodules" 6072 _inputmodules="live555 $_inputmodules"
6077 elif test "$_live_dist" = yes && test "$_network" = yes ; then 6073 elif test "$_live_dist" = yes && test "$_network" = yes ; then
6078 _res_comment="using distribution version" 6074 _res_comment="using distribution version"
6079 _live="yes" 6075 _live="yes"
6080 _def_live='#define STREAMING_LIVE555 1' 6076 _def_live='#define STREAMING_LIVE555 1'
6081 _live_libs_def="# LIVE555 Streaming Media libraries: 6077 _ld_live="-lstdc++ -lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment"
6082 LIVE_LIB_DIR = $_livelibdir 6078 _inc_extra="$_inc_extra -I/usr/include/liveMedia -I/usr/include/UsageEnvironment \
6083 LIVE_LIBS = -lliveMedia 6079 -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock"
6084 LIVE_LIBS += -lgroupsock
6085 LIVE_LIBS += -lUsageEnvironment
6086 LIVE_LIBS += -lBasicUsageEnvironment
6087 LIVE_LIBS += -lstdc++
6088 LIVE_INCLUDES = -I/usr/include/liveMedia
6089 LIVE_INCLUDES += -I/usr/include/UsageEnvironment
6090 LIVE_INCLUDES += -I/usr/include/BasicUsageEnvironment
6091 LIVE_INCLUDES += -I/usr/include/groupsock"
6092 _ld_live='$(LIVE_LIBS)'
6093 _inputmodules="live555 $_inputmodules" 6080 _inputmodules="live555 $_inputmodules"
6094 else 6081 else
6095 _def_live='#undef STREAMING_LIVE555' 6082 _def_live='#undef STREAMING_LIVE555'
6096 _noinputmodules="live555 $_noinputmodules" 6083 _noinputmodules="live555 $_noinputmodules"
6097 fi 6084 fi
7327 CHARSET = $_charset 7314 CHARSET = $_charset
7328 HELP_FILE = $_mp_help 7315 HELP_FILE = $_mp_help
7329 7316
7330 PRG = $_prg 7317 PRG = $_prg
7331 PRG_MENCODER = $_prg_mencoder 7318 PRG_MENCODER = $_prg_mencoder
7332
7333 $_live_libs_def
7334 7319
7335 MPLAYER_NETWORK = $_network 7320 MPLAYER_NETWORK = $_network
7336 FTP = $_ftp 7321 FTP = $_ftp
7337 STREAMING_LIVE555 = $_live 7322 STREAMING_LIVE555 = $_live
7338 VSTREAM = $_vstream 7323 VSTREAM = $_vstream