[MERGED] libosmo-abis[master]: Fix HAVE_ORTP_LOG_DOMAIN detection on FreeBSD

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Tue Apr 4 13:39:57 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: Fix HAVE_ORTP_LOG_DOMAIN detection on FreeBSD
......................................................................


Fix HAVE_ORTP_LOG_DOMAIN detection on FreeBSD

We need to use the include path[s] resolved by pkg-config for
ortp before trying to compile our test program.  Without this
patch, compilation will fail e.g. on FreeBSD 11.

Change-Id: I0c95e37cc449297389bf31dd9d5dcaa922d75d0c
---
M configure.ac
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/configure.ac b/configure.ac
index 43266be..9b2f189 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,8 @@
 	CPPFLAGS+=" -fsanitize=address -fsanitize=undefined"
 fi
 
+_cflags_save=$CFLAGS
+CFLAGS="$CFLAGS $ORTP_CFLAGS"
 AC_COMPILE_IFELSE(
 	[AC_LANG_PROGRAM(
 		[[#include <ortp/ortp.h>]],
@@ -68,6 +70,7 @@
 		[ortp_set_log_level_mask requires domain parameter])],
 	[AC_DEFINE([HAVE_ORTP_LOG_DOMAIN], [0],
 		[ortp_set_log_level_mask has no domain parameter])])
+CFLAGS=$_cflags_save
 
 AC_OUTPUT(
 	libosmoabis.pc

-- 
To view, visit https://gerrit.osmocom.org/2222
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0c95e37cc449297389bf31dd9d5dcaa922d75d0c
Gerrit-PatchSet: 2
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol <pespin.shar at gmail.com>



More information about the gerrit-log mailing list