git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added chapter seperation.
[swftools.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
9f6f564
..
84fb50d
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,5
+1,8
@@
dnl Process this file with autoconf to produce a configure script.
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)
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
[ --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 -Winline"
+WARNINGS="-Wparentheses -Wimplicit -Wreturn-type"
if test "x$ENABLE_WARNINGS" '!=' "x";then
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
fi
if test "x$CHECKMEM" '!=' "x";then
@@
-26,12
+31,9
@@
fi
if test "x$DEBUG" '!=' "x";then
CFLAGS="$WARNINGS -g $CFLAGS"
CXXFLAGS="$WARNINGS -g $CXXFLAGS"
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
else if test "x$OPTIMIZE" '!=' "x"; then
- CFLAGS="$WARNINGS -O3 -fomit-frame-pointer $CFLAGS"
- CXXFLAGS="$WARNINGS -O3 -fomit-frame-pointer $CXXFLAGS"
+ CFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CFLAGS"
+ CXXFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CXXFLAGS"
else
CFLAGS="$WARNINGS -O -fomit-frame-pointer $CFLAGS"
CXXFLAGS="$WARNINGS -O -fomit-frame-pointer $CXXFLAGS"
else
CFLAGS="$WARNINGS -O -fomit-frame-pointer $CFLAGS"
CXXFLAGS="$WARNINGS -O -fomit-frame-pointer $CXXFLAGS"
@@
-60,7
+62,7
@@
esac
dnl Checks for programs.
AC_PROG_CC
AC_PROG_CXX
dnl Checks for programs.
AC_PROG_CC
AC_PROG_CXX
-
+
if test "x$CHECKMEM" '!=' "x";then
CC="ccmalloc $CC"
CXX="ccmalloc $CXX"
if test "x$CHECKMEM" '!=' "x";then
CC="ccmalloc $CC"
CXX="ccmalloc $CXX"
@@
-109,6
+111,13
@@
if test "$prefix" != "NONE" -a "$prefix" != "/usr/local" -a "$prefix" != "/usr/l
# TODO- test whether gcc still works after this
fi
# 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.";
dnl Checks for libraries.
AC_CHECK_LIB(m, sin,,
echo "Error: Math library not found.";
@@
-142,7
+151,7
@@
dnl Checks for header files.
AC_CONFIG_HEADER(config.h)
AC_HEADER_DIRENT
AC_HEADER_STDC
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;
if test "x${ac_cv_header_jpeglib_h}" != "xyes"; then
DISABLEPDF2SWF=true;
@@
-182,7
+191,7
@@
dnl Checks for typedefs, structures, and compiler characteristics.
dnl AC_CHECK_TYPE(uint,unsigned long int)
dnl Checks for library functions.
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"
RFX_CHECK_AVI2SWF
avi2swf="avi2swf/Makefile"
@@
-211,6
+220,13
@@
JPEG2SWF='jpeg2swf$(E)'
export JPEG2SWF
PNG2SWF='png2swf$(E)'
export PNG2SWF
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}
if test "x${DISABLEPDF2SWF}" = "xtrue"; then
echo "***************************************************"
echo "The following headers/libraries are missing: " ${MISSINGLIBS}
@@
-235,14
+251,16
@@
if test "x${DISABLEPDF2SWF}" = "xtrue"; then
echo "or write compressed Flash MX files!"
fi
echo "***************************************************"
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
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)
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"
if test "x${srcdir}" != "x."; then
echo "Warning: --srcdir is not supported"