renamed log() method to remove compiler warning

[swftools.git] / configure.in

diff --git a/configure.in b/configure.in
index 0033be0..47fac70 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl AC_INIT(src/) # old autoconf
-AC_INIT
-AC_CONFIG_SRCDIR([src/])
+dnl old autoconf
+AC_INIT(src/)
+
+dnl new autoconf
+dnl AC_INIT
+dnl AC_CONFIG_SRCDIR([src/])
 
 AC_ARG_ENABLE(checkmem,
 [  --enable-checkmem       turn on ccmalloc debugging], CHECKMEM=true)
@@ -18,7 +21,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-02-13-2131
+VERSION=2006-12-02-1537
 
 
 # ------------------------------------------------------------------
@@ -41,8 +44,8 @@ if test "x$PROFILING" '!=' "x";then
 fi
 if test "x$DEBUG" '!=' "x";then
     if test "x$PROFILING" = "x";then
-        CFLAGS="$WARNINGS -O2 -g $CFLAGS"
-        CXXFLAGS="$WARNINGS -O2 -g $CXXFLAGS"
+        CFLAGS="$WARNINGS -O2 -g -D_FORTIFY_SOURCE=2 $CFLAGS"
+        CXXFLAGS="$WARNINGS -O2 -g -D_FORTIFY_SOURCE=2 $CXXFLAGS"
     else
         CFLAGS="$WARNINGS -O2 -g -pg $CFLAGS"
         CXXFLAGS="$WARNINGS -O2 -g -pg $CXXFLAGS"
@@ -91,6 +94,22 @@ AC_SUBST(SHARED)
 dnl Checks for programs.
  AC_PROG_CC
  AC_PROG_CXX
+
+
+RFX_CHECK_OLDGCC
+
+if test "x$GCC_IS_OK" '=' "x";then
+    echo "***************************************************"
+    echo "* Your gcc is too old to compile this!"
+    echo "* "
+    echo "* The last version compilable by this compiler is "
+    echo "* swftools 0.7.0, which you can download from "
+    echo "* http://www.swftools.org/swftools-0.7.0.tar.gz "
+    echo "* ."
+    echo "* Newer versions require at least gcc 3.0.0 "
+    echo "***************************************************"
+    exit 1
+fi
     
 if test "x$CHECKMEM" '!=' "x";then
     CC="ccmalloc $CC"
@@ -107,18 +126,19 @@ fi
  AC_PROG_MAKE_SET
  AC_PROG_INSTALL
  AC_PROG_LN_S
- AC_PROG_LIBTOOL
  AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, )
 
 dnl Checks for system services
 OBJEXT="o"
 AREXT=".a"
+CXXLIBS="-lstdc++"
 
 AC_EXEEXT
 
 if test "x$EXEEXT" = "x.exe";then
     OBJEXT="obj"
     AREXT=".lib"
+    CXXLIBS=""
 fi
 AC_SUBST(OBJEXT)
 AC_SUBST(AREXT)
@@ -132,9 +152,11 @@ if test "x${MINGW}" != "xyes"; then
 else
     # mingW
     SLEXT="dll"
+    CXXLIBS=""
 fi
 export SLEXT
 AC_SUBST(SLEXT)
+AC_SUBST(CXXLIBS)
 
 # The following tries to make use of includes and libraries in
 # /usr/local, too. Notice: A -I/usr/local/include might break
@@ -221,7 +243,7 @@ dnl Checks for library functions.
 
 RFX_CHECK_FREETYPE
 
-RFX_CHECK_FONTCONFIG
+#RFX_CHECK_FONTCONFIG
 
 # ------------------------------------------------------------------
  
@@ -361,13 +383,20 @@ if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
  avi2swf=
 fi
 
-pdf2swf_makefile="pdf2swf/Makefile pdf2swf/xpdf/Makefile"
+pdf2swf_makefile="lib/pdf/Makefile"
+PDF2SWF='pdf2swf$(E)'
+LIBPDF='libpdf$(A)'
+
 if test "x${DISABLEPDF2SWF}" = "xtrue"; then
   echo "* Disabling pdf2swf tool..."
-  rm -f pdf2swf/Makefile
-  echo all install uninstall clean: > pdf2swf/Makefile
+  rm -f lib/pdf/Makefile
+  echo all install uninstall clean: > lib/pdf/Makefile
   pdf2swf_makefile=""
+  PDF2SWF=
+  LIBPDF=
 fi
+AC_SUBST(PDF2SWF)
+AC_SUBST(LIBPDF)
 
 if test "x${ZLIBMISSING}" = "xtrue"; then
   echo
@@ -409,11 +438,14 @@ fi
 # ------------------------------------------------------------------
 
 if test -f "release.in"; then release_in="./release"; fi
-FILES="$release_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile"
+FILES="$release_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile pdf2swf/fonts/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile"
+
+dnl old autoconf
+AC_OUTPUT(${FILES})
 
-dnl AC_OUTPUT(${FILES}) old autoconf
-AC_CONFIG_FILES([${FILES}])
-AC_OUTPUT
+dnl new autoconf
+dnl AC_CONFIG_FILES([${FILES}])
+dnl AC_OUTPUT
 
 #
 # On development trees, create snapshots of config.status