jadedctrl/Chat-O-Matic
jadedctrl/ Chat-O-Matic
1
0
Disbranĉigi 0
Fontkodo Issues 20 Tirpetoj Actions Packages Projects Eldonoj 2 Wiki Activity

Initial fix to avoid confusion with configure directories. Fix build.

This commit is contained in:
Barrett17 2015-06-24 15:21:34 +00:00
parent 0746cacb94
commit 67fe224ca6
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/jam/CheckRules
View File

@ -33,13 +33,13 @@ rule CheckOpenSSL
OPENSSL_INCLUDE_DIR = ; OPENSSL_INCLUDE_DIR = ;
OPENSSL_LIBRARY_DIR = ; OPENSSL_LIBRARY_DIR = ;
local haveHeaders = [ Glob $(USER_INCLUDE_DIRECTORY)/openssl : ssl.h ] ; local haveHeaders = [ Glob $(SYSTEM_INCLUDE_DIRECTORY)/openssl : ssl.h ] ;
if $(haveHeaders) { if $(haveHeaders) {
OPENSSL_INCLUDE_DIR = $(USER_INCLUDE_DIRECTORY) ; OPENSSL_INCLUDE_DIR = $(SYSTEM_INCLUDE_DIRECTORY) ;
local haveLibs = [ Glob $(USER_LIB_DIRECTORY) : libssl.so ] ; local haveLibs = [ Glob $(SYSTEM_DEVELOP_LIB_DIRECTORY) : libssl.so ] ;
if $(haveLibs) { if $(haveLibs) {
OPENSSL_LIBRARY_DIR = $(USER_LIB_DIRECTORY) ; OPENSSL_LIBRARY_DIR = $(SYSTEM_DEVELOP_LIB_DIRECTORY) ;
Echo OpenSSL Headers: $(OPENSSL_INCLUDE_DIR) ; Echo OpenSSL Headers: $(OPENSSL_INCLUDE_DIR) ;
Echo OpenSSL Libs: $(OPENSSL_LIBRARY_DIR) ; Echo OpenSSL Libs: $(OPENSSL_LIBRARY_DIR) ;
@ -54,13 +54,13 @@ rule CheckExpat
EXPAT_INCLUDE_DIR = ; EXPAT_INCLUDE_DIR = ;
EXPAT_LIBRARY_DIR = ; EXPAT_LIBRARY_DIR = ;
local haveHeaders = [ Glob $(USER_INCLUDE_DIRECTORY)/ : expat.h ] ; local haveHeaders = [ Glob $(SYSTEM_INCLUDE_DIRECTORY)/ : expat.h ] ;
if $(haveHeaders) { if $(haveHeaders) {
EXPAT_INCLUDE_DIR = $(USER_INCLUDE_DIRECTORY)/ ; EXPAT_INCLUDE_DIR = $(SYSTEM_INCLUDE_DIRECTORY)/ ;
local haveLibs = [ Glob $(USER_LIB_DIRECTORY) : libexpat.so ] ; local haveLibs = [ Glob $(SYSTEM_DEVELOP_LIB_DIRECTORY) : libexpat.so ] ;
if $(haveLibs) { if $(haveLibs) {
EXPAT_LIBRARY_DIR = $(USER_LIB_DIRECTORY) ; EXPAT_LIBRARY_DIR = $(SYSTEM_DEVELOP_LIB_DIRECTORY) ;
Echo Expat Headers: $(EXPAT_INCLUDE_DIR) ; Echo Expat Headers: $(EXPAT_INCLUDE_DIR) ;
Echo Expat Libs: $(EXPAT_LIBRARY_DIR) ; Echo Expat Libs: $(EXPAT_LIBRARY_DIR) ;

7
configure vendored
View File

@ -121,7 +121,8 @@ SETTYPE = ${settypebin} ;
MIMESET = ${mimesetbin} ; MIMESET = ${mimesetbin} ;
SETVERSION = ${setversionbin} ; SETVERSION = ${setversionbin} ;
COPYATTR = ${copyattrbin} ; COPYATTR = ${copyattrbin} ;
#TODO common doesn't exists anymore, change COMMON to SYSTEM
COMMON_BIN_DIRECTORY = $(finddir B_SYSTEM_BIN_DIRECTORY) ; COMMON_BIN_DIRECTORY = $(finddir B_SYSTEM_BIN_DIRECTORY) ;
COMMON_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ; COMMON_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ;
COMMON_LIB_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib ; COMMON_LIB_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib ;
@ -130,10 +131,10 @@ COMMON_ADDONS_DIRECTORY = $(finddir B_SYSTEM_ADDONS_DIRECTORY) ;
COMMON_DEVELOP_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY) ; COMMON_DEVELOP_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY) ;
USER_CONFIG_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY) ; USER_CONFIG_DIRECTORY = $(finddir B_USER_CONFIG_DIRECTORY) ;
USER_INCLUDE_DIRECTORY = $(finddir B_USER_HEADERS_DIRECTORY) ;
USER_LIB_DIRECTORY = $(finddir B_USER_DEVELOP_DIRECTORY)/lib ;
SYSTEM_DIRECTORY = $(finddir B_SYSTEM_DIRECTORY) ; SYSTEM_DIRECTORY = $(finddir B_SYSTEM_DIRECTORY) ;
SYSTEM_INCLUDE_DIRECTORY = $(finddir B_SYSTEM_HEADERS_DIRECTORY) ;
SYSTEM_DEVELOP_LIB_DIRECTORY = $(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib ;
SYSTEM_LIB_DIRECTORY = $(finddir B_SYSTEM_LIB_DIRECTORY) ; SYSTEM_LIB_DIRECTORY = $(finddir B_SYSTEM_LIB_DIRECTORY) ;
BEOS_PREFERENCES_DIRECTORY = $(finddir B_BEOS_PREFERENCES_DIRECTORY) ; BEOS_PREFERENCES_DIRECTORY = $(finddir B_BEOS_PREFERENCES_DIRECTORY) ;