ref: 9090389af8a2e0048afc90756f4ada70276d416d
parent: 3c5cc074324571b98da12c3227a399023785fc6e
author: cbagwell <cbagwell>
date: Thu Jan 25 20:18:46 EST 2007
Don't pull in libgsm.la if using external libgsm library.
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = @LIBGSM_DIR@ src
+SUBDIRS = @LIBGSM_SUBDIR@ 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,10 +100,12 @@
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=src/libgsm
+ LIBGSM_SUBDIR=src/libgsm
+ LIBGSM_LIBADD=libgsm/libgsm.la
fi
-AC_SUBST(LIBGSM_DIR)
-
+AC_SUBST(LIBGSM_SUBDIR)
+AC_SUBST(LIBGSM_LIBADD)
+
dnl Check for libsndfile
with_sndfile=yes
AC_ARG_WITH(sndfile, AC_HELP_STRING([--with-sndfile],
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,7 @@
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
+libst_la_LIBADD = @LIBGSM_LIBADD@
sox_SOURCES = sox.c
sox_LDADD = libst.la