Jelajahi Sumber

add OpenSSL to build rules

David Rose 23 tahun lalu
induk
melakukan
bda1e63b8e
4 mengubah file dengan 21 tambahan dan 0 penghapusan
  1. 6 0
      dtool/Config.pp
  2. 3 0
      dtool/LocalSetup.pp
  3. 5 0
      dtool/Package.pp
  4. 7 0
      dtool/pptempl/Global.pp

+ 6 - 0
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

+ 3 - 0
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]
 

+ 5 - 0
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]

+ 7 - 0
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]]