X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=configure.in;h=7d35992eb35b89bbe7c1f740d3c377594d67e9bd;hp=cbae8a543b567dfbed5f89532653ad3db5dac726;hb=bf04757cd94e94c1f67fa3d2a4e3e59fa5bce0c0;hpb=b474880d62af3ea84ac5f79a1f398b0dbb3f9130 diff --git a/configure.in b/configure.in index cbae8a5..7d35992 100644 --- a/configure.in +++ b/configure.in @@ -19,9 +19,13 @@ 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], DISABLE_LAME=true) +AC_ARG_WITH([external-libart], +[ --with-external-libart use external libart library (currently broken)], [EXTERNAL_LIBART=true]) +AC_ARG_WITH([poppler], +[ --with-poppler use poppler instead of internal xpdf (currently broken)], [USE_POPPLER=true]) PACKAGE=swftools -VERSION=2008-04-02-1230 +VERSION=0.9.0 # ------------------------------------------------------------------ @@ -133,6 +137,8 @@ fi AC_PROG_LN_S AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, ) +PKG_PROG_PKG_CONFIG + dnl Checks for system services OBJEXT="o" AREXT=".a" @@ -153,7 +159,7 @@ RFX_CHECK_MING SLEXT="so" if test "x${MINGW}" != "xyes"; then # no mingW - AC_DEFINE_UNQUOTED(O_BINARY, 0) + AC_DEFINE([O_BINARY], [0], [Not defined on mingw]) else # mingW SLEXT="dll" @@ -229,10 +235,11 @@ dnl Checks for header files. AC_CONFIG_HEADER(config.h) AC_HEADER_DIRENT AC_HEADER_STDC - 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_CHECK_HEADERS(zlib.h gif_lib.h io.h wchar.h jpeglib.h assert.h signal.h pthread.h sys/stat.h sys/mman.h sys/types.h dirent.h sys/bsdtypes.h sys/ndir.h sys/dir.h ndir.h time.h sys/time.h sys/resource.h) + +AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) +AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package]) AC_SUBST(PACKAGE) AC_SUBST(VERSION) @@ -246,30 +253,35 @@ dnl Checks for typedefs, structures, and compiler characteristics. AC_TYPE_SIZE_T AC_STRUCT_TM AC_CHECK_TYPE(boolean,int) #needed for jpeglib - AC_CHECK_FUNCS(popen wcschr wcsdup mkstemp stat lrand48 rand srand48 srand bcopy bzero time) + AC_CHECK_FUNCS(popen wcschr wcsdup mkstemp stat mmap lrand48 rand srand48 srand bcopy bzero time getrusage mallinfo) +AC_CHECK_SIZEOF([signed char]) +AC_CHECK_SIZEOF([signed short]) 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]) +AC_CHECK_SIZEOF([void*]) RFX_CHECK_FREETYPE RFX_CHECK_FONTCONFIG -lame_objects= +RFX_CHECK_OPENGL +if test "$HAVE_OPENGL";then + DEVICE_OPENGL='devices/opengl.$(O)' + AC_SUBST(DEVICE_OPENGL) +fi + +lame_in_source= lame_makefile= if test "x${DISABLE_LAME}" = "xtrue"; then echo "*" Disabling lame support... 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_in_source='$(lame_objects)' lame_makefile="lib/lame/Makefile" - CPPFLAGS="$CPPFLAGS -Ilame" - AC_DEFINE_UNQUOTED(HAVE_LAME, 1) + CPPFLAGS="$CPPFLAGS -Ilame -Ilib/lame" + AC_DEFINE([HAVE_LAME], [1], [have/use internal l.a.m.e. mp3 library]) else if test -d /usr/include/lame; then CPPFLAGS="$CPPFLAGS -I /usr/include/lame" @@ -279,13 +291,55 @@ else fi fi AC_CHECK_LIB(mp3lame, lame_init,, NO_LIBMP3LAME=1) - AC_CHECK_HEADERS(lame.h) - if test "x$NO_LIBMP3LAME" "!=" "x1" -a "x$ac_cv_header_lame_h" "!=" "x";then - AC_DEFINE_UNQUOTED(HAVE_LAME, 1) + HASLAMEHEADER= + AC_CHECK_HEADERS(lame.h,HASLAMEHEADER=1) + if test "x$NO_LIBMP3LAME" "!=" "x1" -a "x$HASLAMEHEADER" '!=' "x";then + AC_DEFINE([HAVE_LAME], [1]) fi fi fi -AC_SUBST(lame_objects) +AC_SUBST(lame_in_source) + +art_in_source='$(art_objects)' +AC_DEFINE([INTERNAL_LIBART], [1], [use internal libart library]) + +if test "x$EXTERNAL_LIBART" = "xtrue"; then + art_in_source= + PKG_CHECK_MODULES([LIBART],[libart-2.0],,[libart_pkgconfig_libart=no]) + if test "x$libart_pkgconfig_libart" = "xno"; then + AC_CHECK_HEADERS([libart_lgpl/libart.h],[ + AC_CHECK_LIB([art_lgpl_2],[art_new],,[]) + ],[AC_MSG_ERROR([No libart library found. This library is required.])]) + else + CPPFLAGS="$CPPFLAGS $LIBART_CFLAGS" + AC_DEFINE([INTERNAL_LIBART], [0]) + LIBS="$LIBS $LIBART_LIBS" + fi +fi +AC_SUBST([art_in_source]) + +xpdf_in_source='$(xpdf_objects)' +splash_in_source='$(splash_objects)' + +if test "x$USE_POPPLER" = "xtrue"; then + xpdf_in_source= + splash_in_source= + AC_DEFINE([HAVE_POPPLER],[1],[use poppler]) + PKG_CHECK_MODULES([POPPLER],[poppler poppler-splash],,[poppler_pkgconfig=no]) + if test "x$poppler_pkgconfig" = "xno"; then + AC_LANG_PUSH([C++]) + AC_CHECK_HEADERS([OutputDev.h],[ + AC_CHECK_LIB([poppler],[main],,[]) + ],[AC_MSG_ERROR([No poppler library found. This library is required.])]) + AC_LANG_POP + else + CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS" + AC_DEFINE([HAVE_POPPLER], [1]) + LIBS="$LIBS $POPPLER_LIBS" + fi +fi +AC_SUBST([xpdf_in_source]) +AC_SUBST([splash_in_source]) # ------------------------------------------------------------------ @@ -293,7 +347,7 @@ RFX_CHECK_AVI2SWF if test "x${AVIFILE}" = "xtrue"; then VIDEO_LIBS="$VIDEO_LIBS $AVIFILE_LIBS" VIDEO_CFLAGS="$VIDEO_CFLAGS $AVIFILE_CFLAGS" - AC_DEFINE_UNQUOTED(HAVE_AVIFILE, 1) + AC_DEFINE([HAVE_AVIFILE], [1], [Define if avifile is present]) fi if test "x${WIN32}" != "x"; then @@ -310,7 +364,7 @@ AC_SUBST(VIDEO_CFLAGS) # ------------------------------------------------------------------ if test "x${UNCOMPRESS}" = "xgzip"; then - AC_DEFINE_UNQUOTED(USE_GZIP, 1) + AC_DEFINE([USE_GZIP], [1], [Define if gzip is present]) fi AC_SUBST(USE_GZIP) @@ -402,7 +456,7 @@ LIBPDF='libpdf$(A)' if test "x${DISABLEPDF2SWF}" = "xtrue"; then echo "* Disabling pdf2swf tool..." rm -f lib/pdf/Makefile - echo all install uninstall clean: > lib/pdf/Makefile + echo all install uninstall clean libpdf: > lib/pdf/Makefile pdf2swf_makefile="" PDF2SWF= LIBPDF= @@ -449,9 +503,47 @@ fi # ------------------------------------------------------------------ +AH_TOP([ +#ifndef __config_h__ +#define __config_h__ +]) + +AH_BOTTOM([ +#ifdef HAVE_ZLIB_H +#ifdef HAVE_LIBZ +#define HAVE_ZLIB +#endif +#endif + +#ifdef HAVE_JPEGLIB_H +#ifdef HAVE_LIBJPEG +#define HAVE_JPEGLIB +#endif +#endif + +#ifdef HAVE_FT2BUILD_H +#define HAVE_FREETYPE_H 1 +#endif + +#ifdef HAVE_GL_GL_H +#ifdef HAVE_GL_GLUT_H +#ifdef HAVE_OPENGL +#define USE_OPENGL +#endif +#endif +#endif + +#ifdef HAVE_POPPLER +#define GString GooString +#define GHash GooHash +#endif + +#endif // __config_h__ +]) + if test -f "release.in"; then release_in="./release"; fi -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" +if test -f "Makefile.new.in"; then mk_in="./Makefile.new"; fi +FILES="$release_in $mk_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile lib/readers/Makefile" AC_OUTPUT(${FILES}) dnl new autoconf