shithub: sox

Download patch

ref: 34ae1adf5eabb11dc5d527bc2d38956b76b33828
parent: 8d7a8fdb470e7e5a07393bf876073f35cdeca312
author: rrt <rrt>
date: Mon Dec 18 15:19:47 EST 2006 

Remove luac configuration tests, as we don't need luac.


--- a/Makefile.in
+++ b/Makefile.in
@@ -110,7 +110,6 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LUA = @LUA@
-LUAC = @LUAC@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
 MAKEINFO = @MAKEINFO@
--- a/configure
+++ b/configure
@@ -701,7 +701,6 @@
 SAMPLERATE_CFLAGS
 SAMPLERATE_LIBS
 LUA
-LUAC
 LUA_INCLUDES
 LUA_LIBS
 with_alsa with_oss
@@ -7702,7 +7701,6 @@
 
 
 
-
 # Check whether --with-lua-prefix was given.
 if test "${with_lua_prefix+set}" = set; then
   withval=$with_lua_prefix;
@@ -7793,8 +7791,6 @@
     ;;
 esac
 
-
-
 if test "x$with_lua_includes" != x; then
     LUA_INCLUDES="-I$with_lua_includes"
 elif test "x$with_lua_prefix" != x; then
@@ -11830,7 +11826,6 @@
 SAMPLERATE_CFLAGS!$SAMPLERATE_CFLAGS$ac_delim
 SAMPLERATE_LIBS!$SAMPLERATE_LIBS$ac_delim
 LUA!$LUA$ac_delim
-LUAC!$LUAC$ac_delim
 LUA_INCLUDES!$LUA_INCLUDES$ac_delim
 LUA_LIBS!$LUA_LIBS$ac_delim
 with_alsa!$with_alsa$ac_delim
@@ -11838,7 +11833,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- a/configure.ac
+++ b/configure.ac
@@ -141,12 +141,11 @@
 AC_SUBST(SAMPLERATE_LIBS)
 
 
-dnl LUA, LUAC, LUA_INCLUDES, LUA_LIBS
+dnl LUA, LUA_INCLUDES, LUA_LIBS
 
 with_lua=yes
 
 AC_SUBST(LUA)
-AC_SUBST(LUAC)
 AC_SUBST(LUA_INCLUDES)
 AC_SUBST(LUA_LIBS)
 
@@ -189,22 +188,6 @@
     ;;
 esac
 dnl
-
-dnl dnl LUAC
-dnl if test "x$LUAC" = x; then
-dnl     AC_PATH_PROG([LUAC], [luac$with_lua_suffix], [], [$lua_search_path])
-dnl     test "x$LUAC" = x && exit 1
-dnl fi
-
-dnl dnl luac_version
-dnl AC_MSG_CHECKING([for lua version = luac version])
-dnl luac_version=$($LUAC -v 2>&1 | head -n 1 | cut -d' ' -f2)
-dnl if test "x$lua_version" = "x$luac_version"; then
-dnl     AC_MSG_RESULT([yes (found $luac_version)])
-dnl else
-dnl     AC_MSG_RESULT([no (found $luac_version)])
-dnl     exit 1
-dnl fi
 
 dnl LUA_INCLUDES
 if test "x$with_lua_includes" != x; then
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -87,10 +87,9 @@
 	phaser.$(OBJEXT) pitch.$(OBJEXT) polyphas.$(OBJEXT) \
 	rabbit.$(OBJEXT) rate.$(OBJEXT) repeat.$(OBJEXT) \
 	resample.$(OBJEXT) reverb.$(OBJEXT) reverse.$(OBJEXT) \
-	silence.$(OBJEXT) speed.$(OBJEXT) speedr.$(OBJEXT) \
-	stat.$(OBJEXT) stretch.$(OBJEXT) swap.$(OBJEXT) \
-	synth.$(OBJEXT) tone.$(OBJEXT) trim.$(OBJEXT) vibro.$(OBJEXT) \
-	vol.$(OBJEXT)
+	silence.$(OBJEXT) speed.$(OBJEXT) stat.$(OBJEXT) \
+	stretch.$(OBJEXT) swap.$(OBJEXT) synth.$(OBJEXT) \
+	tone.$(OBJEXT) trim.$(OBJEXT) vibro.$(OBJEXT) vol.$(OBJEXT)
 am_libst_a_OBJECTS = $(am__objects_1) $(am__objects_2) alsa.$(OBJEXT) \
 	oss.$(OBJEXT) sunaudio.$(OBJEXT) handlers.$(OBJEXT) \
 	misc.$(OBJEXT) stio.$(OBJEXT) util.$(OBJEXT) xmalloc.$(OBJEXT) \
@@ -158,7 +157,6 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LUA = @LUA@
-LUAC = @LUAC@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
 MAKEINFO = @MAKEINFO@
@@ -230,7 +228,7 @@
 	  highp.c highpass.c lowp.c lowpass.c lua.c lintlib.c mask.c \
 	  mcompand.c noiseprof.c noisered.c noisered.h pan.c \
 	  phaser.c pitch.c polyphas.c rabbit.c rate.c repeat.c resample.c \
-	  reverb.c reverse.c silence.c speed.c speedr.c stat.c \
+	  reverb.c reverse.c silence.c speed.c stat.c \
 	  stretch.c swap.c synth.c tone.c trim.c vibro.c vol.c
 
 libst_a_SOURCES = $(formats) $(effects) alsa.c oss.c sunaudio.c handlers.c misc.c \
@@ -455,7 +453,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndrtool.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sox.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/speed.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/speedr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sphere.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stio.Po@am__quote@
--- a/src/libgsm/Makefile.in
+++ b/src/libgsm/Makefile.in
@@ -117,7 +117,6 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LUA = @LUA@
-LUAC = @LUAC@
 LUA_INCLUDES = @LUA_INCLUDES@
 LUA_LIBS = @LUA_LIBS@
 MAKEINFO = @MAKEINFO@