X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=configure.in;h=20dd0aaa3f084fcee39da3719d6e7f14984a3d40;hp=2377fe5368ce8d4c424905cb5e6babddc173f258;hb=2689b541f1a0f9a767ac8fe55909183d2c9a7347;hpb=39c89e54a79dfc3fb950bf87b8998f824d75677b

diff --git a/configure.in b/configure.in
index 2377fe5..20dd0aa 100644
--- a/configure.in
+++ b/configure.in
@@ -7,11 +7,11 @@ AC_ARG_ENABLE(debug,
 [  --enable-debug          turn on debugging], DEBUG=true)
 AC_ARG_ENABLE(optimizations,
 [  --enable-optimizations  turn on compiler optimizations (recommended for avi2swf)], OPTIMIZE=true)
-AC_ARG_ENABLE(mp3,
-[  --disable-mp3           don't compile any mp3 code in], NO_MP3=true)
+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-02-01-1614
+VERSION=0.5.0_pre1
 
 
 
@@ -76,7 +76,6 @@ fi
  AC_PROG_LN_S
  AC_PROG_LIBTOOL
  AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, )
- AC_CHECK_PROGS(FREETYPE_CONFIG, freetype-config, ) # TODO: use this
 
 dnl Checks for system services
  AC_EXEEXT
@@ -127,9 +126,8 @@ dnl Checks for libraries.
  DISABLEPDF2SWF=true;
  MISSINGLIBS="${MISSINGLIBS} t1lib"
  )
- AC_CHECK_LIB(freetype, FT_Init_FreeType,
- USE_FREETYPE=true,
- )
+
+RFX_CHECK_FREETYPE
 
 RFX_CHECK_BYTEORDER
 AC_SUBST(WORDS_BIGENDIAN)
@@ -159,9 +157,6 @@ if test "x${ac_cv_header_zlib_h}" != "xyes"; then
  ZLIBMISSING=true;
 fi
 
-if test "x$USE_FREETYPE" != "x"; then
-    AC_DEFINE_UNQUOTED(USE_FREETYPE, "$USE_FREETYPE")
-fi
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
@@ -196,29 +191,14 @@ if test "x${AVIFILE}" != "xtrue"; then
  avi2swf=
 fi
 
-if test "x${NO_MP3}" == "x"; then
-    AC_DEFINE_UNQUOTED(USE_MP3, 1)
+if test "x${DISABLE_LAME}" == "xtrue"; then
+    echo "*" disabling lame support...
+    lame_objects= 
+else
+    AC_DEFINE_UNQUOTED(HAVE_LAME, 1)
+    lame_objects='$(lame_objects_2)'
 fi
-
-if test "x${USE_FREETYPE}" == "xtrue"; then
-    if test "x{$FREETYPE_CONFIG}" != "x"; then
-	ftinclude=`freetype-config --cflags`
-	ftlibs=`freetype-config --libs`
-	CXXFLAGS="$CXXFLAGS $ftinclude"
-	CFLAGS="$CFLAGS $ftinclude"
-	LIBS="$LIBS $ftlibs"
-    else if test -d /usr/include/freetype2; then
-	CXXFLAGS="$CXXFLAGS -I/usr/include/freetype2"
-	CFLAGS="$CFLAGS -I/usr/include/freetype2"
-	LIBS="$LIBS -lfreetype"
-    else if test -d /usr/local/include/freetype2; then
-	CXXFLAGS="$CXXFLAGS -I/usr/local/include/freetype2"
-	CFLAGS="$CFLAGS -I/usr/local/include/freetype2"
-	LIBS="$LIBS -L /usr/local/lib -lfreetype"
-    fi
-    fi
-    fi
-fi 
+AC_SUBST(lame_objects)
 
 if test "x${UNCOMPRESS}" = "xgzip"; then
     AC_DEFINE_UNQUOTED(USE_GZIP, 1)