no longer use crypto library
This commit is contained in:
parent
577c5ac28c
commit
fe23221785
|
|
@ -207,12 +207,6 @@
|
|||
// error messages when they occur.
|
||||
#defer REPORT_OPENSSL_ERRORS $[< $[OPTIMIZE], 4]
|
||||
|
||||
// Is Crypto++ installed, and where?
|
||||
#define CRYPTO_IPATH /usr/include/crypto++
|
||||
#define CRYPTO_LPATH /usr/lib
|
||||
#define CRYPTO_LIBS cryptlib
|
||||
#defer HAVE_CRYPTO $[libtest $[CRYPTO_LPATH],$[CRYPTO_LIBS]]
|
||||
|
||||
// Is libjpeg installed, and where?
|
||||
#define JPEG_IPATH
|
||||
#define JPEG_LPATH
|
||||
|
|
|
|||
|
|
@ -39,9 +39,6 @@ $[cdefine HAVE_SSL]
|
|||
$[cdefine SSL_097]
|
||||
$[cdefine REPORT_OPENSSL_ERRORS]
|
||||
|
||||
/* Define if we have crypto++ installed. */
|
||||
$[cdefine HAVE_CRYPTO]
|
||||
|
||||
/* Define if we have libjpeg installed. */
|
||||
$[cdefine HAVE_JPEG]
|
||||
|
||||
|
|
|
|||
|
|
@ -97,11 +97,6 @@
|
|||
#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]
|
||||
#set HAVE_CRYPTO $[HAVE_CRYPTO]
|
||||
|
||||
#set JPEG_IPATH $[unixfilename $[JPEG_IPATH]]
|
||||
#set JPEG_LPATH $[unixfilename $[JPEG_LPATH]]
|
||||
#set JPEG_LIBS $[JPEG_LIBS]
|
||||
|
|
|
|||
|
|
@ -98,13 +98,6 @@
|
|||
#define ssl_libs $[SSL_LIBS]
|
||||
#endif
|
||||
|
||||
#if $[HAVE_CRYPTO]
|
||||
#define crypto_ipath $[wildcard $[CRYPTO_IPATH]]
|
||||
#define crypto_lpath $[wildcard $[CRYPTO_LPATH]]
|
||||
#define crypto_cflags $[CRYPTO_CFLAGS]
|
||||
#define crypto_libs $[CRYPTO_LIBS]
|
||||
#endif
|
||||
|
||||
#if $[HAVE_ZLIB]
|
||||
#define zlib_ipath $[wildcard $[ZLIB_IPATH]]
|
||||
#define zlib_lpath $[wildcard $[ZLIB_LPATH]]
|
||||
|
|
|
|||
|
|
@ -430,7 +430,7 @@ $[TAB]cp $[sourcedir]/$[local] $[dest]
|
|||
// The current language file exists.
|
||||
#define local $[wantegg:%.egg=%.bam]
|
||||
#else
|
||||
#print Warning: $[wantegg] not listed, using $[egg]
|
||||
//#print Warning: $[wantegg] not listed, using $[egg]
|
||||
#define local $[egg:%.egg=%.bam]
|
||||
#endif
|
||||
#define remote $[egg:%_$[DEFAULT_LANGUAGE].egg=%.bam]
|
||||
|
|
@ -480,7 +480,7 @@ $[TAB]cp $[local] $[dest]
|
|||
// The current language file exists.
|
||||
#define local $[wantfile]
|
||||
#else
|
||||
#print Warning: $[wantfile] not listed, using $[file]
|
||||
//#print Warning: $[wantfile] not listed, using $[file]
|
||||
#define local $[file]
|
||||
#endif
|
||||
#define remote $[notdir $[file:%_$[DEFAULT_LANGUAGE].dna=%.dna]]
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
#begin bin_target
|
||||
#define TARGET check_md5
|
||||
#define BUILD_TARGET $[HAVE_SSL]
|
||||
#define USE_PACKAGES $[USE_PACKAGES] crypto
|
||||
#define USE_PACKAGES $[USE_PACKAGES] ssl
|
||||
|
||||
#define SOURCES \
|
||||
check_md5.cxx
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#begin lib_target
|
||||
#define TARGET express
|
||||
#define USE_PACKAGES nspr crypto net zlib ssl
|
||||
#define USE_PACKAGES nspr net zlib ssl
|
||||
|
||||
#define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue