Removed InfoPopper and libyahoo2 checks.

This commit is contained in:
plfiorini 2010-05-28 00:53:15 +00:00
parent bcbff8db1f
commit 6f8d9c5f50
2 changed files with 0 additions and 65 deletions

View File

@ -46,17 +46,6 @@ LOCATE on $(HCACHEFILE) $(JCACHEFILE) = $(GENERATED_DIR) ;
include [ FDirName $(JAM_DIR) CheckRules ] ; include [ FDirName $(JAM_DIR) CheckRules ] ;
CheckGccPlatform ; CheckGccPlatform ;
CheckOpenSSL ; CheckOpenSSL ;
if ! $(HAVE_OPENSSL) {
# Echo "** MSN, GoogleTalk and OSCAR protocols are disabled for lack of OpenSSL" ;
}
CheckLibYahoo2 ;
if ! $(HAVE_LIBYAHOO2) {
# Echo "** Yahoo protocol is disabled for lack of libyahoo2" ;
}
CheckInfoPopper ;
if ! $(HAVE_INFOPOPPER) {
# Echo "** im_infopopper client is disabled for lack of InfoPopper" ;
}
# Include jam scripts # Include jam scripts
include [ FDirName $(JAM_DIR) HelperRules ] ; include [ FDirName $(JAM_DIR) HelperRules ] ;

View File

@ -48,57 +48,3 @@ rule CheckOpenSSL
HAVE_OPENSSL = $(haveLibs) ; HAVE_OPENSSL = $(haveLibs) ;
} }
} }
rule CheckLibYahoo2
{
# CheckLibYahoo2
# Check for LibYahoo2 and defined HAVE_LIBYAHOO2 according, it also defines
# LIBYAHOO2_INCLUDE_DIR and LIBYAHOO2_LIBRARY_DIR with location of respectively
# include and library files.
HAVE_LIBYAHOO2 = ;
LIBYAHOO2_INCLUDE_DIR = ;
LIBYAHOO2_LIBRARY_DIR = ;
local haveHeaders = [ Glob $(COMMON_INCLUDE_DIRECTORY)/libyahoo2 : yahoo2.h ] ;
if $(haveHeaders) {
LIBYAHOO2_INCLUDE_DIR = $(COMMON_INCLUDE_DIRECTORY)/libyahoo2 ;
local haveLibs = [ Glob $(COMMON_LIB_DIRECTORY) : libyahoo2.so ] ;
if $(haveLibs) {
LIBYAHOO2_LIBRARY_DIR = $(COMMON_LIB_DIRECTORY) ;
Echo Yahoo Headers: $(LIBYAHOO2_INCLUDE_DIR) ;
Echo Yahoo Libs: $(LIBYAHOO2_LIBRARY_DIR) ;
}
HAVE_LIBYAHOO2 = $(haveLibs) ;
}
}
rule CheckInfoPopper
{
# CheckInfoPopper
# Check for InfoPopper and defined HAVE_INFOPOPPER according, it also defines
# INFOPOPPER_INCLUDE_DIR and INFOPOPPER_LIBRARY_DIR with location of respectively
# include and library files.
HAVE_INFOPOPPER = ;
INFOPOPPER_INCLUDE_DIR = ;
INFOPOPPER_LIBRARY_DIR = ;
local haveHeaders = [ Glob $(COMMON_INCLUDE_DIRECTORY)/infopopper : InfoPopper.h ] ;
if $(haveHeaders) {
INFOPOPPER_INCLUDE_DIR = $(COMMON_INCLUDE_DIRECTORY)/infopopper ;
local haveLibs = [ Glob $(COMMON_LIB_DIRECTORY) : libinfopopper.so ] ;
if $(haveLibs) {
INFOPOPPER_LIBRARY_DIR = $(COMMON_LIB_DIRECTORY) ;
Echo InfoPopper Headers: $(INFOPOPPER_INCLUDE_DIR) ;
Echo InfoPopper Libs: $(INFOPOPPER_LIBRARY_DIR) ;
}
HAVE_INFOPOPPER = $(haveLibs) ;
}
}