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 swf_Concatenate() function
[swftools.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
493e35a
..
4673a19
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-13,7
+13,8
@@
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=0.5.1
+
WARNINGS="-Wparentheses -Wimplicit -Wreturn-type"
if test "x$ENABLE_WARNINGS" '!=' "x";then
WARNINGS="-Wparentheses -Wimplicit -Wreturn-type"
if test "x$ENABLE_WARNINGS" '!=' "x";then
@@
-26,9
+27,6
@@
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
CFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CFLAGS"
CXXFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CXXFLAGS"
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
+58,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
+107,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
+147,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
+187,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"