From bda1e63b8ede567c09b8176d740b9814afa08e70 Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 24 Sep 2002 19:54:21 +0000 Subject: [PATCH] add OpenSSL to build rules --- dtool/Config.pp | 6 ++++++ dtool/LocalSetup.pp | 3 +++ dtool/Package.pp | 5 +++++ dtool/pptempl/Global.pp | 7 +++++++ 4 files changed, 21 insertions(+) diff --git a/dtool/Config.pp b/dtool/Config.pp index 13f9cf1267..99daf9cbcf 100644 --- a/dtool/Config.pp +++ b/dtool/Config.pp @@ -196,6 +196,12 @@ #define STL_CFLAGS #define STL_LIBS +// Is OpenSSL installed, and where? +#define SSL_IPATH /usr/local/ssl/include +#define SSL_LPATH /usr/local/ssl/lib +#define SSL_LIBS ssl crypto +#defer HAVE_SSL $[libtest $[SSL_LPATH],$[SSL_LIBS]] + // Is Crypto++ installed, and where? #define CRYPTO_IPATH /usr/include/crypto++ #define CRYPTO_LPATH /usr/lib diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp index 40f26c887e..9034112473 100644 --- a/dtool/LocalSetup.pp +++ b/dtool/LocalSetup.pp @@ -28,6 +28,9 @@ $[cdefine HAVE_MAYA] /* Define if we have NSPR installed. */ $[cdefine HAVE_NSPR] +/* Define if we have OpenSSL installed. */ +$[cdefine HAVE_SSL] + /* Define if we have crypto++ installed. */ $[cdefine HAVE_CRYPTO] diff --git a/dtool/Package.pp b/dtool/Package.pp index 2890031639..d67c1a30d3 100644 --- a/dtool/Package.pp +++ b/dtool/Package.pp @@ -92,6 +92,11 @@ #set NSPR_LIBS $[NSPR_LIBS] #set HAVE_NSPR $[HAVE_NSPR] +#set SSL_IPATH $[unixfilename $[SSL_IPATH]] +#set SSL_LPATH $[unixfilename $[SSL_LPATH]] +#set SSL_LIBS $[SSL_LIBS] +#set HAVE_SSL $[HAVE_SSL] + #set CRYPTO_IPATH $[unixfilename $[CRYPTO_IPATH]] #set CRYPTO_LPATH $[unixfilename $[CRYPTO_LPATH]] #set CRYPTO_LIBS $[CRYPTO_LIBS] diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp index 37d3c6fc0d..b31117314c 100644 --- a/dtool/pptempl/Global.pp +++ b/dtool/pptempl/Global.pp @@ -91,6 +91,13 @@ #define nspr_libs $[NSPR_LIBS] #endif +#if $[HAVE_SSL] + #define ssl_ipath $[wildcard $[SSL_IPATH]] + #define ssl_lpath $[wildcard $[SSL_LPATH]] + #define ssl_cflags $[SSL_CFLAGS] + #define ssl_libs $[SSL_LIBS] +#endif + #if $[HAVE_CRYPTO] #define crypto_ipath $[wildcard $[CRYPTO_IPATH]] #define crypto_lpath $[wildcard $[CRYPTO_LPATH]]