git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generated from configure.in
[swftools.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
41b7f45
..
3bebb37
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-3,13
+3,12
@@
AC_INIT(src/)
AC_ARG_PROGRAM
export PACKAGE=swftools
AC_ARG_PROGRAM
export PACKAGE=swftools
-export VERSION=0.0.2
+export VERSION=0.2.0
export CFLAGS="-O2 -fomit-frame-pointer"
export CXXFLAGS="-O2 -fomit-frame-pointer"
dnl Checks for programs.
export CFLAGS="-O2 -fomit-frame-pointer"
export CXXFLAGS="-O2 -fomit-frame-pointer"
dnl Checks for programs.
- AC_PROG_AWK
AC_PROG_CC
AC_PROG_CPP
AC_PROG_CXX
AC_PROG_CC
AC_PROG_CPP
AC_PROG_CXX
@@
-26,13
+25,12
@@
dnl Checks for libraries.
echo "Error: Math library not found.";
exit;
)
echo "Error: Math library not found.";
exit;
)
- AC_CHECK_LIB(z, crc32,,
+ AC_CHECK_LIB(z, deflate,,
echo "Error: The zlib compression library is required."
DISABLEPDF2SWF=true;
MISSINGLIBS="${MISSINGLIBS} zlib"
echo "Error: The zlib compression library is required."
DISABLEPDF2SWF=true;
MISSINGLIBS="${MISSINGLIBS} zlib"
- exit;
)
)
- AC_CHECK_LIB(xjpeg, jpeg_write_raw_data,,
+ AC_CHECK_LIB(jpeg, jpeg_write_raw_data,,
DISABLEPDF2SWF=true;
DISABLEJPEG2SWF=true;
MISSINGLIBS="${MISSINGLIBS} jpeglib"
DISABLEPDF2SWF=true;
DISABLEJPEG2SWF=true;
MISSINGLIBS="${MISSINGLIBS} jpeglib"
@@
-43,16
+41,16
@@
dnl Checks for libraries.
)
dnl do we need those?
)
dnl do we need those?
- AC_CHECK_LIB(pthread, pthread_create)
- AC_CHECK_LIB(X11, XFlush)
+dnl AC_CHECK_LIB(pthread, pthread_create)
+dnl AC_CHECK_LIB(X11, XFlush)
dnl Checks for header files.
AC_CONFIG_HEADER(config.h)
dnl Checks for header files.
AC_CONFIG_HEADER(config.h)
- AC_PATH_X
+dnl AC_PATH_X
dnl AC_PATH_XTRA
AC_HEADER_DIRENT
AC_HEADER_STDC
dnl AC_PATH_XTRA
AC_HEADER_DIRENT
AC_HEADER_STDC
- AC_CHECK_HEADERS(math.h fcntl.h limits.h malloc.h unistd.h memory.h zlib.h jpeglib.h t1lib.h)
+ AC_CHECK_HEADERS(math.h fcntl.h limits.h malloc.h unistd.h memory.h zlib.h jpeglib.h t1lib.h sys/stat.h sys/types.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;
@@
-63,6
+61,10
@@
if test "x${ac_cv_header_t1lib_h}" != "xyes"; then
DISABLEPDF2SWF=true;
MISSINGLIBS="${MISSINGLIBS} t1lib.h"
fi
DISABLEPDF2SWF=true;
MISSINGLIBS="${MISSINGLIBS} t1lib.h"
fi
+if test "x${ac_cv_header_zlib_h}" != "xyes"; then
+ DISABLEPDF2SWF=true;
+ MISSINGLIBS="${MISSINGLIBS} zlib.h"
+fi
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
@@
-78,6
+80,7
@@
dnl Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_OFF_T
AC_TYPE_SIZE_T
AC_STRUCT_TM
AC_TYPE_OFF_T
AC_TYPE_SIZE_T
AC_STRUCT_TM
+ AC_CHECK_TYPE(boolean,unsigned 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(uchar,unsigned char)
dnl AC_CHECK_TYPE(schar,signed char)
dnl AC_CHECK_TYPE(word,unsigned short int)
@@
-95,7
+98,7
@@
if test "x${DISABLEPDF2SWF}" = "xtrue"; then
echo "***************************************************"
echo "The following headers/libraries are missing: " ${MISSINGLIBS}
echo "Disabling pdf2swf tool..."
echo "***************************************************"
echo "The following headers/libraries are missing: " ${MISSINGLIBS}
echo "Disabling pdf2swf tool..."
- rm pdf2swf/Makefile
+ rm -f pdf2swf/Makefile
echo all: > pdf2swf/Makefile
echo install: >> pdf2swf/Makefile
if test "x${DISABLEJPEG2SWF}" = "xtrue"; then
echo all: > pdf2swf/Makefile
echo install: >> pdf2swf/Makefile
if test "x${DISABLEJPEG2SWF}" = "xtrue"; then
@@
-105,7
+108,7
@@
if test "x${DISABLEPDF2SWF}" = "xtrue"; then
echo "***************************************************"
FILES="./release Makefile lib/Makefile src/Makefile"
else
echo "***************************************************"
FILES="./release Makefile lib/Makefile src/Makefile"
else
- FILES="./release Makefile lib/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/fonts/Makefile"
+ FILES="./release Makefile lib/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/ttf2pt1/Makefile pdf2swf/fonts/Makefile"
fi
AC_SUBST(JPEG2SWF)
fi
AC_SUBST(JPEG2SWF)