X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure.in;h=d1475657eb2639244148ffe935b49fd2e83c6bbc;hb=08b056ae805baec51d028e5095f9f0f128f1e362;hp=493e35a0e4a5b2e8586cb08622ceb43bc1ef066c;hpb=75a13f6bcbefa39a9b0dea5b78ac8ff696aace5c;p=swftools.git

diff --git a/configure.in b/configure.in
index 493e35a..d147565 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/)
+
+dnl AC_INIT(src/) # old autoconf
+AC_INIT
+AC_CONFIG_SRCDIR([src/])
 
 AC_ARG_ENABLE(checkmem,
 [  --enable-checkmem       turn on ccmalloc debugging], CHECKMEM=true)
@@ -13,11 +16,13 @@ AC_ARG_ENABLE(lame,
 [  --disable-lame          don't compile any L.A.M.E. mp3 encoding code in], DISABLE_LAME=true)
 
 PACKAGE=swftools
-VERSION=0.5.0_pre1
+VERSION=2004-05-18-1254
+
+
 
 WARNINGS="-Wparentheses -Wimplicit -Wreturn-type"
 if test "x$ENABLE_WARNINGS" '!=' "x";then
-    WARNINGS="-Wall -Wno-unused -Wno-format"
+    WARNINGS="-Wall -Wno-unused -Wno-format -Wno-redundant-decls"
 fi
 
 if test "x$CHECKMEM" '!=' "x";then
@@ -26,9 +31,6 @@ fi
 if test "x$DEBUG" '!=' "x";then
     CFLAGS="$WARNINGS -g $CFLAGS"
     CXXFLAGS="$WARNINGS -g $CXXFLAGS"
-    STRIP="@echo debug enabled, not stripping "
-    export STRIP
-    AC_SUBST(STRIP)
 else if test "x$OPTIMIZE" '!=' "x"; then
     CFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CFLAGS"
     CXXFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CXXFLAGS"
@@ -60,7 +62,7 @@ esac
 dnl Checks for programs.
  AC_PROG_CC
  AC_PROG_CXX
-
+    
 if test "x$CHECKMEM" '!=' "x";then
     CC="ccmalloc $CC"
     CXX="ccmalloc $CXX"
@@ -84,9 +86,17 @@ dnl Checks for system services
 
 RFX_CHECK_MING
 
+SLEXT="so"
 if test "x${MINGW}" != "xyes"; then
+    # no mingW
     AC_DEFINE_UNQUOTED(O_BINARY, 0)
+else
+    # mingW
+    SLEXT="dll"
 fi
+export SLEXT
+AC_SUBST(SLEXT)
+
 # The following tries to make use of includes and libraries in
 # /usr/local, too. Notice: A -I/usr/local/include might break
 # things (MingW, cross-compiling etc.) in the same way as -I/usr/include, 
@@ -109,6 +119,13 @@ if test "$prefix" != "NONE" -a "$prefix" != "/usr/local" -a "$prefix" != "/usr/l
     # TODO- test whether gcc still works after this
 fi
 
+# this must be done after (I believe) AC_PROG_MAKE_SET
+if test "x$DEBUG" '!=' "x";then
+    STRIP="@echo debug enabled, not stripping "
+    export STRIP
+    AC_SUBST(STRIP)
+fi
+
 dnl Checks for libraries.
  AC_CHECK_LIB(m, sin,, 
  echo "Error: Math library not found.";
@@ -142,7 +159,7 @@ dnl Checks for header files.
  AC_CONFIG_HEADER(config.h)
  AC_HEADER_DIRENT
  AC_HEADER_STDC
- AC_CHECK_HEADERS(zlib.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)
+ AC_CHECK_HEADERS(zlib.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)
 
 if test "x${ac_cv_header_jpeglib_h}" != "xyes"; then
  DISABLEPDF2SWF=true;
@@ -182,8 +199,11 @@ dnl Checks for typedefs, structures, and compiler characteristics.
  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)
- RFX_CHECK_AVI2SWF
+ AC_CHECK_FUNCS(popen mkstemp stat lrand48 rand srand48 srand bcopy bzero time)
+
+# ------------------------------------------------------------------
+ 
+RFX_CHECK_AVI2SWF
 
 avi2swf="avi2swf/Makefile"
 if test "x${AVIFILE}" != "xtrue"; then
@@ -193,6 +213,15 @@ if test "x${AVIFILE}" != "xtrue"; then
  avi2swf=
 fi
 
+# ------------------------------------------------------------------
+
+if test "x${UNCOMPRESS}" = "xgzip"; then
+    AC_DEFINE_UNQUOTED(USE_GZIP, 1)
+fi
+AC_SUBST(USE_GZIP)
+
+# ------------------------------------------------------------------
+
 if test "x${DISABLE_LAME}" = "xtrue"; then
     echo "*" Disabling lame support...
     lame_objects= 
@@ -202,15 +231,23 @@ else
 fi
 AC_SUBST(lame_objects)
 
-if test "x${UNCOMPRESS}" = "xgzip"; then
-    AC_DEFINE_UNQUOTED(USE_GZIP, 1)
+# ------------------------------------------------------------------
+
+RFX_CHECK_PYTHON
+
+if test "x$PYTHON_OK" '!=' "xyes";then
+    echo all install uninstall clean: > lib/python/Makefile
+    echo "* No usable python installation found"
+    echo "* Not compiling the python interface"
 fi
-AC_SUBST(USE_GZIP)
+
+# ------------------------------------------------------------------
 
 JPEG2SWF='jpeg2swf$(E)'
 export JPEG2SWF
 PNG2SWF='png2swf$(E)'
 export PNG2SWF
+
 if test "x${DISABLEPDF2SWF}" = "xtrue"; then
   echo "***************************************************"
   echo "The following headers/libraries are missing: " ${MISSINGLIBS}
@@ -235,14 +272,16 @@ if test "x${DISABLEPDF2SWF}" = "xtrue"; then
     echo "or write compressed Flash MX files!"
   fi
   echo "***************************************************"
-  FILES="./release Makefile.common ${avi2swf} Makefile lib/lame/Makefile lib/Makefile lib/action/Makefile src/Makefile swfs/Makefile"
+  FILES="./release Makefile.common ${avi2swf} Makefile lib/lame/Makefile lib/Makefile lib/action/Makefile src/Makefile swfs/Makefile ${pythonrfxswf}"
 else
-  FILES="./release Makefile.common ${avi2swf} Makefile lib/lame/Makefile lib/Makefile lib/action/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/ttf2pt1/Makefile swfs/Makefile"
+  FILES="./release Makefile.common ${avi2swf} Makefile lib/lame/Makefile lib/Makefile lib/action/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/ttf2pt1/Makefile swfs/Makefile ${pythonrfxswf}"
 fi
 AC_SUBST(JPEG2SWF)
 AC_SUBST(PNG2SWF)
 
-AC_OUTPUT(${FILES})
+dnl AC_OUTPUT(${FILES}) old autoconf
+AC_CONFIG_FILES([${FILES}])
+AC_OUTPUT
 
 if test "x${srcdir}" != "x."; then
     echo "Warning: --srcdir is not supported"