X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=configure.in;h=8108961bf76228112495910cc5b3549030a6d122;hp=6be5da7a22fb9143d99a1e93c781c790de363d0e;hb=ea05d6482829c92dc5c37002e0b532ac94fb12d4;hpb=a4bdcfe2e93b1b79d705f9f8c5db5169483b393e diff --git a/configure.in b/configure.in index 6be5da7..8108961 100644 --- a/configure.in +++ b/configure.in @@ -21,7 +21,7 @@ AC_ARG_ENABLE(lame, [ --disable-lame don't compile any L.A.M.E. mp3 encoding code in], DISABLE_LAME=true) PACKAGE=swftools -VERSION=0.8.0 +VERSION=2008-06-08-1156 # ------------------------------------------------------------------ @@ -60,6 +60,10 @@ else CXXFLAGS="$WARNINGS -O -fomit-frame-pointer $CXXFLAGS" fi fi + +CFLAGS="-fPIC $CFLAGS" +CXXFLAGS="-fPIC $CFLAGS" + #OLDGCC=1 #if test "x$OLDGCC" '!=' "x";then # #CFLAGS="$CFLAGS --std=c89 -ansi -pendantic" @@ -149,7 +153,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" @@ -208,7 +212,6 @@ if test "x$ZLIBMISSING" = "xtrue";then fi AC_CHECK_LIB(jpeg, jpeg_write_raw_data,, JPEGLIBMISSING=true) -AC_CHECK_LIB(t1, T1_LoadFont,, T1LIBMISSING=true) AC_CHECK_LIB(ungif, DGifOpen,, UNGIFMISSING=true) if test "$UNGIFMISSING";then UNGIFMISSING= @@ -226,10 +229,10 @@ dnl Checks for header files. AC_CONFIG_HEADER(config.h) AC_HEADER_DIRENT AC_HEADER_STDC - AC_CHECK_HEADERS(zlib.h gif_lib.h jpeglib.h t1lib.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_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_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") -AC_DEFINE_UNQUOTED(VERSION, "$VERSION") +AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) +AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package]) AC_SUBST(PACKAGE) AC_SUBST(VERSION) @@ -243,7 +246,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 mkstemp stat lrand48 rand srand48 srand bcopy bzero time) + AC_CHECK_FUNCS(popen wcschr wcsdup mkstemp stat lrand48 rand srand48 srand bcopy bzero time getrusage mallinfo) AC_CHECK_SIZEOF([signed]) AC_CHECK_SIZEOF([unsigned]) @@ -254,7 +257,7 @@ AC_CHECK_SIZEOF([unsigned long long]) RFX_CHECK_FREETYPE -#RFX_CHECK_FONTCONFIG +RFX_CHECK_FONTCONFIG lame_objects= lame_makefile= @@ -266,7 +269,7 @@ else 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_makefile="lib/lame/Makefile" CPPFLAGS="$CPPFLAGS -Ilame" - AC_DEFINE_UNQUOTED(HAVE_LAME, 1) + 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" @@ -278,7 +281,7 @@ else 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) + AC_DEFINE([HAVE_LAME], [1]) fi fi fi @@ -290,7 +293,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 @@ -307,7 +310,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) @@ -338,9 +341,9 @@ if test "x$JPEGLIBMISSING" = "xtrue";then DISABLEJPEG2SWF=true PARTIAL=true fi -if test "x$T1LIBMISSING" = "xtrue";then - MISSINGLIBS="${MISSINGLIBS} t1lib" -fi +#if test "x$T1LIBMISSING" = "xtrue";then +# MISSINGLIBS="${MISSINGLIBS} t1lib" +#fi if test "x$UNGIFMISSING" = "xtrue";then DISABLEGIF2SWF=true MISSINGLIBS="${MISSINGLIBS} ungif" @@ -358,9 +361,9 @@ if test "x$HAVE_FREETYPE" '!=' "x1"; then MISSINGLIBS="${MISSINGLIBS} freetype" PARTIAL=true fi -if test "x${ac_cv_header_t1lib_h}" '!=' "xyes"; then - MISSINGLIBS="${MISSINGLIBS} t1lib.h" -fi +#if test "x${ac_cv_header_t1lib_h}" '!=' "xyes"; then +# MISSINGLIBS="${MISSINGLIBS} t1lib.h" +#fi if test "x${ac_cv_header_gif_lib_h}" '!=' "xyes"; then DISABLEGIF2SWF=true MISSINGLIBS="${MISSINGLIBS} gif_lib.h" @@ -447,9 +450,8 @@ fi # ------------------------------------------------------------------ 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" - -dnl old autoconf +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" AC_OUTPUT(${FILES}) dnl new autoconf