shithub: sox

Download patch

ref: 820133b309a60d25f41bfeddbdf470b278cec32e
parent: 651d554adb536abcb9223487d1c0ece8cfa95726
author: cbagwell <cbagwell>
date: Tue Sep 4 15:39:24 EDT 2007

Move conditional compiling of GSM from configure/top level Makefile.am
to the libgsm Makefile.am.

--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = lpc10 @LIBGSM_SUBDIR@ src
+SUBDIRS = lpc10 src
 if HAVE_LIBLTDL
 SUBDIRS += libltdl
 endif
--- a/configure.ac
+++ b/configure.ac
@@ -186,10 +186,8 @@
     AC_CHECK_LIB(gsm, gsm_create, GSM_LIBS="$GSM_LIBS -lgsm")
     AC_DEFINE(EXTERNAL_GSM, 1, [Define if you are using an external GSM library])
 else
-    LIBGSM_SUBDIR=src/libgsm
     LIBGSM_LIBADD=libgsm/libgsm.la
 fi
-AC_SUBST(LIBGSM_SUBDIR)
 AC_SUBST(LIBGSM_LIBADD)
 AC_SUBST(GSM_LIBS)
 AM_CONDITIONAL(EXTERNAL_GSM, test x$found_libgsm = xyes)