Change in osmo-mgw[master]: configure: Find correct libgsm's gsm.h header

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10208 )

Change subject: configure: Find correct libgsm's gsm.h header
......................................................................

configure: Find correct libgsm's gsm.h header

Some distributions (archlinux) or versions of libgsm install gsm.h in
/usr/include/gsm/gsm.h

Since libgsm doesn't come with a pkfconfig, let's first check if gsm.h
and take the correct path in the build setup.

Change-Id: I07d3c03903e0d4bb80e843c7ed917a27b791ea53
---
M configure.ac
M include/osmocom/legacy_mgcp/mgcp_transcode.h
2 files changed, 11 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/configure.ac b/configure.ac
index 29390c6..b0b0d21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,6 +80,13 @@
 AC_ARG_WITH([g729], [AS_HELP_STRING([--with-g729], [Enable G.729 encoding/decoding.])], [osmo_ac_with_g729="$withval"],[osmo_ac_with_g729="no"])
 
 if test "$osmo_ac_mgcp_transcoding" = "yes" ; then
+    AC_CHECK_HEADERS([gsm.h gsm/gsm.h], [osmo_ac_found_gsm_headers=yes])
+    if test "$osmo_ac_found_gsm_headers" != "yes" ; then
+	AC_MSG_ERROR([Unable to find the libgsm headers])
+    fi
+    AC_SUBST(HAVE_GSM_H)
+    AC_SUBST(HAVE_GSM_GSM_H)
+
     AC_SEARCH_LIBS([gsm_create], [gsm], [LIBRARY_GSM="$LIBS";LIBS=""], [AC_MSG_ERROR([--enable-mgcp-transcoding: cannot find usable libgsm])])
     AC_SUBST(LIBRARY_GSM)
     if test "$osmo_ac_with_g729" = "yes" ; then
diff --git a/include/osmocom/legacy_mgcp/mgcp_transcode.h b/include/osmocom/legacy_mgcp/mgcp_transcode.h
index 147e48b..6892deb 100644
--- a/include/osmocom/legacy_mgcp/mgcp_transcode.h
+++ b/include/osmocom/legacy_mgcp/mgcp_transcode.h
@@ -21,7 +21,11 @@
 
 #include "bscconfig.h"
 
+#if HAVE_GSM_H
 #include <gsm.h>
+#elif HAVE_GSM_GSM_H
+#include <gsm/gsm.h>
+#endif
 #ifdef HAVE_BCG729
 #include <bcg729/decoder.h>
 #include <bcg729/encoder.h>

-- 
To view, visit https://gerrit.osmocom.org/10208
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I07d3c03903e0d4bb80e843c7ed917a27b791ea53
Gerrit-Change-Number: 10208
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180728/879caf87/attachment.htm>