git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed freetype-config detection.
[swftools.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
52d2d7c
..
492a6bb
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-8,6
+8,8
@@
AC_ARG_ENABLE(checkmem,
[ --enable-checkmem turn on ccmalloc debugging], CHECKMEM=true)
AC_ARG_ENABLE(debug,
[ --enable-debug turn on debugging], DEBUG=true)
[ --enable-checkmem turn on ccmalloc debugging], CHECKMEM=true)
AC_ARG_ENABLE(debug,
[ --enable-debug turn on debugging], DEBUG=true)
+AC_ARG_ENABLE(profiling,
+[ --enable-profiling turn on profiling], PROFILING=true)
AC_ARG_ENABLE(warnings,
[ --enable-warnings turn on compiler warnings], ENABLE_WARNINGS=true)
AC_ARG_ENABLE(optimizations,
AC_ARG_ENABLE(warnings,
[ --enable-warnings turn on compiler warnings], ENABLE_WARNINGS=true)
AC_ARG_ENABLE(optimizations,
@@
-16,7
+18,7
@@
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.6.2
+VERSION=2004-11-13-2026
# ------------------------------------------------------------------
# ------------------------------------------------------------------
@@
-34,9
+36,18
@@
fi
if test "x$CHECKMEM" '!=' "x";then
DEBUG=yes
fi
if test "x$CHECKMEM" '!=' "x";then
DEBUG=yes
fi
+if test "x$PROFILING" '!=' "x";then
+ DEBUG=yes
+fi
if test "x$DEBUG" '!=' "x";then
if test "x$DEBUG" '!=' "x";then
- CFLAGS="$WARNINGS -g $CFLAGS"
- CXXFLAGS="$WARNINGS -g $CXXFLAGS"
+ if test "x$PROFILING" = "x";then
+ CFLAGS="$WARNINGS -g $CFLAGS"
+ CXXFLAGS="$WARNINGS -g $CXXFLAGS"
+ else
+ CFLAGS="$WARNINGS -O2 -g -pg $CFLAGS"
+ CXXFLAGS="$WARNINGS -O2 -g -pg $CXXFLAGS"
+ LDFLAGS="-g -pg $LIBS"
+ fi
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"
@@
-56,15
+67,22
@@
fi
export PACKAGE VERSION CFLAGS CXXFLAGS
dnl Checks for programs.
export PACKAGE VERSION CFLAGS CXXFLAGS
dnl Checks for programs.
- AC_CANONICAL_HOST
+
+AC_CANONICAL_HOST
+
+SHARED="-shared"
MACOSX=
case $host_os in
*darwin* )
MACOSX=yes
CFLAGS="$CFLAGS -fno-rtti"
CXXFLAGS="$CXXFLAGS -fno-rtti"
MACOSX=
case $host_os in
*darwin* )
MACOSX=yes
CFLAGS="$CFLAGS -fno-rtti"
CXXFLAGS="$CXXFLAGS -fno-rtti"
+ SHARED="-bundle"
;;
esac
;;
esac
+
+AC_SUBST(SHARED)
+
dnl Checks for programs.
AC_PROG_CC
AC_PROG_CXX
dnl Checks for programs.
AC_PROG_CC
AC_PROG_CXX
@@
-88,7
+106,12
@@
fi
AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, )
dnl Checks for system services
AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, )
dnl Checks for system services
+OBJEXT="o"
AC_EXEEXT
AC_EXEEXT
+if test "x$EXEEXT" = "x.exe";then
+ OBJEXT="obj"
+fi
+AC_SUBST(OBJEXT)
RFX_CHECK_MING
RFX_CHECK_MING
@@
-194,7
+217,7
@@
if test "x${DISABLE_LAME}" = "xtrue"; then
else
# old lame code at lib/lame
if test -f lib/lame/Makefile.in; then
else
# old lame code at lib/lame
if test -f lib/lame/Makefile.in; then
- lame_objects="lame/psymodel.o lame/fft.o lame/newmdct.o lame/quantize.o lame/takehiro.o lame/reservoir.o lame/quantize_pvt.o lame/vbrquantize.o lame/encoder.o lame/id3tag.o lame/version.o lame/tables.o lame/util.o lame/bitstream.o lame/set_get.o lame/VbrTag.o lame/lame.o"
+ lame_objects="lame/psymodel.\$(O) lame/fft.\$(O) lame/newmdct.\$(O) lame/quantize.\$(O) lame/takehiro.\$(O) lame/reservoir.\$(O) lame/quantize_pvt.\$(O) lame/vbrquantize.\$(O) lame/encoder.\$(O) lame/id3tag.\$(O) lame/version.\$(O) lame/tables.\$(O) lame/util.\$(O) lame/bitstream.\$(O) lame/set_get.\$(O) lame/VbrTag.\$(O) lame/lame.\$(O)"
lame_makefile="lib/lame/Makefile"
CPPFLAGS="$CPPFLAGS -Ilame"
AC_DEFINE_UNQUOTED(HAVE_LAME, 1)
lame_makefile="lib/lame/Makefile"
CPPFLAGS="$CPPFLAGS -Ilame"
AC_DEFINE_UNQUOTED(HAVE_LAME, 1)
@@
-257,38
+280,44
@@
fi
# ------------------------------------------------------------------
AC_MSG_CHECKING([for missing libraries])
# ------------------------------------------------------------------
AC_MSG_CHECKING([for missing libraries])
-
+
if test "x$ZLIBMISSING" = "xtrue";then
MISSINGLIBS="${MISSINGLIBS} zlib"
if test "x$ZLIBMISSING" = "xtrue";then
MISSINGLIBS="${MISSINGLIBS} zlib"
- DISABLEPNG2SWF=true;
+ DISABLEPNG2SWF=true
+ PARTIAL=true
fi
if test "x$JPEGLIBMISSING" = "xtrue";then
MISSINGLIBS="${MISSINGLIBS} jpeglib"
fi
if test "x$JPEGLIBMISSING" = "xtrue";then
MISSINGLIBS="${MISSINGLIBS} jpeglib"
- DISABLEPDF2SWF=true;
- DISABLEJPEG2SWF=true;
+ DISABLEPDF2SWF=true
+ DISABLEJPEG2SWF=true
+ PARTIAL=true
fi
if test "x$T1LIBMISSING" = "xtrue";then
MISSINGLIBS="${MISSINGLIBS} t1lib"
fi
if test "x${ac_cv_header_jpeglib_h}" '!=' "xyes"; then
fi
if test "x$T1LIBMISSING" = "xtrue";then
MISSINGLIBS="${MISSINGLIBS} t1lib"
fi
if test "x${ac_cv_header_jpeglib_h}" '!=' "xyes"; then
- DISABLEPDF2SWF=true;
- DISABLEJPEG2SWF=true;
- MISSINGLIBS="${MISSINGLIBS} jpeglib.h"
+ DISABLEPDF2SWF=true;
+ DISABLEJPEG2SWF=true;
+ MISSINGLIBS="${MISSINGLIBS} jpeglib.h"
+ PARTIAL=true
fi
if test "x$HAVE_FREETYPE" '!=' "x1"; then
fi
if test "x$HAVE_FREETYPE" '!=' "x1"; then
- DISABLEPDF2SWF=true;
- MISSINGLIBS="${MISSINGLIBS} freetype"
+ DISABLEPDF2SWF=true;
+ MISSINGLIBS="${MISSINGLIBS} freetype"
+ PARTIAL=true
fi
if test "x${ac_cv_header_t1lib_h}" '!=' "xyes"; then
fi
if test "x${ac_cv_header_t1lib_h}" '!=' "xyes"; then
- MISSINGLIBS="${MISSINGLIBS} t1lib.h"
+ MISSINGLIBS="${MISSINGLIBS} t1lib.h"
fi
if test "x${ac_cv_header_zlib_h}" '!=' "xyes"; then
fi
if test "x${ac_cv_header_zlib_h}" '!=' "xyes"; then
- DISABLEPNG2SWF=true;
- MISSINGLIBS="${MISSINGLIBS} zlib.h"
+ DISABLEPNG2SWF=true;
+ MISSINGLIBS="${MISSINGLIBS} zlib.h"
+ PARTIAL=true
fi
if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
fi
if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
- MISSINGLIBS="${MISSINGLIBS} avifile"
+ MISSINGLIBS="${MISSINGLIBS} avifile"
+ PARTIAL=true
fi
AC_MSG_RESULT(${MISSINGLIBS})
fi
AC_MSG_RESULT(${MISSINGLIBS})
@@
-338,6
+367,9
@@
export PNG2SWF
AC_SUBST(PNG2SWF)
if test "x${MISSINGLIBS}" '!=' "x"; then
AC_SUBST(PNG2SWF)
if test "x${MISSINGLIBS}" '!=' "x"; then
+ if test "x${PARTIAL}" '=' "x"; then
+ echo "* (never mind)"
+ fi
echo "***************************************************"
fi
echo "***************************************************"
fi