git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0db3611
)
configure: fixed LDFLAGS passing, added -Wno-write-strings
author
Matthias Kramm
<kramm@quiss.org>
Fri, 8 Jan 2010 23:31:33 +0000
(15:31 -0800)
committer
Matthias Kramm
<kramm@quiss.org>
Fri, 8 Jan 2010 23:31:46 +0000
(15:31 -0800)
configure
patch
|
blob
|
history
configure.in
patch
|
blob
|
history
diff --git
a/configure
b/configure
index
c888a9b
..
cefa0fb
100755
(executable)
--- a/
configure
+++ b/
configure
@@
-1847,6
+1847,15
@@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+# ------------------- option parsing -------------------------------
+
+DEBUG=
+CHECKMEM=
+PROFILING=
+ENABLE_WARNINGS=
+OPTIMIZE=
+DISABLE_LAME=
+
# Check whether --enable-checkmem was given.
if test "${enable_checkmem+set}" = set; then
enableval=$enable_checkmem; CHECKMEM=true
# Check whether --enable-checkmem was given.
if test "${enable_checkmem+set}" = set; then
enableval=$enable_checkmem; CHECKMEM=true
@@
-1885,7
+1894,6
@@
fi
PACKAGE=swftools
VERSION=2009-08-12-1514
PACKAGE=swftools
VERSION=2009-08-12-1514
-
# ------------------------------------------------------------------
if test "x${srcdir}" != "x."; then
# ------------------------------------------------------------------
if test "x${srcdir}" != "x."; then
@@
-1893,9
+1901,9
@@
if test "x${srcdir}" != "x."; then
exit 1
fi
exit 1
fi
-WARNINGS="-Wparentheses -Wimplicit -Wreturn-type"
+WARNINGS="-Wparentheses -Wimplicit -Wreturn-type -Wno-write-strings"
if test "x$ENABLE_WARNINGS" '!=' "x";then
if test "x$ENABLE_WARNINGS" '!=' "x";then
- WARNINGS="-Wall -Wno-unused -Wno-format -Wno-redundant-decls -D_FORTIFY_SOURCE=2 "
+ WARNINGS="-Wall -Wno-unused -Wno-format -Wno-redundant-decls -Wno-write-strings -D_FORTIFY_SOURCE=2 "
fi
if test "x$CHECKMEM" '!=' "x";then
fi
if test "x$CHECKMEM" '!=' "x";then
@@
-1908,11
+1916,11
@@
if test "x$DEBUG" '!=' "x";then
if test "x$PROFILING" = "x";then
CFLAGS="$WARNINGS -O2 -g $CFLAGS"
CXXFLAGS="$WARNINGS -O2 -g $CXXFLAGS"
if test "x$PROFILING" = "x";then
CFLAGS="$WARNINGS -O2 -g $CFLAGS"
CXXFLAGS="$WARNINGS -O2 -g $CXXFLAGS"
- LDFLAGS="-g $LIBS"
+ LDFLAGS="-g $LDFLAGS"
else
CFLAGS="$WARNINGS -O2 -g -pg $CFLAGS"
CXXFLAGS="$WARNINGS -O2 -g -pg $CXXFLAGS"
else
CFLAGS="$WARNINGS -O2 -g -pg $CFLAGS"
CXXFLAGS="$WARNINGS -O2 -g -pg $CXXFLAGS"
- LDFLAGS="-g -pg $LIBS"
+ LDFLAGS="-g -pg $LDFLAGS"
fi
else if test "x$OPTIMIZE" '!=' "x"; then
CFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CFLAGS"
fi
else if test "x$OPTIMIZE" '!=' "x"; then
CFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CFLAGS"
@@
-10107,7
+10115,7
@@
LIBPDF='libpdf$(A)'
if test "x${DISABLEPDF2SWF}" = "xtrue"; then
echo "* Disabling pdf2swf tool..."
rm -f lib/pdf/Makefile
if test "x${DISABLEPDF2SWF}" = "xtrue"; then
echo "* Disabling pdf2swf tool..."
rm -f lib/pdf/Makefile
- echo all install uninstall clean libpdf: > lib/pdf/Makefile
+ echo all install uninstall clean libpdf libgfxpdf: > lib/pdf/Makefile
pdf2swf_makefile=""
PDF2SWF=
LIBPDF=
pdf2swf_makefile=""
PDF2SWF=
LIBPDF=
diff --git
a/configure.in
b/configure.in
index
ba082c5
..
4ed3ada
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-7,6
+7,15
@@
dnl new autoconf
dnl AC_INIT
dnl AC_CONFIG_SRCDIR([src/])
dnl AC_INIT
dnl AC_CONFIG_SRCDIR([src/])
+# ------------------- option parsing -------------------------------
+
+DEBUG=
+CHECKMEM=
+PROFILING=
+ENABLE_WARNINGS=
+OPTIMIZE=
+DISABLE_LAME=
+
AC_ARG_ENABLE(checkmem,
[ --enable-checkmem turn on ccmalloc debugging], CHECKMEM=true)
AC_ARG_ENABLE(debug,
AC_ARG_ENABLE(checkmem,
[ --enable-checkmem turn on ccmalloc debugging], CHECKMEM=true)
AC_ARG_ENABLE(debug,
@@
-19,6
+28,7
@@
AC_ARG_ENABLE(optimizations,
[ --enable-optimizations turn on compiler optimizations (recommended for avi2swf)], OPTIMIZE=true)
AC_ARG_ENABLE(lame,
[ --disable-lame don't compile any L.A.M.E. mp3 encoding code in],
[ --enable-optimizations turn on compiler optimizations (recommended for avi2swf)], OPTIMIZE=true)
AC_ARG_ENABLE(lame,
[ --disable-lame don't compile any L.A.M.E. mp3 encoding code in],
+
if test "x$enable_lame" = "xno";then
DISABLE_LAME=yes
fi,DISABLE_LAME=)
if test "x$enable_lame" = "xno";then
DISABLE_LAME=yes
fi,DISABLE_LAME=)
@@
-26,7
+36,6
@@
fi,DISABLE_LAME=)
PACKAGE=swftools
VERSION=2009-08-12-1514
PACKAGE=swftools
VERSION=2009-08-12-1514
-
# ------------------------------------------------------------------
if test "x${srcdir}" != "x."; then
# ------------------------------------------------------------------
if test "x${srcdir}" != "x."; then
@@
-34,9
+43,9
@@
if test "x${srcdir}" != "x."; then
exit 1
fi
exit 1
fi
-WARNINGS="-Wparentheses -Wimplicit -Wreturn-type"
+WARNINGS="-Wparentheses -Wimplicit -Wreturn-type -Wno-write-strings"
if test "x$ENABLE_WARNINGS" '!=' "x";then
if test "x$ENABLE_WARNINGS" '!=' "x";then
- WARNINGS="-Wall -Wno-unused -Wno-format -Wno-redundant-decls -D_FORTIFY_SOURCE=2 "
+ WARNINGS="-Wall -Wno-unused -Wno-format -Wno-redundant-decls -Wno-write-strings -D_FORTIFY_SOURCE=2 "
fi
if test "x$CHECKMEM" '!=' "x";then
fi
if test "x$CHECKMEM" '!=' "x";then
@@
-49,11
+58,11
@@
if test "x$DEBUG" '!=' "x";then
if test "x$PROFILING" = "x";then
CFLAGS="$WARNINGS -O2 -g $CFLAGS"
CXXFLAGS="$WARNINGS -O2 -g $CXXFLAGS"
if test "x$PROFILING" = "x";then
CFLAGS="$WARNINGS -O2 -g $CFLAGS"
CXXFLAGS="$WARNINGS -O2 -g $CXXFLAGS"
- LDFLAGS="-g $LIBS"
+ LDFLAGS="-g $LDFLAGS"
else
CFLAGS="$WARNINGS -O2 -g -pg $CFLAGS"
CXXFLAGS="$WARNINGS -O2 -g -pg $CXXFLAGS"
else
CFLAGS="$WARNINGS -O2 -g -pg $CFLAGS"
CXXFLAGS="$WARNINGS -O2 -g -pg $CXXFLAGS"
- LDFLAGS="-g -pg $LIBS"
+ LDFLAGS="-g -pg $LDFLAGS"
fi
else if test "x$OPTIMIZE" '!=' "x"; then
CFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CFLAGS"
fi
else if test "x$OPTIMIZE" '!=' "x"; then
CFLAGS="$WARNINGS -O3 -fomit-frame-pointer -Winline $CFLAGS"