X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=configure.in;h=64c7dfbc092760b6e57649fabce4ec26ab131359;hp=1fab7a4836fff5eaf07317a8fdb1c06dd702bb1c;hb=4cc575e3000d7deda913996aaa42199635979a8e;hpb=5430c970ee5ad5b5d648c597f22cb9a343fb0035

diff --git a/configure.in b/configure.in
index 1fab7a4..64c7dfb 100644
--- a/configure.in
+++ b/configure.in
@@ -21,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=2005-09-25-1334
+VERSION=2007-02-06-1213
 
 
 # ------------------------------------------------------------------
@@ -33,7 +33,7 @@ fi
 
 WARNINGS="-Wparentheses -Wimplicit -Wreturn-type"
 if test "x$ENABLE_WARNINGS" '!=' "x";then
-    WARNINGS="-Wall -Wno-unused -Wno-format -Wno-redundant-decls"
+    WARNINGS="-Wall -Wno-unused -Wno-format -Wno-redundant-decls -D_FORTIFY_SOURCE=2 "
 fi
 
 if test "x$CHECKMEM" '!=' "x";then
@@ -46,6 +46,7 @@ if test "x$DEBUG" '!=' "x";then
     if test "x$PROFILING" = "x";then
         CFLAGS="$WARNINGS -O2 -g $CFLAGS"
         CXXFLAGS="$WARNINGS -O2 -g $CXXFLAGS"
+        LDFLAGS="-g $LIBS"
     else
         CFLAGS="$WARNINGS -O2 -g -pg $CFLAGS"
         CXXFLAGS="$WARNINGS -O2 -g -pg $CXXFLAGS"
@@ -59,6 +60,10 @@ else
     CXXFLAGS="$WARNINGS -O -fomit-frame-pointer $CXXFLAGS"
 fi
 fi
+
+CFLAGS="-fPIC $CFLAGS"
+CXXFLAGS="-fPIC $CFLAGS"
+
 #OLDGCC=1
 #if test "x$OLDGCC" '!=' "x";then
 #     #CFLAGS="$CFLAGS --std=c89 -ansi -pendantic"
@@ -94,6 +99,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"
@@ -110,18 +131,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)
@@ -135,9 +157,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
@@ -166,7 +190,7 @@ fi
 
 
 # this must be done after (I believe) AC_PROG_MAKE_SET
-if test "x$DEBUG" '!=' "x";then
+if test "x$DEBUG" '!=' "x" -o "x$STRIP" = "x";then
     STRIP="@echo debug enabled, not stripping "
     export STRIP
     AC_SUBST(STRIP)
@@ -178,9 +202,22 @@ dnl Checks for libraries.
  exit;
  )
  AC_CHECK_LIB(z, deflate,, ZLIBMISSING=true)
- AC_CHECK_LIB(jpeg, jpeg_write_raw_data,, JPEGLIBMISSING=true)
- AC_CHECK_LIB(t1, T1_LoadFont,, T1LIBMISSING=true)
- AC_CHECK_LIB(ungif, DGifOpen,, UNGIFMISSING=true)
+
+if test "x$ZLIBMISSING" = "xtrue";then
+    echo 
+    echo "ERROR:"
+    echo "You need zlib to compile swftools"
+    echo
+    exit
+fi
+ 
+AC_CHECK_LIB(jpeg, jpeg_write_raw_data,, JPEGLIBMISSING=true)
+AC_CHECK_LIB(t1, T1_LoadFont,, T1LIBMISSING=true)
+AC_CHECK_LIB(ungif, DGifOpen,, UNGIFMISSING=true)
+if test "$UNGIFMISSING";then
+    UNGIFMISSING=
+    AC_CHECK_LIB(gif, DGifOpen,, UNGIFMISSING=true)
+fi
 
 RFX_CHECK_BYTEORDER
 AC_SUBST(WORDS_BIGENDIAN)
@@ -210,24 +247,19 @@ dnl Checks for typedefs, structures, and compiler characteristics.
  AC_TYPE_SIZE_T
  AC_STRUCT_TM
  AC_CHECK_TYPE(boolean,int) #needed for jpeglib
- dnl AC_CHECK_TYPE(bool,char)
- dnl AC_CHECK_TYPE(uchar,unsigned char)
- dnl AC_CHECK_TYPE(schar,signed char)
- dnl AC_CHECK_TYPE(word,unsigned short int)
- dnl AC_CHECK_TYPE(sword,unsigned short int)
- dnl AC_CHECK_TYPE(uint,unsigned long int)
-
-dnl Checks for library functions.
  AC_CHECK_FUNCS(popen mkstemp stat lrand48 rand srand48 srand bcopy bzero time)
 
-# ------------------------------------------------------------------
+AC_CHECK_SIZEOF([signed])
+AC_CHECK_SIZEOF([unsigned])
+AC_CHECK_SIZEOF([signed long])
+AC_CHECK_SIZEOF([unsigned long])
+AC_CHECK_SIZEOF([signed long long])
+AC_CHECK_SIZEOF([unsigned long long])
 
 RFX_CHECK_FREETYPE
 
-RFX_CHECK_FONTCONFIG
+#RFX_CHECK_FONTCONFIG
 
-# ------------------------------------------------------------------
- 
 lame_objects= 
 lame_makefile=
 if test "x${DISABLE_LAME}" = "xtrue"; then
@@ -343,10 +375,9 @@ if test "x${ac_cv_header_zlib_h}" '!=' "xyes"; then
     MISSINGLIBS="${MISSINGLIBS} zlib.h"
     PARTIAL=true
 fi
-if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
-    MISSINGLIBS="${MISSINGLIBS} avifile"
-    PARTIAL=true
-fi
+#if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
+#    MISSINGLIBS="${MISSINGLIBS} avifile"
+#fi
 
 AC_MSG_RESULT(${MISSINGLIBS})
 
@@ -359,18 +390,26 @@ fi
 
 avi2swf="avi2swf/Makefile"
 if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
- echo "* Disabling avi2swf tool..."
+ #don't whine, avi2swf is outdated anyway
+ #echo "* Disabling avi2swf tool..."
  echo all install uninstall clean: > avi2swf/Makefile
  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
@@ -412,9 +451,8 @@ 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"
-
-dnl old autoconf
+if test -f "wx/Makefile.in"; then wx_in="wx/Makefile"; fi
+FILES="$release_in $wx_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 lib/swf/Makefile"
 AC_OUTPUT(${FILES})
 
 dnl new autoconf