X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=configure.in;h=fcff54956ba6cb8e01f754550a48344a08f9409f;hp=f6557d61a41345be86873e466ee5293c9d0b1cd2;hb=919883167e14fe359febf63ce0bba74fed5c0aac;hpb=2ab6d9f372802bba3affe06111e50d74440f8abf

diff --git a/configure.in b/configure.in
index f6557d6..fcff549 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=2006-10-28-2033
+VERSION=2008-06-08-1156
 
 
 # ------------------------------------------------------------------
@@ -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
@@ -44,8 +44,9 @@ if test "x$PROFILING" '!=' "x";then
 fi
 if test "x$DEBUG" '!=' "x";then
     if test "x$PROFILING" = "x";then
-        CFLAGS="$WARNINGS -O2 -g -D_FORTIFY_SOURCE=2 $CFLAGS"
-        CXXFLAGS="$WARNINGS -O2 -g -D_FORTIFY_SOURCE=2 $CXXFLAGS"
+        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"
@@ -126,7 +131,6 @@ 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
@@ -149,7 +153,7 @@ RFX_CHECK_MING
 SLEXT="so"
 if test "x${MINGW}" != "xyes"; then
     # no mingW
-    AC_DEFINE_UNQUOTED(O_BINARY, 0)
+    AC_DEFINE([O_BINARY], [0], [Not defined on mingw])
 else
     # mingW
     SLEXT="dll"
@@ -186,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)
@@ -198,9 +202,21 @@ 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(ungif, DGifOpen,, UNGIFMISSING=true)
+if test "$UNGIFMISSING";then
+    UNGIFMISSING=
+    AC_CHECK_LIB(gif, DGifOpen,, UNGIFMISSING=true)
+fi
 
 RFX_CHECK_BYTEORDER
 AC_SUBST(WORDS_BIGENDIAN)
@@ -213,10 +229,10 @@ dnl Checks for header files.
  AC_CONFIG_HEADER(config.h)
  AC_HEADER_DIRENT
  AC_HEADER_STDC
- AC_CHECK_HEADERS(zlib.h gif_lib.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)
+ AC_CHECK_HEADERS(zlib.h gif_lib.h io.h wchar.h jpeglib.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 sys/time.h sys/resource.h)
 
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 
@@ -230,24 +246,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)
+ AC_CHECK_FUNCS(popen wcschr wcsdup mkstemp stat lrand48 rand srand48 srand bcopy bzero time getrusage mallinfo)
 
-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
@@ -258,7 +269,7 @@ else
 	lame_objects="lame/psymodel.\$(O) lame/fft.\$(O) lame/newmdct.\$(O) lame/quantize.\$(O) lame/takehiro.\$(O) lame/reservoir.\$(O) lame/quantize_pvt.\$(O) lame/vbrquantize.\$(O) lame/encoder.\$(O) lame/id3tag.\$(O) lame/version.\$(O) lame/tables.\$(O) lame/util.\$(O) lame/bitstream.\$(O) lame/set_get.\$(O) lame/VbrTag.\$(O) lame/lame.\$(O)"
 	lame_makefile="lib/lame/Makefile"
 	CPPFLAGS="$CPPFLAGS -Ilame"
-	AC_DEFINE_UNQUOTED(HAVE_LAME, 1)
+	AC_DEFINE([HAVE_LAME], [1], [have/use internal l.a.m.e. mp3 library])
     else
 	if test -d /usr/include/lame; then
 	    CPPFLAGS="$CPPFLAGS -I /usr/include/lame"
@@ -270,7 +281,7 @@ else
 	AC_CHECK_LIB(mp3lame, lame_init,, NO_LIBMP3LAME=1)
 	AC_CHECK_HEADERS(lame.h)
 	if test "x$NO_LIBMP3LAME" "!=" "x1" -a "x$ac_cv_header_lame_h" "!=" "x";then
-	    AC_DEFINE_UNQUOTED(HAVE_LAME, 1)
+	    AC_DEFINE([HAVE_LAME], [1])
 	fi
     fi
 fi
@@ -282,7 +293,7 @@ RFX_CHECK_AVI2SWF
 if test "x${AVIFILE}" = "xtrue"; then
     VIDEO_LIBS="$VIDEO_LIBS $AVIFILE_LIBS"
     VIDEO_CFLAGS="$VIDEO_CFLAGS $AVIFILE_CFLAGS"
-    AC_DEFINE_UNQUOTED(HAVE_AVIFILE, 1)
+    AC_DEFINE([HAVE_AVIFILE], [1], [Define if avifile is present])
 fi
 
 if test "x${WIN32}" != "x"; then
@@ -299,7 +310,7 @@ AC_SUBST(VIDEO_CFLAGS)
 # ------------------------------------------------------------------
 
 if test "x${UNCOMPRESS}" = "xgzip"; then
-    AC_DEFINE_UNQUOTED(USE_GZIP, 1)
+    AC_DEFINE([USE_GZIP], [1], [Define if gzip is present])
 fi
 AC_SUBST(USE_GZIP)
 
@@ -330,9 +341,9 @@ if test "x$JPEGLIBMISSING" = "xtrue";then
     DISABLEJPEG2SWF=true
     PARTIAL=true
 fi
-if test "x$T1LIBMISSING" = "xtrue";then
-    MISSINGLIBS="${MISSINGLIBS} t1lib"
-fi
+#if test "x$T1LIBMISSING" = "xtrue";then
+#    MISSINGLIBS="${MISSINGLIBS} t1lib"
+#fi
 if test "x$UNGIFMISSING" = "xtrue";then
     DISABLEGIF2SWF=true
     MISSINGLIBS="${MISSINGLIBS} ungif"
@@ -350,9 +361,9 @@ if test "x$HAVE_FREETYPE" '!=' "x1"; then
     MISSINGLIBS="${MISSINGLIBS} freetype"
     PARTIAL=true
 fi
-if test "x${ac_cv_header_t1lib_h}" '!=' "xyes"; then
-    MISSINGLIBS="${MISSINGLIBS} t1lib.h"
-fi
+#if test "x${ac_cv_header_t1lib_h}" '!=' "xyes"; then
+#    MISSINGLIBS="${MISSINGLIBS} t1lib.h"
+#fi
 if test "x${ac_cv_header_gif_lib_h}" '!=' "xyes"; then
     DISABLEGIF2SWF=true
     MISSINGLIBS="${MISSINGLIBS} gif_lib.h"
@@ -363,10 +374,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})
 
@@ -379,19 +389,20 @@ 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=
@@ -438,10 +449,36 @@ 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"
+AH_TOP([
+#ifndef __config_h__
+#define __config_h__
+])
 
-dnl old autoconf
+AH_BOTTOM([
+#ifdef HAVE_ZLIB_H
+#ifdef HAVE_LIBZ
+#define HAVE_ZLIB
+#endif
+#endif
+
+#ifdef HAVE_JPEGLIB_H
+#ifdef HAVE_LIBJPEG
+#define HAVE_JPEGLIB
+#endif
+#endif
+
+#ifdef HAVE_FT2BUILD_H
+#define HAVE_FREETYPE_H 1
+#endif
+
+#endif // __config_h__
+])
+
+
+
+if test -f "release.in"; then release_in="./release"; fi
+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/readers/Makefile"
 AC_OUTPUT(${FILES})
 
 dnl new autoconf