X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=configure.in;h=0f8e79991ba0e7f5b4f623b8030a5a1fee0b13a0;hp=a0539994725b1bfb585887ef4836bb777a52f0b6;hb=5a16f12063d78a79d6ec5d6defb0d68f2829f8e8;hpb=00c55e1f9377b7cc1f6a7a029fe3251848e8557a

diff --git a/configure.in b/configure.in
index a053999..0f8e799 100644
--- a/configure.in
+++ b/configure.in
@@ -2,9 +2,9 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/)
 
 PACKAGE=swftools
-VERSION=0.2.2
-CFLAGS="-O2 -fomit-frame-pointer"
-CXXFLAGS="-O2 -fomit-frame-pointer"
+VERSION=0.4.0
+CFLAGS="-Winline -Wparentheses -Wimplicit -Wreturn-type -O2 -fomit-frame-pointer"
+CXXFLAGS="-Winline -Wparentheses -Wimplicit -Wreturn-type -O2 -fomit-frame-pointer"
 export PACKAGE VERSION CFLAGS CXXFLAGS
 
 dnl Checks for programs.
@@ -15,6 +15,7 @@ dnl Checks for programs.
  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
@@ -29,6 +30,7 @@ dnl Checks for libraries.
  echo "Error: The zlib compression library is required."
  DISABLEPDF2SWF=true; 
  MISSINGLIBS="${MISSINGLIBS} zlib"
+ exit;
  )
  AC_CHECK_LIB(jpeg, jpeg_write_raw_data,, 
  DISABLEPDF2SWF=true;
@@ -40,9 +42,9 @@ dnl Checks for libraries.
  MISSINGLIBS="${MISSINGLIBS} T1lib"
  )
 
-SWF_CHECK_BYTEORDER
+RFX_CHECK_BYTEORDER
 AC_SUBST(WORDS_BIGENDIAN)
-SWF_CHECK_SYSTEM_BACKTICKS
+RFX_CHECK_SYSTEM_BACKTICKS
 AC_SUBST(SYSTEM_BACKTICKS)
 
 AC_ARG_PROGRAM
@@ -57,7 +59,7 @@ dnl AC_PATH_X
 dnl AC_PATH_XTRA
  AC_HEADER_DIRENT
  AC_HEADER_STDC
- AC_CHECK_HEADERS(math.h fcntl.h limits.h malloc.h unistd.h memory.h zlib.h jpeglib.h t1lib.h sys/stat.h sys/types.h)
+ AC_CHECK_HEADERS(zlib.h jpeglib.h t1lib.h sys/stat.h sys/types.h dirent.h sys/bsdtypes.h sys/ndir.h sys/dir.h ndir.h)
 
 if test "x${ac_cv_header_jpeglib_h}" != "xyes"; then
  DISABLEPDF2SWF=true;
@@ -88,6 +90,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
  AC_TYPE_SIZE_T
  AC_STRUCT_TM
  AC_CHECK_TYPE(boolean,int)
+ 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)
@@ -95,10 +98,18 @@ dnl Checks for typedefs, structures, and compiler characteristics.
  dnl AC_CHECK_TYPE(uint,unsigned long int)
 
 dnl Checks for library functions.
- AC_FUNC_MEMCMP
- AC_FUNC_MMAP
- AC_FUNC_VPRINTF
- AC_CHECK_FUNCS(getcwd putenv socket strcspn strdup strerror strstr lrand48 rand srand48 srand)
+ AC_CHECK_FUNCS(popen mkstemp stat lrand48 rand srand48 srand)
+ RFX_CHECK_AVI2SWF
+
+avi2swf="avi2swf/Makefile"
+if test "x${AVIFILE}" != "xtrue"; then
+ echo "* Couldn't compile the avifile test program."
+ echo "* Disabling avi2swf tool..."
+ echo all: > avi2swf/Makefile
+ echo install: >> avi2swf/Makefile
+ echo clean: >> avi2swf/Makefile
+ avi2swf=
+fi
 
 if test "x${UNCOMPRESS}" = "xgzip"; then
     AC_DEFINE_UNQUOTED(USE_GZIP, 1)
@@ -121,9 +132,9 @@ if test "x${DISABLEPDF2SWF}" = "xtrue"; then
     export JPEG2SWF
   fi
   echo "***************************************************"
-  FILES="./release Makefile lib/bladeenc/Makefile lib/Makefile src/Makefile swfs/Makefile"
+  FILES="./release ${avi2swf} Makefile lib/lame/Makefile lib/Makefile src/Makefile swfs/Makefile"
 else
-  FILES="./release Makefile lib/bladeenc/Makefile lib/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/ttf2pt1/Makefile pdf2swf/fonts/Makefile swfs/Makefile"
+  FILES="./release ${avi2swf} Makefile lib/lame/Makefile lib/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/ttf2pt1/Makefile pdf2swf/fonts/Makefile swfs/Makefile"
 fi
 AC_SUBST(JPEG2SWF)