From a4b8a73989c6c3401d85634be74428972b890202 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Sun, 17 Mar 2013 18:28:54 +0000 Subject: [PATCH 1/3] Refactor doxygen check code --- libs/libzrtp/configure.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/libzrtp/configure.in b/libs/libzrtp/configure.in index 963a95dd71..1de413c389 100644 --- a/libs/libzrtp/configure.in +++ b/libs/libzrtp/configure.in @@ -85,11 +85,9 @@ AC_DEFINE(INLINE,[static inline],[Define inline construction for your platform]) # Documentation # AC_CHECK_PROGS([DOXYGEN], [doxygen]) -if test -z "$DOXYGEN"; - then AC_MSG_WARN([Doxygen not found - continuing without Doxygen support]) -fi - -if test -n "$DOXYGEN"; then +if test -z "$DOXYGEN"; then + AC_MSG_WARN([Doxygen not found - continuing without Doxygen support]) +else AM_CONDITIONAL([HAVE_DOXYGEN], [true]) AC_CONFIG_FILES([doc/Doxyfile]) fi From 950a7b7a9a4db0c5a4aa23a48a001a45e98c095e Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Sun, 17 Mar 2013 18:32:24 +0000 Subject: [PATCH 2/3] Make sure HAVE_DOXYGEN is defined Thanks-to: --- libs/libzrtp/configure.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/libzrtp/configure.in b/libs/libzrtp/configure.in index 1de413c389..f908ea69a1 100644 --- a/libs/libzrtp/configure.in +++ b/libs/libzrtp/configure.in @@ -84,6 +84,7 @@ AC_DEFINE(INLINE,[static inline],[Define inline construction for your platform]) # # Documentation # +AM_CONDITIONAL([HAVE_DOXYGEN], [false]) AC_CHECK_PROGS([DOXYGEN], [doxygen]) if test -z "$DOXYGEN"; then AC_MSG_WARN([Doxygen not found - continuing without Doxygen support]) From e9e5f00de7b694d4eb235020918109b3dd2ba172 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Sun, 17 Mar 2013 18:35:45 +0000 Subject: [PATCH 3/3] Enable automatic build support on FreeBSD Thanks-to: --- libs/libzrtp/configure.in | 1 - libs/libzrtp/include/zrtp_config.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/libzrtp/configure.in b/libs/libzrtp/configure.in index f908ea69a1..2d10359a08 100644 --- a/libs/libzrtp/configure.in +++ b/libs/libzrtp/configure.in @@ -24,7 +24,6 @@ case $target_os in ;; *freebsd2* | *freebsd* | *netbsd* | *openbsd* | *osf[12]*) echo "------- START libzrtp configuration for BSD platform ------------" - AC_DEFINE(PLATFORM,ZP_BSD,BSD platform) ;; hpux* | irix* | linuxaout* | linux* | osf* | solaris2* | sunos4*) echo "------- START libzrtp configuration for Linux platform ------------" diff --git a/libs/libzrtp/include/zrtp_config.h b/libs/libzrtp/include/zrtp_config.h index d781043fde..3f954fc836 100644 --- a/libs/libzrtp/include/zrtp_config.h +++ b/libs/libzrtp/include/zrtp_config.h @@ -19,6 +19,8 @@ #if !defined(ZRTP_PLATFORM) # if defined(ANDROID_NDK) # define ZRTP_PLATFORM ZP_ANDROID +# elif defined(__FreeBSD__) +# define ZRTP_PLATFORM ZP_BSD # elif defined(linux) || defined(__linux) # include # define ZRTP_PLATFORM ZP_LINUX