Commit fc542cd6 authored by Pekka Pessi's avatar Pekka Pessi
Browse files

Do not compile STUN if OpenSSL is not available (from pessi-darcs-1).

darcs-hash:20050909102434-65a35-2cfe6ea8e7ec39f5526719329682d664236aab76.gz
parent 5a74539e
2005-09-08 Kai Vehmanen <kai.vehmanen@nokia.com>
* configure.ac: Do not compile STUN if OpenSSL is not
available.
2005-07-20 Pekka Pessi <Pekka.Pessi@nokia.com> 2005-07-20 Pekka Pessi <Pekka.Pessi@nokia.com>
* Makefile.am: Added doxygen target. * Makefile.am: Added doxygen target.
......
...@@ -46,10 +46,15 @@ SAC_SU ...@@ -46,10 +46,15 @@ SAC_SU
dnl internal modules dnl internal modules
dnl ---------------- dnl ----------------
AC_DEFINE([HAVE_SOFIA_SIP], 1, [Define as 1 always]) AC_DEFINE([HAVE_SOFIA_SIP], 1, [Define as 1 always])
AC_DEFINE([HAVE_SOFIA_STUN], 1, [Define as 1 if we use STUN library])
AC_DEFINE([HAVE_SOFIA_SRESOLV], 1, [Define as 1 if we use DNS library]) AC_DEFINE([HAVE_SOFIA_SRESOLV], 1, [Define as 1 if we use DNS library])
AC_DEFINE([HAVE_SOFIA_SMIME], 0, [Define as 1 if we use S/MIME library]) AC_DEFINE([HAVE_SOFIA_SMIME], 0, [Define as 1 if we use S/MIME library])
dnl compile STUN only if OPENSSL is available
if test x${HAVE_OPENSSL} != x1 ; then
AC_MSG_WARN([** STUN support disabled as OpenSSL headers and/or libraries were not found **])
fi
AC_DEFINE_UNQUOTED([HAVE_SOFIA_STUN], $HAVE_OPENSSL, [Define as 1 if we use STUN library])
AC_DEFINE([HAVE_SRTP], 0, [Define as 1 if we use SRTP]) AC_DEFINE([HAVE_SRTP], 0, [Define as 1 if we use SRTP])
AC_DEFINE([HAVE_UPNP], 0, [Define as 1 if we use UPnP]) AC_DEFINE([HAVE_UPNP], 0, [Define as 1 if we use UPnP])
......
...@@ -8,6 +8,10 @@ EXTRA_DIST = sofia.am ...@@ -8,6 +8,10 @@ EXTRA_DIST = sofia.am
lib_LTLIBRARIES = libsofia-sip-ua.la lib_LTLIBRARIES = libsofia-sip-ua.la
if HAVE_TLS
tls_objs=stun/stun_objs.o
endif
libsofia_sip_ua_la_SOURCES = libsofia_sip_ua_la_SOURCES =
libsofia_sip_ua_la_LIBADD = bnf/bnf_objs.o \ libsofia_sip_ua_la_LIBADD = bnf/bnf_objs.o \
ipt/ipt_objs.o \ ipt/ipt_objs.o \
...@@ -24,8 +28,8 @@ libsofia_sip_ua_la_LIBADD = bnf/bnf_objs.o \ ...@@ -24,8 +28,8 @@ libsofia_sip_ua_la_LIBADD = bnf/bnf_objs.o \
sresolv/sresolv_objs.o \ sresolv/sresolv_objs.o \
su/su_objs.o \ su/su_objs.o \
tport/tport_objs.o \ tport/tport_objs.o \
stun/stun_objs.o \ url/url_objs.o \
url/url_objs.o ${tls_objs}
all-recursive: built-sources-recursive all-recursive: built-sources-recursive
built-sources: built-sources-recursive built-sources: built-sources-recursive
......
...@@ -15,9 +15,16 @@ INCLUDES = -I$(srcdir)/../su ...@@ -15,9 +15,16 @@ INCLUDES = -I$(srcdir)/../su
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Build targets # Build targets
noinst_LIBRARIES = libstun.a if HAVE_TLS
stun_lib_targets = libstun.a
noinst_PROGRAMS = stun_objs.o stunc torture_stun stun_prog_targets = stun_objs.o stunc torture_stun
else
stun_lib_targets =
stun_prog_targets =
endif
noinst_LIBRARIES = ${stun_lib_targets}
noinst_PROGRAMS = ${stun_prog_targets}
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Rules for building the targets # Rules for building the targets
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment