diff options
| author | Benny Prijono <bennylp@teluu.com> | 2010-05-01 22:05:41 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2010-05-01 22:05:41 +0000 |
| commit | 810416dab92eeb54a9b01221ee9ff262305b13b5 (patch) | |
| tree | 0533e6ed07a6a7009f00faa33569cf0189d502db /aconfigure.ac | |
| parent | 22cebb12bd93ddd25b80048c72473a55f14ed6df (diff) | |
Fixed #1064:
- Removed orphaned third_party/gsm/inc/gsm.h.orig file
- Added support for external GSM header in /usr/include/gsm.h (rather than <gsm/gsm.h>)
Thanks Christopher Zimmermann for the fixes
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3158 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'aconfigure.ac')
| -rw-r--r-- | aconfigure.ac | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/aconfigure.ac b/aconfigure.ac index 76d73fb3..185ee0de 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -408,17 +408,30 @@ AC_ARG_WITH(external-gsm, [Use external GSM codec library, not the one in "third_party" directory. When this option is set, make sure that the GSM include/lib files are accessible to use (hint: use CFLAGS and LDFLAGS env var to set the include/lib paths)]), [ if test "x$with_external_gsm" != "xno"; then - # Test GSM library installation - AC_MSG_CHECKING([if external GSM devkit is installed]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gsm/gsm.h> - ]], - [gsm_create(); ]) - ], - [AC_MSG_RESULT(yes!!) - AC_DEFINE(PJMEDIA_EXTERNAL_GSM_CODEC, 1) - ac_external_gsm="1" - ], - [AC_MSG_ERROR([Unable to use external GSM library. If GSM development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths])]) + # Test GSM library installation + AC_MSG_CHECKING([if external GSM devkit is installed as gsm/gsm.h]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include <gsm/gsm.h> ]], [gsm_create(); ]) ], + [AC_MSG_RESULT(yes!!) + AC_DEFINE(PJMEDIA_EXTERNAL_GSM_CODEC, 1) + AC_DEFINE(PJMEDIA_EXTERNAL_GSM_GSM_H, 1) + ac_external_gsm="1" + ], + [ + AC_MSG_RESULT(no) + AC_MSG_CHECKING([if external GSM devkit is installed as gsm.h]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[#include <gsm.h> ]], [gsm_create(); ]) ], + [AC_MSG_RESULT(yes!!) + AC_DEFINE(PJMEDIA_EXTERNAL_GSM_CODEC, 1) + AC_DEFINE(PJMEDIA_EXTERNAL_GSM_H, 1) + ac_external_gsm="1" + ], + [AC_MSG_ERROR([Unable to use external GSM library. If GSM development files are not available in the default locations, use CFLAGS and LDFLAGS env var to set the include/lib paths]) + ] + ) + ] + ) fi ] ) |