From 2c57eaea78b397d120cfe359ff5d8026dae17f60 Mon Sep 17 00:00:00 2001
From: Benny Prijono <bennylp@teluu.com>
Date: Mon, 25 Dec 2006 20:34:14 +0000
Subject: Added TLS support in Makefiles (see ticket #3)

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@862 74dad513-b988-da41-8d7b-12977e46ad98
---
 pjsip/build/Makefile                  |  2 +-
 pjsip/include/pjsip/sip_autoconf.h.in | 38 +++++++++++++++++++++++++++++++++++
 pjsip/include/pjsip/sip_config.h      |  8 ++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 pjsip/include/pjsip/sip_autoconf.h.in

(limited to 'pjsip')

diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile
index 462ab86c..6ba9b095 100644
--- a/pjsip/build/Makefile
+++ b/pjsip/build/Makefile
@@ -45,7 +45,7 @@ export PJSIP_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
 		sip_errno.o sip_msg.o sip_parser.o sip_tel_uri.o sip_uri.o \
 		sip_endpoint.o sip_util.o sip_util_proxy.o \
 		sip_resolve.o sip_transport.o sip_transport_loop.o \
-		sip_transport_udp.o sip_transport_tcp.o \
+		sip_transport_udp.o sip_transport_tcp.o sip_transport_tls_ossl.o \
 		sip_auth_client.o sip_auth_msg.o sip_auth_parser.o \
 		sip_auth_server.o \
 		sip_transaction.o sip_util_statefull.o \
diff --git a/pjsip/include/pjsip/sip_autoconf.h.in b/pjsip/include/pjsip/sip_autoconf.h.in
new file mode 100644
index 00000000..52915136
--- /dev/null
+++ b/pjsip/include/pjsip/sip_autoconf.h.in
@@ -0,0 +1,38 @@
+/* $Id$ */
+/* 
+ * Copyright (C) 2003-2006 Benny Prijono <benny@prijono.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+#ifndef __PJSIP_SIP_AUTOCONF_H__
+#define __PJSIP_SIP_AUTOCONF_H__
+
+/**
+ * @file sip_autoconf.h
+ * @brief Describes operating system specifics (automatically detected by
+ *        autoconf)
+ */
+
+/**
+ * Enable/disable TLS transport, as configured by autoconf.
+ * But only do this if user doesn't explicitly configure in pj/config_site.h.
+ */
+#ifndef PJSIP_HAS_TLS_TRANSPORT
+#undef PJSIP_HAS_TLS_TRANSPORT
+#endif
+
+
+#endif	/* __PJSIP_SIP_AUTOCONF_H__ */
+
diff --git a/pjsip/include/pjsip/sip_config.h b/pjsip/include/pjsip/sip_config.h
index 6b13ee0a..6cf04e86 100644
--- a/pjsip/include/pjsip/sip_config.h
+++ b/pjsip/include/pjsip/sip_config.h
@@ -56,6 +56,14 @@
  * @{
  */
 
+/*
+ * Include sip_autoconf.h if autoconf is used (PJ_AUTOCONF is set)
+ */
+#if defined(PJ_AUTOCONF)
+#   include <pjsip/sip_autoconf.h>
+#endif
+
+
 /**
  * Specify maximum transaction count in transaction hash table.
  * Default value is 16*1024
-- 
cgit v1.2.3