git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for buffer overflow in swfc
[swftools.git]
/
configure
diff --git
a/configure
b/configure
index
b195902
..
2f5b9d2
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-1940,8
+1940,8
@@
if test "x$PROFILING" '!=' "x";then
fi
if test "x$DEBUG" '!=' "x";then
if test "x$PROFILING" = "x";then
fi
if test "x$DEBUG" '!=' "x";then
if test "x$PROFILING" = "x";then
- CFLAGS="$WARNINGS -g $CFLAGS"
- CXXFLAGS="$WARNINGS -g $CXXFLAGS"
+ CFLAGS="$WARNINGS -O2 -g $CFLAGS"
+ CXXFLAGS="$WARNINGS -O2 -g $CXXFLAGS"
LDFLAGS="-g $LIBS"
else
CFLAGS="$WARNINGS -O2 -g -pg $CFLAGS"
LDFLAGS="-g $LIBS"
else
CFLAGS="$WARNINGS -O2 -g -pg $CFLAGS"
@@
-9544,6
+9544,7
@@
else
NO_LIBMP3LAME=1
fi
NO_LIBMP3LAME=1
fi
+ HASLAMEHEADER=
for ac_header in lame.h
do
for ac_header in lame.h
do
@@
-9684,12
+9685,12
@@
if test `eval 'as_val=${'$as_ac_Header'}
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-
+ HASLAMEHEADER=1
fi
done
fi
done
- if test "x$NO_LIBMP3LAME" "!=" "x1" -a "x$ac_cv_header_lame_h" "!=" "x";then
+ if test "x$NO_LIBMP3LAME" "!=" "x1" -a "x$HASLAMEHEADER" '!=' "x";then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LAME 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define HAVE_LAME 1
_ACEOF
@@
-10927,8
+10928,8
@@
else
if test "x$PYTHON_LIB" '!=' "x" -o "x$PYTHON_INCLUDES" '!=' "x";then
echo "Set both PYTHON_LIB and PYTHON_INCLUDES, or none at all"
fi
if test "x$PYTHON_LIB" '!=' "x" -o "x$PYTHON_INCLUDES" '!=' "x";then
echo "Set both PYTHON_LIB and PYTHON_INCLUDES, or none at all"
fi
- # iterate through version 2.2 to 2.5
- for v in 2 3 4 5; do
+ # iterate through version 2.2 to 2.6
+ for v in 2 3 4 5 6; do
# Linux
if test -f "/usr/include/python2.$v/Python.h";then
PY_VERSION=2.$v
# Linux
if test -f "/usr/include/python2.$v/Python.h";then
PY_VERSION=2.$v
@@
-10941,17
+10942,16
@@
else
fi
PYTHON_INCLUDES="-I/usr/include/python$PY_VERSION"
# Mac OS X
fi
PYTHON_INCLUDES="-I/usr/include/python$PY_VERSION"
# Mac OS X
- elif test -f "/System/Library/Frameworks/Python.framework/Versions/2.$v/include/python2.$v/Python.h";then
- #TODO: test for /System/Library/Frameworks/Python.framework/Versions/2.3/Python ?
+ elif test -f "/Library/Frameworks/Python.framework/Versions/2.$v/include/python2.$v/Python.h";then
PY_VERSION=2.$v
PYTHON_LIB="-framework Python"
PY_VERSION=2.$v
PYTHON_LIB="-framework Python"
- if test -f "/Library/Python/2.$v/PIL/_imaging.so";then
+ if test -f "/Library/Frameworks/Python.framework/Versions/2.$v/site-packages/PIL/_imaging.so";then
PYTHON_LIB2="$PYTHON_LIB /Library/Python/2.$v/PIL/_imaging.so"
HAVE_PYTHON_IMAGING_LIB=1
else
PYTHON_LIB2="$PYTHON_LIB"
fi
PYTHON_LIB2="$PYTHON_LIB /Library/Python/2.$v/PIL/_imaging.so"
HAVE_PYTHON_IMAGING_LIB=1
else
PYTHON_LIB2="$PYTHON_LIB"
fi
- PYTHON_INCLUDES="-I/System/Library/Frameworks/Python.framework/Versions/2.$v/include/python2.$v/"
+ PYTHON_INCLUDES="-I/Library/Frameworks/Python.framework/Versions/2.$v/include/python2.$v/"
# Mac OS X [Fink]:
elif test "(" -f "/sw/lib/python2.$v/config/libpython2.$v.dylib" \
-o -f "/sw/lib/python2.$v/config/libpython2.$v.a" \
# Mac OS X [Fink]:
elif test "(" -f "/sw/lib/python2.$v/config/libpython2.$v.dylib" \
-o -f "/sw/lib/python2.$v/config/libpython2.$v.a" \
@@
-11189,10
+11189,9
@@
fi
-
if test -f "release.in"; then release_in="./release"; fi
if test -f "Makefile.new.in"; then mk_in="./Makefile.new"; fi
if test -f "release.in"; then release_in="./release"; fi
if test -f "Makefile.new.in"; then mk_in="./Makefile.new"; fi
-FILES="$release_in $mk_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile pdf2swf/fonts/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile lib/readers/Makefile"
+FILES="$release_in $mk_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile lib/readers/Makefile"
ac_config_files="$ac_config_files ${FILES}"
cat >confcache <<\_ACEOF
ac_config_files="$ac_config_files ${FILES}"
cat >confcache <<\_ACEOF