aboutsummaryrefslogtreecommitdiffstats
path: root/makeopts.in
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2007-05-25 14:37:55 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2007-05-25 14:37:55 +0000
commitf554d266c751f70183d42f1cee5e28608fa3a436 (patch)
treec8a19d6fa9f9ea03bc06e0322f5931cc741c1a73 /makeopts.in
parent603a5334ddad6388646b16b203f2c7316dd52fd9 (diff)
Merged revisions 66157 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r66157 | kpfleming | 2007-05-25 10:28:46 -0400 (Fri, 25 May 2007) | 3 lines handle the GNUTLS library properly in the configure script and build system don't build in OSP support unless we have found and are allowed to use SSL support ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@66158 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'makeopts.in')
-rw-r--r--makeopts.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/makeopts.in b/makeopts.in
index e2aeda7cd..69d12558e 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -90,6 +90,9 @@ GTK2_LIB=@GTK2_LIB@
IKSEMEL_INCLUDE=@IKSEMEL_INCLUDE@
IKSEMEL_LIB=@IKSEMEL_LIB@
+GNUTLS_INCLUDE=@GNUTLS_INCLUDE@
+GNUTLS_LIB=@GNUTLS_LIB@
+
IMAP_TK_INCLUDE=@IMAP_TK_INCLUDE@
IMAP_TK_LIB=@IMAP_TK_LIB@