diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-25 14:43:54 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-25 14:43:54 +0000 |
| commit | 8e51c0b94ef8fba7de5bc9962808d794df198384 (patch) | |
| tree | 0191c8943b8db84d11e9cc86735119b3c80da634 /configure.ac | |
| parent | 37856a60dd60ca2a77a4035bca6a7a89b8cd7134 (diff) | |
have to check for OSP toolkit _after_ checking for OpenSSL
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@66160 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 16693c473..44ce0278c 100644 --- a/configure.ac +++ b/configure.ac @@ -694,11 +694,6 @@ AST_EXT_LIB_CHECK([UNIXODBC], [odbc], [SQLConnect], [sql.h], [-lltdl]) AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], []) -if test "$PBX_OPENSSL" = "1"; -then - AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl]) -fi - if test "${USE_OSS}" != "no"; then PBX_OSS=0 AC_CHECK_HEADER([linux/soundcard.h], @@ -906,6 +901,10 @@ AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm]) AST_EXT_LIB_CHECK([SQLITE], [sqlite], [sqlite_exec], [sqlite.h]) AST_EXT_LIB_CHECK([OPENSSL], [ssl], [ssl2_connect], [openssl/ssl.h], [-lcrypto]) +if test "$PBX_OPENSSL" = "1"; +then + AST_EXT_LIB_CHECK([OSPTK], [osptk], [OSPPCryptoDecrypt], [osp/osp.h], [-lcrypto -lssl]) +fi AST_EXT_LIB_CHECK([FREETDS], [tds], [tds_version], [tds.h]) if test "${PBX_FREETDS}" != "0"; |