diff options
| -rw-r--r-- | codecs/Makefile | 6 | ||||
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.ac | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index 23e9e673b..f98637aa1 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -23,9 +23,9 @@ LIBLPC10:=lpc10/liblpc10.a all: _all -ifeq ($(LIBGSM_LIB),internal) -LIBGSM_INCLUDE:=-Igsm/inc -LIBGSM_LIB:= +ifeq ($(GSM_LIB),internal) +GSM_INCLUDE:=-Igsm/inc +GSM_LIB:= codec_gsm.so: gsm/lib/libgsm.a endif @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 37066 . +# From configure.ac Revision: 37086 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59e. # @@ -15854,6 +15854,11 @@ fi GSM_INTERNAL="yes" GSM_SYSTEM="yes" if test "${USE_GSM}" != "no"; then + if test "${GSM_DIR}" = "internal"; then + GSM_SYSTEM="no" + elif test "${GSM_DIR}" != ""; then + GSM_INTERNAL="no" + fi if test "${GSM_SYSTEM}" = "yes"; then gsmlibdir="" if test "x${GSM_DIR}" != "x"; then diff --git a/configure.ac b/configure.ac index acdc55187..4a6b924f4 100644 --- a/configure.ac +++ b/configure.ac @@ -300,6 +300,11 @@ AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h]) GSM_INTERNAL="yes" GSM_SYSTEM="yes" if test "${USE_GSM}" != "no"; then + if test "${GSM_DIR}" = "internal"; then + GSM_SYSTEM="no" + elif test "${GSM_DIR}" != ""; then + GSM_INTERNAL="no" + fi if test "${GSM_SYSTEM}" = "yes"; then gsmlibdir="" if test "x${GSM_DIR}" != "x"; then |