X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=configure.in;h=7649af8680bae35847717c2eb4da08394dabf8e3;hp=85ad02f9bb0df78837a0b3c00b293968f28d0521;hb=fb6606b60aa1bb2fe119fae5f5508a76a1b6d4e2;hpb=dd195e15ca8bd13a7cce5500bd9a7d2b8c21c8aa

diff --git a/configure.in b/configure.in
index 85ad02f..7649af8 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_INIT(src/)
 AC_ARG_PROGRAM
 
 export PACKAGE=swftools
-export VERSION=0.0.2
+export VERSION=pre0.1.0
 
 export CFLAGS="-O2 -fomit-frame-pointer"
 export CXXFLAGS="-O2 -fomit-frame-pointer"
@@ -26,11 +26,10 @@ dnl Checks for libraries.
  echo "Error: Math library not found.";
  exit;
  )
- AC_CHECK_LIB(z, crc32,, 
+ AC_CHECK_LIB(z, deflate,, 
  echo "Error: The zlib compression library is required."
  DISABLEPDF2SWF=true; 
  MISSINGLIBS="${MISSINGLIBS} zlib"
- exit;
  )
  AC_CHECK_LIB(jpeg, jpeg_write_raw_data,, 
  DISABLEPDF2SWF=true;
@@ -43,8 +42,8 @@ dnl Checks for libraries.
  )
 
 dnl do we need those?
- AC_CHECK_LIB(pthread, pthread_create)
- AC_CHECK_LIB(X11, XFlush)
+dnl AC_CHECK_LIB(pthread, pthread_create)
+dnl AC_CHECK_LIB(X11, XFlush)
 
 dnl Checks for header files.
  AC_CONFIG_HEADER(config.h)
@@ -52,7 +51,7 @@ dnl Checks for header files.
 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)
+ 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)
 
 if test "x${ac_cv_header_jpeglib_h}" != "xyes"; then
  DISABLEPDF2SWF=true;
@@ -63,6 +62,10 @@ if test "x${ac_cv_header_t1lib_h}" != "xyes"; then
  DISABLEPDF2SWF=true;
  MISSINGLIBS="${MISSINGLIBS} t1lib.h"
 fi
+if test "x${ac_cv_header_zlib_h}" != "xyes"; then
+ DISABLEPDF2SWF=true;
+ MISSINGLIBS="${MISSINGLIBS} zlib.h"
+fi
 
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
@@ -90,20 +93,23 @@ dnl Checks for library functions.
  AC_FUNC_VPRINTF
  AC_CHECK_FUNCS(getcwd putenv socket strcspn strdup strerror strstr)
 
+export JPEG2SWF='jpeg2swf$(EXEEXT)'
 if test "x${DISABLEPDF2SWF}" = "xtrue"; then
   echo "***************************************************"
   echo "The following headers/libraries are missing: " ${MISSINGLIBS}
   echo "Disabling pdf2swf tool..."
-  rm pdf2swf/Makefile
+  rm -f pdf2swf/Makefile
   echo all: > pdf2swf/Makefile
+  echo install: >> pdf2swf/Makefile
   if test "x${DISABLEJPEG2SWF}" = "xtrue"; then
     echo "Disabling jpeg2swf tool..."
-    dnl FIXME: Do something here
+    export JPEG2SWF=
   fi
   echo "***************************************************"
   FILES="./release Makefile lib/Makefile src/Makefile"
 else
   FILES="./release Makefile lib/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/fonts/Makefile"
 fi
+AC_SUBST(JPEG2SWF)
 
 AC_OUTPUT(${FILES})