ref: 0a926392573fd4fad513e53cb330f8aa9e3cf4a9
parent: 6b89c951e0a2501688941f6fbcacfe051c12eb06
author: cbagwell <cbagwell>
date: Wed Jan 24 23:46:12 EST 2007
Have in-tree GSM pulled directly into libst.
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src
+SUBDIRS = @LIBGSM_DIR@ src
# man pages are not considered to be sources, so need to add "dist_"
# prefix to ensure they are added to the distribution.
--- a/configure.ac
+++ b/configure.ac
@@ -100,11 +100,9 @@
AC_CHECK_LIB(gsm, gsm_create, LIBS="$LIBS -lgsm")
AC_DEFINE(EXTERNAL_GSM, 1, [Define if you are using an external GSM library])
else
- LIBGSM_DIR=libgsm
- LIBGSM_LINK=$LIBGSM_DIR/libgsm.la
+ LIBGSM_DIR=src/libgsm
fi
AC_SUBST(LIBGSM_DIR)
-AC_SUBST(LIBGSM_LINK)
dnl Check for libsndfile
with_sndfile=yes
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,5 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = @LIBGSM_DIR@
-
AM_CFLAGS = @SNDFILE_CFLAGS@ @SAMPLERATE_CFLAGS@
AM_LDFLAGS = @SNDFILE_LIBS@ @SAMPLERATE_LIBS@
@@ -30,9 +28,10 @@
libst_la_SOURCES = $(formats) $(effects) alsa.c oss.c sunaudio.c handlers.c \
misc.c st_i.h stio.c util.c xmalloc.c xmalloc.h \
getopt.c getopt1.c getopt.h stconfig.h
+libst_la_LIBADD = libgsm/libgsm.la
sox_SOURCES = sox.c
-sox_LDADD = libst.la @LIBGSM_LINK@
+sox_LDADD = libst.la
all: sox$(EXEEXT) play rec