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

diff --git a/configure.in b/configure.in
index ffa2b3b..4673a19 100644
--- a/configure.in
+++ b/configure.in
@@ -5,24 +5,43 @@ 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(warnings,
+[  --enable-warnings	   turn on compiler warnings], ENABLE_WARNINGS=true)
+AC_ARG_ENABLE(optimizations,
+[  --enable-optimizations  turn on compiler optimizations (recommended for avi2swf)], OPTIMIZE=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=0.5.0-pre8
-# -Winline?
+VERSION=0.5.1
+
+
+WARNINGS="-Wparentheses -Wimplicit -Wreturn-type"
+if test "x$ENABLE_WARNINGS" '!=' "x";then
+    WARNINGS="-Wall -Wno-unused -Wno-format"
+fi
 
 if test "x$CHECKMEM" '!=' "x";then
     DEBUG=yes
 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 "
-    export STRIP
-    AC_SUBST(STRIP)
+    CFLAGS="$WARNINGS -g $CFLAGS"
+    CXXFLAGS="$WARNINGS -g $CXXFLAGS"
+else if test "x$OPTIMIZE" '!=' "x"; then
+    CFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CFLAGS"
+    CXXFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CXXFLAGS"
 else
-    CFLAGS="-Wparentheses -Wimplicit -Wreturn-type -O -fomit-frame-pointer $CFLAGS"
-    CXXFLAGS="-Wparentheses -Wimplicit -Wreturn-type -O -fomit-frame-pointer $CXXFLAGS"
+    CFLAGS="$WARNINGS -O -fomit-frame-pointer $CFLAGS"
+    CXXFLAGS="$WARNINGS -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
 
@@ -39,7 +58,7 @@ esac
 dnl Checks for programs.
  AC_PROG_CC
  AC_PROG_CXX
-
+    
 if test "x$CHECKMEM" '!=' "x";then
     CC="ccmalloc $CC"
     CXX="ccmalloc $CXX"
@@ -57,11 +76,6 @@ 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
 
 dnl Checks for system services
  AC_EXEEXT
@@ -93,6 +107,13 @@ if test "$prefix" != "NONE" -a "$prefix" != "/usr/local" -a "$prefix" != "/usr/l
     # TODO- test whether gcc still works after this
 fi
 
+# this must be done after (I believe) AC_PROG_MAKE_SET
+if test "x$DEBUG" '!=' "x";then
+    STRIP="@echo debug enabled, not stripping "
+    export STRIP
+    AC_SUBST(STRIP)
+fi
+
 dnl Checks for libraries.
  AC_CHECK_LIB(m, sin,, 
  echo "Error: Math library not found.";
@@ -112,9 +133,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)
@@ -127,7 +147,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 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)
+ 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 time.h)
 
 if test "x${ac_cv_header_jpeglib_h}" != "xyes"; then
  DISABLEPDF2SWF=true;
@@ -144,7 +164,6 @@ if test "x${ac_cv_header_zlib_h}" != "xyes"; then
  ZLIBMISSING=true;
 fi
 
-AC_DEFINE_UNQUOTED(USE_FREETYPE, "$USE_FREETYPE")
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
@@ -168,7 +187,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 time)
  RFX_CHECK_AVI2SWF
 
 avi2swf="avi2swf/Makefile"
@@ -179,34 +198,23 @@ if test "x${AVIFILE}" != "xtrue"; then
  avi2swf=
 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${DISABLE_LAME}" = "xtrue"; then
+    echo "*" Disabling lame support...
+    lame_objects= 
+else
+    AC_DEFINE_UNQUOTED(HAVE_LAME, 1)
+    lame_objects='$(lame_objects_2)'
+fi
+AC_SUBST(lame_objects)
 
 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 "***************************************************"
@@ -232,9 +240,9 @@ if test "x${DISABLEPDF2SWF}" = "xtrue"; then
     echo "or write compressed Flash MX files!"
   fi
   echo "***************************************************"
-  FILES="./release Makefile.common ${avi2swf} Makefile lib/lame/Makefile lib/Makefile src/Makefile swfs/Makefile"
+  FILES="./release Makefile.common ${avi2swf} Makefile lib/lame/Makefile lib/Makefile lib/action/Makefile src/Makefile swfs/Makefile"
 else
-  FILES="./release Makefile.common ${avi2swf} Makefile lib/lame/Makefile lib/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/ttf2pt1/Makefile swfs/Makefile"
+  FILES="./release Makefile.common ${avi2swf} Makefile lib/lame/Makefile lib/Makefile lib/action/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/ttf2pt1/Makefile swfs/Makefile"
 fi
 AC_SUBST(JPEG2SWF)
 AC_SUBST(PNG2SWF)