X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=configure.in;h=7d35992eb35b89bbe7c1f740d3c377594d67e9bd;hp=0ad3077711a9cd507f1f63c2d03a4e1e356d8c67;hb=c41f4433d3e721073c60d55cd923a087761e45f7;hpb=42834fabcae7a30ff40887d334dfb871bf2cb35b diff --git a/configure.in b/configure.in index 0ad3077..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-06-23-2005 +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" @@ -229,7 +235,8 @@ 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 sys/time.h sys/resource.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/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]) @@ -246,19 +253,24 @@ 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 getrusage mallinfo) + 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 +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 @@ -268,7 +280,7 @@ else if test -f lib/lame/Makefile.in; then lame_in_source='$(lame_objects)' lame_makefile="lib/lame/Makefile" - CPPFLAGS="$CPPFLAGS -Ilame" + 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 @@ -279,14 +291,56 @@ 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 + 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_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]) + # ------------------------------------------------------------------ RFX_CHECK_AVI2SWF @@ -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= @@ -471,13 +525,25 @@ AH_BOTTOM([ #define HAVE_FREETYPE_H 1 #endif -#endif // __config_h__ -]) +#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 -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 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