X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure.in;h=0ad3077711a9cd507f1f63c2d03a4e1e356d8c67;hb=42834fabcae7a30ff40887d334dfb871bf2cb35b;hp=fcff54956ba6cb8e01f754550a48344a08f9409f;hpb=919883167e14fe359febf63ce0bba74fed5c0aac;p=swftools.git diff --git a/configure.in b/configure.in index fcff549..0ad3077 100644 --- a/configure.in +++ b/configure.in @@ -21,7 +21,7 @@ AC_ARG_ENABLE(lame, [ --disable-lame don't compile any L.A.M.E. mp3 encoding code in], DISABLE_LAME=true) PACKAGE=swftools -VERSION=2008-06-08-1156 +VERSION=2008-06-23-2005 # ------------------------------------------------------------------ @@ -259,14 +259,14 @@ RFX_CHECK_FREETYPE RFX_CHECK_FONTCONFIG -lame_objects= +lame_in_source= lame_makefile= if test "x${DISABLE_LAME}" = "xtrue"; then echo "*" Disabling lame support... else # old lame code at lib/lame if test -f lib/lame/Makefile.in; then - lame_objects="lame/psymodel.\$(O) lame/fft.\$(O) lame/newmdct.\$(O) lame/quantize.\$(O) lame/takehiro.\$(O) lame/reservoir.\$(O) lame/quantize_pvt.\$(O) lame/vbrquantize.\$(O) lame/encoder.\$(O) lame/id3tag.\$(O) lame/version.\$(O) lame/tables.\$(O) lame/util.\$(O) lame/bitstream.\$(O) lame/set_get.\$(O) lame/VbrTag.\$(O) lame/lame.\$(O)" + lame_in_source='$(lame_objects)' lame_makefile="lib/lame/Makefile" CPPFLAGS="$CPPFLAGS -Ilame" AC_DEFINE([HAVE_LAME], [1], [have/use internal l.a.m.e. mp3 library]) @@ -285,7 +285,7 @@ else fi fi fi -AC_SUBST(lame_objects) +AC_SUBST(lame_in_source) # ------------------------------------------------------------------ @@ -477,8 +477,7 @@ AH_BOTTOM([ if test -f "release.in"; then release_in="./release"; fi -if test -f "wx/Makefile.in"; then wx_in="wx/Makefile"; fi -FILES="$release_in $wx_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile pdf2swf/fonts/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile lib/readers/Makefile" +FILES="$release_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile pdf2swf/fonts/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile lib/readers/Makefile" AC_OUTPUT(${FILES}) dnl new autoconf