X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure.in;h=99ab70e3edd3fd6f8b216e260afa11bd4669d2c0;hb=3bbf311f8f04b6ee366c4d3732150e669365cba5;hp=ffa2b3b11188a85bc3188bbe1fcad8aaf8246c65;hpb=8ddaab4d47fd49157648993fce716da20cd83e98;p=swftools.git

diff --git a/configure.in b/configure.in
index ffa2b3b..99ab70e 100644
--- a/configure.in
+++ b/configure.in
@@ -5,9 +5,17 @@ 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.5.0-pre8
+VERSION=2004-02-01-1614
+
+
+
+
 # -Winline?
 
 if test "x$CHECKMEM" '!=' "x";then
@@ -19,10 +27,21 @@ if test "x$DEBUG" '!=' "x";then
     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
+#OLDGCC=1
+#if test "x$OLDGCC" '!=' "x";then
+#     #CFLAGS="$CFLAGS --std=c89 -ansi -pendantic"
+#     #CXXFLAGS="$CXXFLAGS --std=c89 -ansi -pendantic"
+#     CFLAGS="$CFLAGS -ansi -pendantic"
+#     CXXFLAGS="$CXXFLAGS -ansi -pendantic"
+#fi
 
 export PACKAGE VERSION CFLAGS CXXFLAGS
 
@@ -57,11 +76,7 @@ fi
  AC_PROG_LN_S
  AC_PROG_LIBTOOL
  AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, )
- AC_CHECK_PROGS(FREETYPE_CONFIG, freetype-config, )
-
-if test "x$FREETYPE_CONFIG" != "x";then
-    USE_FREETYPE=yes
-fi
+ AC_CHECK_PROGS(FREETYPE_CONFIG, freetype-config, ) # TODO: use this
 
 dnl Checks for system services
  AC_EXEEXT
@@ -144,7 +159,9 @@ if test "x${ac_cv_header_zlib_h}" != "xyes"; then
  ZLIBMISSING=true;
 fi
 
-AC_DEFINE_UNQUOTED(USE_FREETYPE, "$USE_FREETYPE")
+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)
@@ -168,7 +185,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
  dnl AC_CHECK_TYPE(uint,unsigned long int)
 
 dnl Checks for library functions.
- AC_CHECK_FUNCS(popen mkstemp stat lrand48 rand srand48 srand)
+ AC_CHECK_FUNCS(popen mkstemp stat lrand48 rand srand48 srand bcopy bzero)
  RFX_CHECK_AVI2SWF
 
 avi2swf="avi2swf/Makefile"
@@ -179,6 +196,10 @@ 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`
@@ -204,9 +225,9 @@ if test "x${UNCOMPRESS}" = "xgzip"; then
 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 "***************************************************"