git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add documentation about the -i option
[swftools.git]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
85ad02f
..
3e3f4dd
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,15
+1,13
@@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/)
dnl Process this file with autoconf to produce a configure script.
AC_INIT(src/)
-AC_ARG_PROGRAM
-
-export PACKAGE=swftools
-export VERSION=0.0.2
-export CFLAGS="-O2 -fomit-frame-pointer"
-export CXXFLAGS="-O2 -fomit-frame-pointer"
+PACKAGE=swftools
+VERSION=0.2.3
+CFLAGS="-Winline -Wparentheses -Wimplicit -Wreturn-type -O2 -fomit-frame-pointer"
+CXXFLAGS="-Winline -Wparentheses -Wimplicit -Wreturn-type -O2 -fomit-frame-pointer"
+export PACKAGE VERSION CFLAGS CXXFLAGS
dnl Checks for programs.
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
@@
-17,6
+15,7
@@
dnl Checks for programs.
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AC_PROG_LN_S
+ AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, )
dnl Checks for system services
AC_EXEEXT
dnl Checks for system services
AC_EXEEXT
@@
-26,11
+25,10
@@
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(jpeg, jpeg_write_raw_data,,
DISABLEPDF2SWF=true;
)
AC_CHECK_LIB(jpeg, jpeg_write_raw_data,,
DISABLEPDF2SWF=true;
@@
-42,17
+40,24
@@
dnl Checks for libraries.
MISSINGLIBS="${MISSINGLIBS} T1lib"
)
MISSINGLIBS="${MISSINGLIBS} T1lib"
)
+SWF_CHECK_BYTEORDER
+AC_SUBST(WORDS_BIGENDIAN)
+SWF_CHECK_SYSTEM_BACKTICKS
+AC_SUBST(SYSTEM_BACKTICKS)
+
+AC_ARG_PROGRAM
+
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(zlib.h jpeglib.h t1lib.h sys/stat.h sys/types.h dirent.h sys/ndir.h sys/dir.h ndir.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
+68,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
+87,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,int)
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)
@@
-85,25
+95,33
@@
dnl Checks for typedefs, structures, and compiler characteristics.
dnl AC_CHECK_TYPE(uint,unsigned long int)
dnl Checks for library functions.
dnl AC_CHECK_TYPE(uint,unsigned long int)
dnl Checks for library functions.
- AC_FUNC_MEMCMP
- AC_FUNC_MMAP
- AC_FUNC_VPRINTF
- AC_CHECK_FUNCS(getcwd putenv socket strcspn strdup strerror strstr)
+ AC_CHECK_FUNCS(popen mkstemp stat lrand48 rand srand48 srand)
+
+if test "x${UNCOMPRESS}" = "xgzip"; then
+ AC_DEFINE_UNQUOTED(USE_GZIP, 1)
+fi
+AC_SUBST(USE_GZIP)
+JPEG2SWF='jpeg2swf$(EXEEXT)'
+export JPEG2SWF
if test "x${DISABLEPDF2SWF}" = "xtrue"; then
echo "***************************************************"
echo "The following headers/libraries are missing: " ${MISSINGLIBS}
echo "Disabling pdf2swf tool..."
if test "x${DISABLEPDF2SWF}" = "xtrue"; then
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 all: > pdf2swf/Makefile
+ echo install: >> pdf2swf/Makefile
+ echo clean: >> pdf2swf/Makefile
if test "x${DISABLEJPEG2SWF}" = "xtrue"; then
echo "Disabling jpeg2swf tool..."
if test "x${DISABLEJPEG2SWF}" = "xtrue"; then
echo "Disabling jpeg2swf tool..."
- dnl FIXME: Do something here
+ JPEG2SWF=
+ export JPEG2SWF
fi
echo "***************************************************"
fi
echo "***************************************************"
- FILES="./release Makefile lib/Makefile src/Makefile"
+ FILES="./release Makefile lib/bladeenc/Makefile lib/Makefile src/Makefile swfs/Makefile"
else
else
- FILES="./release Makefile lib/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/fonts/Makefile"
+ FILES="./release Makefile lib/bladeenc/Makefile lib/Makefile src/Makefile pdf2swf/Makefile pdf2swf/xpdf/Makefile pdf2swf/ttf2pt1/Makefile pdf2swf/fonts/Makefile swfs/Makefile"
fi
fi
+AC_SUBST(JPEG2SWF)
AC_OUTPUT(${FILES})
AC_OUTPUT(${FILES})