X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=configure.in;h=ea8a51fa0a4b51c4f9afc343e514c298ed0a193a;hp=02c64b9b233ff4408e15aba43faa2988903af65f;hb=9e546e0ca2d4472b77020cfc745f281b7864e6f9;hpb=671993eb728bc7deb48ebb02d2532766d0deadf7 diff --git a/configure.in b/configure.in index 02c64b9..ea8a51f 100644 --- a/configure.in +++ b/configure.in @@ -19,13 +19,11 @@ 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-09-22-1956 +VERSION=0.9.0 # ------------------------------------------------------------------ @@ -90,6 +88,10 @@ case $host_os in CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS -fno-rtti" SHARED="-bundle" + if test -d /opt/local/include && test -d /opt/local/lib; then + CPPFLAGS="${CPPFLAGS} -I/opt/local/include" + LDFLAGS="${LDFLAGS} -L/opt/local/lib" + fi # Use fink packages if available. #if test -d /sw/include && test -d /sw/lib; then # CPPFLAGS="${CPPFLAGS} -I/sw/include" @@ -111,7 +113,7 @@ if test "x$GCC_IS_OK" '=' "x";then echo "***************************************************" echo "* Your gcc is too old to compile this!" echo "* " - echo "* The last version compilable by this compiler is " + echo "* The last version compileable by this compiler is " echo "* swftools 0.7.0, which you can download from " echo "* http://www.swftools.org/swftools-0.7.0.tar.gz " echo "* ." @@ -137,7 +139,7 @@ fi AC_PROG_LN_S AC_CHECK_PROGS(UNCOMPRESS, gzip uncompress compress, ) -PKG_PROG_PKG_CONFIG +dnl PKG_PROG_PKG_CONFIG dnl Checks for system services OBJEXT="o" @@ -236,7 +238,7 @@ dnl Checks for header files. 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]) @@ -253,7 +255,7 @@ 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]) @@ -280,7 +282,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 @@ -291,52 +293,39 @@ 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)' +art_in_source='$(art_objects)' splash_in_source='$(splash_objects)' +xpdf_in_source='$(xpdf_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 +dnl if test "x$USE_POPPLER" = "xtrue"; then +dnl xpdf_in_source= +dnl splash_in_source= +dnl AC_DEFINE([HAVE_POPPLER],[1],[use poppler]) +dnl PKG_CHECK_MODULES([POPPLER],[poppler poppler-splash],,[poppler_pkgconfig=no]) +dnl if test "x$poppler_pkgconfig" = "xno"; then +dnl AC_LANG_PUSH([C++]) +dnl AC_CHECK_HEADERS([OutputDev.h],[ +dnl AC_CHECK_LIB([poppler],[main],,[]) +dnl ],[AC_MSG_ERROR([No poppler library found. This library is required.])]) +dnl AC_LANG_POP +dnl else +dnl CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS" +dnl AC_DEFINE([HAVE_POPPLER], [1]) +dnl LIBS="$LIBS $POPPLER_LIBS" +dnl fi +dnl fi + +AC_SUBST([art_in_source]) AC_SUBST([xpdf_in_source]) AC_SUBST([splash_in_source]) @@ -540,9 +529,9 @@ AH_BOTTOM([ #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