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 some checks needed for gocr
[swftools.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
27b4b6c
..
cbae8a5
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-21,7
+21,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=2007-01-13-1826
+VERSION=2008-04-02-1230
# ------------------------------------------------------------------
# ------------------------------------------------------------------
@@
-31,7
+31,7
@@
if test "x${srcdir}" != "x."; then
exit 1
fi
exit 1
fi
-WARNINGS="-Wparentheses -Wimplicit -Wreturn-type -Wno-unused-value"
+WARNINGS="-Wparentheses -Wimplicit -Wreturn-type"
if test "x$ENABLE_WARNINGS" '!=' "x";then
WARNINGS="-Wall -Wno-unused -Wno-format -Wno-redundant-decls -D_FORTIFY_SOURCE=2 "
fi
if test "x$ENABLE_WARNINGS" '!=' "x";then
WARNINGS="-Wall -Wno-unused -Wno-format -Wno-redundant-decls -D_FORTIFY_SOURCE=2 "
fi
@@
-60,6
+60,10
@@
else
CXXFLAGS="$WARNINGS -O -fomit-frame-pointer $CXXFLAGS"
fi
fi
CXXFLAGS="$WARNINGS -O -fomit-frame-pointer $CXXFLAGS"
fi
fi
+
+CFLAGS="-fPIC $CFLAGS"
+CXXFLAGS="-fPIC $CFLAGS"
+
#OLDGCC=1
#if test "x$OLDGCC" '!=' "x";then
# #CFLAGS="$CFLAGS --std=c89 -ansi -pendantic"
#OLDGCC=1
#if test "x$OLDGCC" '!=' "x";then
# #CFLAGS="$CFLAGS --std=c89 -ansi -pendantic"
@@
-208,9
+212,8
@@
if test "x$ZLIBMISSING" = "xtrue";then
fi
AC_CHECK_LIB(jpeg, jpeg_write_raw_data,, JPEGLIBMISSING=true)
fi
AC_CHECK_LIB(jpeg, jpeg_write_raw_data,, JPEGLIBMISSING=true)
-AC_CHECK_LIB(t1, T1_LoadFont,, T1LIBMISSING=true)
AC_CHECK_LIB(ungif, DGifOpen,, UNGIFMISSING=true)
AC_CHECK_LIB(ungif, DGifOpen,, UNGIFMISSING=true)
-if "$UNGIFMISSING";then
+if test "$UNGIFMISSING";then
UNGIFMISSING=
AC_CHECK_LIB(gif, DGifOpen,, UNGIFMISSING=true)
fi
UNGIFMISSING=
AC_CHECK_LIB(gif, DGifOpen,, UNGIFMISSING=true)
fi
@@
-226,7
+229,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 gif_lib.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)
+ AC_CHECK_HEADERS(zlib.h gif_lib.h io.h wchar.h jpeglib.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)
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
@@
-243,24
+246,19
@@
dnl Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_SIZE_T
AC_STRUCT_TM
AC_CHECK_TYPE(boolean,int) #needed for jpeglib
AC_TYPE_SIZE_T
AC_STRUCT_TM
AC_CHECK_TYPE(boolean,int) #needed for jpeglib
- dnl AC_CHECK_TYPE(bool,char)
- dnl AC_CHECK_TYPE(uchar,unsigned char)
- dnl AC_CHECK_TYPE(schar,signed char)
- dnl AC_CHECK_TYPE(word,unsigned short int)
- dnl AC_CHECK_TYPE(sword,unsigned short int)
- dnl AC_CHECK_TYPE(uint,unsigned long int)
+ AC_CHECK_FUNCS(popen wcschr wcsdup mkstemp stat lrand48 rand srand48 srand bcopy bzero time)
-dnl Checks for library functions.
- AC_CHECK_FUNCS(popen mkstemp stat lrand48 rand srand48 srand bcopy bzero time)
-
-# ------------------------------------------------------------------
+AC_CHECK_SIZEOF([signed])
+AC_CHECK_SIZEOF([unsigned])
+AC_CHECK_SIZEOF([signed long])
+AC_CHECK_SIZEOF([unsigned long])
+AC_CHECK_SIZEOF([signed long long])
+AC_CHECK_SIZEOF([unsigned long long])
RFX_CHECK_FREETYPE
RFX_CHECK_FREETYPE
-#RFX_CHECK_FONTCONFIG
+RFX_CHECK_FONTCONFIG
-# ------------------------------------------------------------------
-
lame_objects=
lame_makefile=
if test "x${DISABLE_LAME}" = "xtrue"; then
lame_objects=
lame_makefile=
if test "x${DISABLE_LAME}" = "xtrue"; then
@@
-343,9
+341,9
@@
if test "x$JPEGLIBMISSING" = "xtrue";then
DISABLEJPEG2SWF=true
PARTIAL=true
fi
DISABLEJPEG2SWF=true
PARTIAL=true
fi
-if test "x$T1LIBMISSING" = "xtrue";then
- MISSINGLIBS="${MISSINGLIBS} t1lib"
-fi
+#if test "x$T1LIBMISSING" = "xtrue";then
+# MISSINGLIBS="${MISSINGLIBS} t1lib"
+#fi
if test "x$UNGIFMISSING" = "xtrue";then
DISABLEGIF2SWF=true
MISSINGLIBS="${MISSINGLIBS} ungif"
if test "x$UNGIFMISSING" = "xtrue";then
DISABLEGIF2SWF=true
MISSINGLIBS="${MISSINGLIBS} ungif"
@@
-363,9
+361,9
@@
if test "x$HAVE_FREETYPE" '!=' "x1"; then
MISSINGLIBS="${MISSINGLIBS} freetype"
PARTIAL=true
fi
MISSINGLIBS="${MISSINGLIBS} freetype"
PARTIAL=true
fi
-if test "x${ac_cv_header_t1lib_h}" '!=' "xyes"; then
- MISSINGLIBS="${MISSINGLIBS} t1lib.h"
-fi
+#if test "x${ac_cv_header_t1lib_h}" '!=' "xyes"; then
+# MISSINGLIBS="${MISSINGLIBS} t1lib.h"
+#fi
if test "x${ac_cv_header_gif_lib_h}" '!=' "xyes"; then
DISABLEGIF2SWF=true
MISSINGLIBS="${MISSINGLIBS} gif_lib.h"
if test "x${ac_cv_header_gif_lib_h}" '!=' "xyes"; then
DISABLEGIF2SWF=true
MISSINGLIBS="${MISSINGLIBS} gif_lib.h"
@@
-376,10
+374,9
@@
if test "x${ac_cv_header_zlib_h}" '!=' "xyes"; then
MISSINGLIBS="${MISSINGLIBS} zlib.h"
PARTIAL=true
fi
MISSINGLIBS="${MISSINGLIBS} zlib.h"
PARTIAL=true
fi
-if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
- MISSINGLIBS="${MISSINGLIBS} avifile"
- PARTIAL=true
-fi
+#if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
+# MISSINGLIBS="${MISSINGLIBS} avifile"
+#fi
AC_MSG_RESULT(${MISSINGLIBS})
AC_MSG_RESULT(${MISSINGLIBS})
@@
-392,7
+389,8
@@
fi
avi2swf="avi2swf/Makefile"
if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
avi2swf="avi2swf/Makefile"
if test "x${AVIFILE}" '!=' "xtrue" -a "x${AVIFIL32}" '!=' "xtrue"; then
- echo "* Disabling avi2swf tool..."
+ #don't whine, avi2swf is outdated anyway
+ #echo "* Disabling avi2swf tool..."
echo all install uninstall clean: > avi2swf/Makefile
avi2swf=
fi
echo all install uninstall clean: > avi2swf/Makefile
avi2swf=
fi
@@
-452,9
+450,8
@@
fi
# ------------------------------------------------------------------
if test -f "release.in"; then release_in="./release"; fi
# ------------------------------------------------------------------
if test -f "release.in"; then release_in="./release"; fi
-FILES="$release_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"
-
-dnl old autoconf
+if test -f "wx/Makefile.in"; then wx_in="wx/Makefile"; fi
+FILES="$release_in $wx_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"
AC_OUTPUT(${FILES})
dnl new autoconf
AC_OUTPUT(${FILES})
dnl new autoconf