X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=configure.in;h=bec8aa17e37f603c32f0f5bafdea0168aa9c4f4f;hp=638471f9c1f86ed6326e7e11298fd22cd70a0f17;hb=3a8e90ae8b50ac5230ccbb79c060bcdea8447222;hpb=95fbd8559c7022491a117be76407354db84846a5 diff --git a/configure.in b/configure.in index 638471f..bec8aa1 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,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=2004-11-03-1856 +VERSION=2004-11-23-2234 # ------------------------------------------------------------------ @@ -106,7 +106,17 @@ fi AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, ) dnl Checks for system services - AC_EXEEXT +OBJEXT="o" +AREXT=".a" + +AC_EXEEXT + +if test "x$EXEEXT" = "x.exe";then + OBJEXT="obj" + AREXT=".lib" +fi +AC_SUBST(OBJEXT) +AC_SUBST(AREXT) RFX_CHECK_MING @@ -143,6 +153,10 @@ if test "$prefix" != "NONE" -a "$prefix" != "/usr/local" -a "$prefix" != "/usr/l # TODO- test whether gcc still works after this fi +#Mac OS: +#LDFLAGS "-L/sw/lib" ; CPPFLAGS "-I/sw/include -I/sw/include/lame" + + # this must be done after (I believe) AC_PROG_MAKE_SET if test "x$DEBUG" '!=' "x";then STRIP="@echo debug enabled, not stripping " @@ -212,7 +226,7 @@ if test "x${DISABLE_LAME}" = "xtrue"; then 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_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_makefile="lib/lame/Makefile" CPPFLAGS="$CPPFLAGS -Ilame" AC_DEFINE_UNQUOTED(HAVE_LAME, 1)