X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=configure.in;h=393126bde1877710e3479bbf43d07308ff81ad33;hp=444e533b8462c2baabf07eb304aef8dae76f4601;hb=26af26a251a58f33b295a0ae36ebd27ec167dc88;hpb=5c5bdb50a110c125e97152a78782bc268b19d8d7

diff --git a/configure.in b/configure.in
index 444e533..393126b 100644
--- a/configure.in
+++ b/configure.in
@@ -5,9 +5,16 @@ AC_ARG_ENABLE(checkmem,
 [  --enable-checkmem       turn on ccmalloc debugging], CHECKMEM=true)
 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)
 
 PACKAGE=swftools
-VERSION=0.4.4-pre11
+VERSION=2003-08-02-1416
+
+
+
 # -Winline?
 
 if test "x$CHECKMEM" '!=' "x";then
@@ -16,12 +23,16 @@ fi
 if test "x$DEBUG" '!=' "x";then
     CFLAGS="-Wparentheses -Wimplicit -Wreturn-type -g $CFLAGS"
     CXXFLAGS="-Wparentheses -Wimplicit -Wreturn-type -g $CXXFLAGS"
-    STRIP="echo debug enabled, not stripping "
+    STRIP="@echo debug enabled, not stripping "
     export STRIP
     AC_SUBST(STRIP)
-else
-    CFLAGS="-Wparentheses -Wimplicit -Wreturn-type -O -fomit-frame-pointer $CFLAGS"
-    CXXFLAGS="-Wparentheses -Wimplicit -Wreturn-type -O -fomit-frame-pointer $CXXFLAGS"
+else if test "x$OPTIMIZE" '!=' "x"; then
+	CFLAGS="-Wparentheses -Wimplicit -Wreturn-type -Winline -O3 -fomit-frame-pointer $CFLAGS"
+	CXXFLAGS="-Wparentheses -Wimplicit -Wreturn-type -Winline -O3 -fomit-frame-pointer $CXXFLAGS"
+     else
+	CFLAGS="-Wparentheses -Wimplicit -Wreturn-type -O -fomit-frame-pointer $CFLAGS"
+	CXXFLAGS="-Wparentheses -Wimplicit -Wreturn-type -O -fomit-frame-pointer $CXXFLAGS"
+     fi
 fi
 
 export PACKAGE VERSION CFLAGS CXXFLAGS
@@ -57,6 +68,7 @@ fi
  AC_PROG_LN_S
  AC_PROG_LIBTOOL
  AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, )
+ AC_CHECK_PROGS(FREETYPE_CONFIG, freetype-config, )
 
 dnl Checks for system services
  AC_EXEEXT
@@ -107,6 +119,9 @@ dnl Checks for libraries.
  DISABLEPDF2SWF=true;
  MISSINGLIBS="${MISSINGLIBS} t1lib"
  )
+ AC_CHECK_LIB(freetype, FT_Init_FreeType,
+ USE_FREETYPE=true,
+ )
 
 RFX_CHECK_BYTEORDER
 AC_SUBST(WORDS_BIGENDIAN)
@@ -119,7 +134,7 @@ dnl Checks for header files.
  AC_CONFIG_HEADER(config.h)
  AC_HEADER_DIRENT
  AC_HEADER_STDC
- AC_CHECK_HEADERS(zlib.h jpeglib.h t1lib.h sys/stat.h sys/types.h dirent.h sys/bsdtypes.h sys/ndir.h sys/dir.h ndir.h)
+ AC_CHECK_HEADERS(zlib.h jpeglib.h t1lib.h assert.h signal.h pthread.h sys/stat.h sys/types.h dirent.h sys/bsdtypes.h sys/ndir.h sys/dir.h ndir.h)
 
 if test "x${ac_cv_header_jpeglib_h}" != "xyes"; then
  DISABLEPDF2SWF=true;
@@ -136,6 +151,9 @@ 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)
@@ -170,14 +188,38 @@ if test "x${AVIFILE}" != "xtrue"; then
  avi2swf=
 fi
 
+if test "x${NO_MP3}" == "x"; then
+    AC_DEFINE_UNQUOTED(USE_MP3, 1)
+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 
+
 if test "x${UNCOMPRESS}" = "xgzip"; then
     AC_DEFINE_UNQUOTED(USE_GZIP, 1)
 fi
 AC_SUBST(USE_GZIP)
 
-JPEG2SWF='jpeg2swf' #$(EXEEXT)
+JPEG2SWF='jpeg2swf$(E)'
 export JPEG2SWF
-PNG2SWF='png2swf' #$(EXEEXT)
+PNG2SWF='png2swf$(E)'
 export PNG2SWF
 if test "x${DISABLEPDF2SWF}" = "xtrue"; then
   echo "***************************************************"