X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=configure.in;h=57059e62d568146eb81e1e90ee88e113e954eee5;hb=7f3740a5cb7e78612d803299d52d0506cc6dd22b;hp=e248df3583b2a0f1f27b17d7be7e24b7124ca22a;hpb=e6fa9fa74bbb0810cca871680b23cc557336fc1b;p=swftools.git diff --git a/configure.in b/configure.in index e248df3..57059e6 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(src/) +AC_INIT +AC_CONFIG_SRCDIR([src/]) AC_ARG_ENABLE(checkmem, [ --enable-checkmem turn on ccmalloc debugging], CHECKMEM=true) @@ -13,12 +14,12 @@ AC_ARG_ENABLE(lame, [ --disable-lame don't compile any L.A.M.E. mp3 encoding code in], DISABLE_LAME=true) PACKAGE=swftools -VERSION=2004-02-05-1504 +VERSION=0.5.1 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 @@ -147,7 +148,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; @@ -187,7 +188,7 @@ 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) + AC_CHECK_FUNCS(popen mkstemp stat lrand48 rand srand48 srand bcopy bzero time) RFX_CHECK_AVI2SWF avi2swf="avi2swf/Makefile" @@ -216,6 +217,13 @@ JPEG2SWF='jpeg2swf$(E)' export JPEG2SWF PNG2SWF='png2swf$(E)' export PNG2SWF + +if test "x" = "x"; then + pythonrfxswf="lib/python/Makefile" +else + echo all install uninstall clean: > lib/python/Makefile +fi + if test "x${DISABLEPDF2SWF}" = "xtrue"; then echo "***************************************************" echo "The following headers/libraries are missing: " ${MISSINGLIBS} @@ -240,14 +248,15 @@ 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}) +AC_CONFIG_FILES([${FILES}]) +AC_OUTPUT if test "x${srcdir}" != "x."; then echo "Warning: --srcdir is not supported"