? m4/gcc_2_95.m4 Index: config.h.in =================================================================== RCS file: /cvsroot/swftools/swftools/config.h.in,v retrieving revision 1.37 diff -u -3 -p -r1.37 config.h.in --- config.h.in 8 May 2008 08:14:16 -0000 1.37 +++ config.h.in 6 Jun 2008 09:52:17 -0000 @@ -1,212 +1,262 @@ -#ifndef __config_h__ -#define __config_h__ +/* config.h.in. Generated from configure.in by autoheader. */ -/* Define to empty if the keyword does not work. */ -#undef const +/* Define if Avifile is available */ +#undef AVIFILE -/* Define as __inline if that's what the C compiler calls it. */ -#undef inline +/* Define on cygwin */ +#undef CYGWIN -/* Define to `long' if doesn't define. */ -#undef off_t +/* Define to 1 if you have the header file. */ +#undef HAVE_ASSERT_H -/* Define to `unsigned' if doesn't define. */ -#undef size_t +/* Define if avifile is present */ +#undef HAVE_AVIFILE -#undef SIZEOF_SIGNED -#undef SIZEOF_UNSIGNED -#undef SIZEOF_SIGNED_LONG -#undef SIZEOF_UNSIGNED_LONG -#undef SIZEOF_SIGNED_LONG_LONG -#undef SIZEOF_UNSIGNED_LONG_LONG +/* Define to 1 if you have the header file. */ +#undef HAVE_AVIFILE_VERSION_H -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS +/* Define to 1 if you have the `bcopy' function. */ +#undef HAVE_BCOPY -/* Define if your declares struct tm. */ -#undef TM_IN_SYS_TIME +/* Define to 1 if you have the `bzero' function. */ +#undef HAVE_BZERO -/* Define if you have the time() function */ -#undef HAVE_TIME +/* Define to 1 if you have the header file. */ +#undef HAVE_DIRENT_H -/* Define if you have the time.h header file */ -#undef HAVE_TIME_H +/* Define if fontconfig is available */ +#undef HAVE_FONTCONFIG -/* Define if you have the sys/time.h header file */ -#undef HAVE_SYS_TIME_H +/* Define to 1 if you have the header file. */ +#undef HAVE_FONTCONFIG_H -/* Define if you have the sys/resource.h header file */ -#undef HAVE_SYS_RESOURCE_H +/* have/use freetype library */ +#undef HAVE_FREETYPE -/* Define if you have the malloc.h header file */ -#undef HAVE_MALLOC_H +/* Define if freetype headers are available */ +#undef HAVE_FREETYPE_FREETYPE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_FT2BUILD_H -/* Define if you have the getrusage function */ +/* Define to 1 if you have the `getrusage' function. */ #undef HAVE_GETRUSAGE -/* Define if you have the mallinfo function */ -#undef HAVE_MALLINFO +/* Define to 1 if you have the header file. */ +#undef HAVE_GIF_LIB_H +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H -/* Define if you have the unistd.h header file */ -#undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_IO_H -/* for gocr */ -#undef HAVE_WCHAR_H -#undef HAVE_WCSCHR -#undef HAVE_WCSDUP +/* Define to 1 if you have the header file. */ +#undef HAVE_JPEGLIB_H + +/* Define if lame is present */ +#undef HAVE_LAME + +/* Define to 1 if you have the header file. */ +#undef HAVE_LAME_H + +/* Define to 1 if you have the `gif' library (-lgif). */ +#undef HAVE_LIBGIF + +/* Define to 1 if you have the `jpeg' library (-ljpeg). */ +#undef HAVE_LIBJPEG + +/* Define to 1 if you have the `m' library (-lm). */ +#undef HAVE_LIBM -/* Define if you have the lrand48 function. */ +/* Define to 1 if you have the `mp3lame' library (-lmp3lame). */ +#undef HAVE_LIBMP3LAME + +/* Define to 1 if you have the `ungif' library (-lungif). */ +#undef HAVE_LIBUNGIF + +/* Define to 1 if you have the `z' library (-lz). */ +#undef HAVE_LIBZ + +/* Define to 1 if you have the `lrand48' function. */ #undef HAVE_LRAND48 -/* Define if you have the mkstemp function. */ +/* Define to 1 if you have the `mallinfo' function. */ +#undef HAVE_MALLINFO + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `mkstemp' function. */ #undef HAVE_MKSTEMP -/* Define if you have the popen function. */ +/* Define to 1 if you have the header file. */ +#undef HAVE_NDIR_H + +/* Define to 1 if you have the `popen' function. */ #undef HAVE_POPEN -/* Define if you have the bcopy function. */ -#undef HAVE_BCOPY +/* Define to 1 if you have the header file. */ +#undef HAVE_PTHREAD_H -/* Define if you have the bzero function. */ -#undef HAVE_BZERO +/* whether python-imaging was found */ +#undef HAVE_PYTHON_IMAGING -/* Define if you have the rand function. */ +/* Define to 1 if you have the `rand' function. */ #undef HAVE_RAND -/* Define if you have the srand function. */ +/* Define to 1 if you have the header file. */ +#undef HAVE_SIGNAL_H + +/* Define to 1 if you have the `srand' function. */ #undef HAVE_SRAND -/* Define if you have the srand48 function. */ +/* Define to 1 if you have the `srand48' function. */ #undef HAVE_SRAND48 -/* Define if you have the stat function. */ +/* Define to 1 if you have the `stat' function. */ #undef HAVE_STAT -/* Define if you have the header file. */ -#undef HAVE_DIRENT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H -/* Define if you have the header file. */ -#undef HAVE_ASSERT_H - -/* Define if you have the header file. */ -#undef HAVE_SIGNAL_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H -/* Define if you have the header file. */ -#undef HAVE_PTHREAD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H -/* Define if you have the header file. */ -#undef HAVE_JPEGLIB_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H -/* Define if you have the header file. */ -#undef HAVE_NDIR_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_BSDTYPES_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_DIR_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_NDIR_H -/* Define if you have the header file. */ -#undef HAVE_IO_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_BSDTYPES_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_RESOURCE_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H -/* Define if you have the header file. */ -#undef HAVE_SYS_TYPES_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TIME_H -/* Define if you have the header file. */ -/* #undef HAVE_T1LIB_H */ +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H -/* Define if you have the header file. */ -#undef HAVE_ZLIB_H +/* Define to 1 if you have the `time' function. */ +#undef HAVE_TIME -/* Define if you have the header file. */ -#undef HAVE_AVIFILE_VERSION_H +/* Define to 1 if you have the header file. */ +#undef HAVE_TIME_H -/* Define if you have the header file. */ -#undef HAVE_FT2BUILD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H -/* Define if you have the header file. */ +/* Define to 1 if you have the header file. */ #undef HAVE_VERSION_H -/* Define if you have the jpeg library (-ljpeg). */ -/* Define if you have the jpeg library (-ljpeg). */ -#undef HAVE_LIBJPEG +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H -/* Define if you have the m library (-lm). */ -#undef HAVE_LIBM +/* Define to 1 if you have the `wcschr' function. */ +#undef HAVE_WCSCHR + +/* Define to 1 if you have the `wcsdup' function. */ +#undef HAVE_WCSDUP -/* Define if you have the t1 library (-lt1). */ -/* #undef HAVE_LIBT1 */ +/* Define to 1 if you have the header file. */ +#undef HAVE_ZLIB_H -/* Define if you have the z library (-lz). */ -#undef HAVE_LIBZ +/* Define if not on cygwin or mingw */ +#undef LINUX + +/* Define on Mingw */ +#undef MINGW + +/* Not defined on mingw */ +#undef O_BINARY /* Name of package */ #undef PACKAGE -/* Version number of package */ -#undef VERSION +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT -/* Typedefs */ -#undef boolean +/* Define to the full name of this package. */ +#undef PACKAGE_NAME -/* use gzip/uncompress */ -#undef USE_GZIP +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING -/* let ttf2pt1 use libfreetype */ -#undef USE_FREETYPE +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME -/* have/use freetype library */ -#undef HAVE_FREETYPE -#undef HAVE_FREETYPE_FREETYPE_H +/* Define to the version of this package. */ +#undef PACKAGE_VERSION -/* have/use freetype library */ -#undef HAVE_AVIFILE +/* The size of `signed', as computed by sizeof. */ +#undef SIZEOF_SIGNED -#undef HAVE_FONTCONFIG_H -#undef HAVE_FONTCONFIG +/* The size of `signed long', as computed by sizeof. */ +#undef SIZEOF_SIGNED_LONG -/* have/use internal l.a.m.e. mp3 library */ -#undef HAVE_LAME +/* The size of `signed long long', as computed by sizeof. */ +#undef SIZEOF_SIGNED_LONG_LONG -/* whether python-imaging was found */ -#undef HAVE_PYTHON_IMAGING +/* The size of `unsigned', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED + +/* The size of `unsigned long', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_LONG -/* system() can handle command substitution */ +/* The size of `unsigned long long', as computed by sizeof. */ +#undef SIZEOF_UNSIGNED_LONG_LONG + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define if system handles command substitution */ #undef SYSTEM_BACKTICKS -/* Define to 1 if this machine has network byte order*/ -#undef WORDS_BIGENDIAN +/* Define to 1 if your declares `struct tm'. */ +#undef TM_IN_SYS_TIME -/* Define to 0 on non-windows systems */ -#undef O_BINARY +/* Define if freetype is available */ +#undef USE_FREETYPE -#ifdef HAVE_ZLIB_H -#ifdef HAVE_LIBZ -#define HAVE_ZLIB -#endif -#endif +/* Define if gzip is present */ +#undef USE_GZIP -#ifdef HAVE_JPEGLIB_H -#ifdef HAVE_LIBJPEG -#define HAVE_JPEGLIB -#endif -#endif +/* Version number of package */ +#undef VERSION -#ifdef HAVE_FT2BUILD_H -#define HAVE_FREETYPE_H 1 -#endif +/* Define on windows */ +#undef WIN32 + +/* Define to 1 if this machine has network byte order */ +#undef WORDS_BIGENDIAN + +/* Define to `int' if does not define. */ +#undef boolean -/* #ifdef HAVE_T1LIB_H */ -/* #ifdef HAVE_LIBT1 */ -/* #define HAVE_T1LIB */ -/* #endif */ -/* #endif */ +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline #endif + +/* Define to `long int' if does not define. */ +#undef off_t + +/* Define to `unsigned int' if does not define. */ +#undef size_t Index: configure.in =================================================================== RCS file: /cvsroot/swftools/swftools/configure.in,v retrieving revision 1.124 diff -u -3 -p -r1.124 configure.in --- configure.in 8 May 2008 08:14:27 -0000 1.124 +++ configure.in 6 Jun 2008 09:52:17 -0000 @@ -153,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" @@ -231,8 +231,8 @@ dnl Checks for header files. 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_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) @@ -269,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" @@ -281,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 @@ -293,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 @@ -310,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) Index: m4/avi2swf.m4 =================================================================== RCS file: /cvsroot/swftools/swftools/m4/avi2swf.m4,v retrieving revision 1.9 diff -u -3 -p -r1.9 avi2swf.m4 --- m4/avi2swf.m4 6 Jan 2006 20:39:04 -0000 1.9 +++ m4/avi2swf.m4 6 Jun 2008 09:52:18 -0000 @@ -1,7 +1,7 @@ -AC_DEFUN(RFX_CHECK_AVI2SWF, +AC_DEFUN([RFX_CHECK_AVI2SWF], [ -AC_CHECK_PROGS(AVIFILE_CONFIG, avifile-config) +AC_CHECK_PROGS([AVIFILE_CONFIG], [avifile-config]) if test "x$AVIFILE_CONFIG" '!=' "x";then OLDCPPFLAGS="$CPPFLAGS" @@ -109,7 +109,7 @@ if test "x$AVIFILE_CONFIG" '!=' "x";then AC_MSG_RESULT(yes) AVIFILE=true export AVIFILE - AC_DEFINE_UNQUOTED(AVIFILE, true) + AC_DEFINE([AVIFILE], [true], [Define if Avifile is available]) else echo "configure: failed program was:" >&5 cat conftest.cpp >&5 Index: m4/backticks.m4 =================================================================== RCS file: /cvsroot/swftools/swftools/m4/backticks.m4,v retrieving revision 1.2 diff -u -3 -p -r1.2 backticks.m4 --- m4/backticks.m4 10 Sep 2005 12:30:37 -0000 1.2 +++ m4/backticks.m4 6 Jun 2008 09:52:18 -0000 @@ -1,4 +1,4 @@ -AC_DEFUN(RFX_CHECK_SYSTEM_BACKTICKS, +AC_DEFUN([RFX_CHECK_SYSTEM_BACKTICKS], [ AC_MSG_CHECKING([whether system() can handle command substitution]) AC_TRY_RUN([ @@ -7,7 +7,7 @@ int main (int argc, char*argv[]) { return system("test `touch config.tmp2`"); } -], OK=OK,,CROSSCOMPILE=1) +], [OK=OK],,[CROSSCOMPILE=1]) if test "x${OK}" = "xOK";then test -f config.tmp2 || OK= @@ -21,7 +21,7 @@ rm -f config.tmp2 AC_MSG_RESULT(yes) SYSTEM_BACKTICKS=1 export SYSTEM_BACKTICKS -AC_DEFINE_UNQUOTED(SYSTEM_BACKTICKS, 1) +AC_DEFINE([SYSTEM_BACKTICKS], [1], [Define if system handles command substitution]) else AC_MSG_RESULT(no) fi Index: m4/byteorder.m4 =================================================================== RCS file: /cvsroot/swftools/swftools/m4/byteorder.m4,v retrieving revision 1.2 diff -u -3 -p -r1.2 byteorder.m4 --- m4/byteorder.m4 8 Dec 2002 16:55:16 -0000 1.2 +++ m4/byteorder.m4 6 Jun 2008 09:52:18 -0000 @@ -1,4 +1,4 @@ -AC_DEFUN(RFX_CHECK_BYTEORDER, +AC_DEFUN([RFX_CHECK_BYTEORDER], [ AC_MSG_CHECKING([for byte order]) AC_TRY_RUN([ @@ -7,11 +7,11 @@ int main (int argc, char *argv[]) int i = 1; return *(char*)&i; } -], BIGENDIAN=1, LITTLEENDIAN=1, CROSSCOMPILE=1) +], [BIGENDIAN=1], [LITTLEENDIAN=1], [CROSSCOMPILE=1]) export CROSSCOMPILE if test "x${CROSSCOMPILE}" = "x1"; then - AC_MSG_RESULT(we are cross compiling- trying to guess from system type) + AC_MSG_RESULT([we are cross compiling- trying to guess from system type]) AC_CANONICAL_SYSTEM AC_MSG_CHECKING([for byte order, try 2]) case "${target}" in @@ -26,16 +26,16 @@ fi export LITTLEENDIAN if test "x${LITTLEENDIAN}" = "x1"; then -AC_MSG_RESULT(little endian) +AC_MSG_RESULT([little endian]) BYTEORDERCHECKOK=1 fi export BIGENDIAN if test "x${BIGENDIAN}" = "x1"; then -AC_MSG_RESULT(big endian) +AC_MSG_RESULT([big endian]) BYTEORDERCHECKOK=1 WORDS_BIGENDIAN=1 export WORDS_BIGENDIAN -AC_DEFINE_UNQUOTED(WORDS_BIGENDIAN, 1) +AC_DEFINE([WORDS_BIGENDIAN], [1], [Define to 1 if this machine has network byte order]) fi if test "x${BYTEORDERCHECKOK}" != "x1"; then AC_MSG_RESULT(unknown) Index: m4/fontconfig.m4 =================================================================== RCS file: /cvsroot/swftools/swftools/m4/fontconfig.m4,v retrieving revision 1.3 diff -u -3 -p -r1.3 fontconfig.m4 --- m4/fontconfig.m4 14 Apr 2008 17:15:40 -0000 1.3 +++ m4/fontconfig.m4 6 Jun 2008 09:52:18 -0000 @@ -15,7 +15,7 @@ # Substitutes: # -AC_DEFUN(RFX_CHECK_FONTCONFIG, +AC_DEFUN([RFX_CHECK_FONTCONFIG], [ OLDCPPFLAGS="${CPPFLAGS}" OLDLIBS="${LIBS}" @@ -24,8 +24,8 @@ if test -d /usr/include/fontconfig; then CPPFLAGS="$CPPFLAGS -I/usr/include/fontconfig" fi -AC_CHECK_LIB(fontconfig, FcInit,HAVE_LIB_FONTCONFIG=1,) -AC_CHECK_HEADERS(fontconfig.h,HAVE_FONTCONFIG_H=1) +AC_CHECK_LIB(fontconfig, FcInit, [HAVE_LIB_FONTCONFIG=1],) +AC_CHECK_HEADERS(fontconfig.h,[HAVE_FONTCONFIG_H=1]) if test "x${HAVE_LIB_FONTCONFIG}" != "x";then if test "x${HAVE_FONTCONFIG_H}" != "x";then @@ -83,7 +83,7 @@ EOF ac_link='$CC $CPPFLAGS $CFLAGS conftest.c $LDFLAGS $LIBS -o conftest${ac_exeext}' if { (eval echo freetype.m4:71: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_FONTCONFIG, 1) + AC_DEFINE([HAVE_FONTCONFIG], [1], [Define if fontconfig is available]) else echo "configure: failed program was:" >&5 cat conftest.c >&5 Index: m4/freetype.m4 =================================================================== RCS file: /cvsroot/swftools/swftools/m4/freetype.m4,v retrieving revision 1.10 diff -u -3 -p -r1.10 freetype.m4 --- m4/freetype.m4 19 Nov 2006 21:36:49 -0000 1.10 +++ m4/freetype.m4 6 Jun 2008 09:52:18 -0000 @@ -15,10 +15,10 @@ # Substitutes: # -AC_DEFUN(RFX_CHECK_FREETYPE, +AC_DEFUN([RFX_CHECK_FREETYPE], [ -AC_PATH_PROG(FREETYPE_CONFIG, freetype-config,, "$PATH:/usr/local/bin:/sw/bin:/opt/local/bin") +AC_PATH_PROG([FREETYPE_CONFIG], [freetype-config],, ["$PATH:/usr/local/bin:/sw/bin:/opt/local/bin"]) OLDCPPFLAGS="${CPPFLAGS}" OLDLIBS="${LIBS}" @@ -36,12 +36,12 @@ if test "x${FREETYPE_CONFIG}" '=' "x";th # if we didn't find the freetype-config program, we won't # know where the libs are expected to be. So just blindly # try to link against them. - AC_CHECK_LIB(freetype, FT_Init_FreeType,HAVE_LIB_FREETYPE=1,) + AC_CHECK_LIB([freetype], [FT_Init_FreeType],[HAVE_LIB_FREETYPE=1],) fi -AC_CHECK_HEADERS(ft2build.h,HAVE_FT2BUILD_H=1) +AC_CHECK_HEADERS([ft2build.h],[HAVE_FT2BUILD_H=1]) if test "x${HAVE_FT2BUILD_H}" '=' "x";then - AC_CHECK_HEADERS(freetype/freetype.h,HAVE_FREETYPE_FREETYPE_H=1) + AC_CHECK_HEADERS([freetype/freetype.h],[HAVE_FREETYPE_FREETYPE_H=1]) fi if test "x${HAVE_LIB_FREETYPE}" '!=' "x" -o \ @@ -125,15 +125,15 @@ EOF ac_link='$CC $CPPFLAGS $CFLAGS conftest.c $LDFLAGS $LIBS -o conftest${ac_exeext}' if { (eval echo freetype.m4:71: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - AC_MSG_RESULT(yes) - AC_DEFINE_UNQUOTED(HAVE_FREETYPE, 1) - AC_DEFINE_UNQUOTED(HAVE_FREETYPE_FREETYPE_H, 1) - AC_DEFINE_UNQUOTED(USE_FREETYPE, 1) # for ttf2tp1 + AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_FREETYPE], [1], [have/use freetype library]) + AC_DEFINE([HAVE_FREETYPE_FREETYPE_H], [1], [Define if freetype headers are available]) + AC_DEFINE([USE_FREETYPE], [1], [Define if freetype is available]) # for ttf2tp1 else echo "configure: failed program was:" >&5 cat conftest.c >&5 HAVE_FREETYPE=0 - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi rm -f conftest* fi Index: m4/gcc.2.95.m4 =================================================================== RCS file: /cvsroot/swftools/swftools/m4/gcc.2.95.m4,v retrieving revision 1.4 diff -u -3 -p -r1.4 gcc.2.95.m4 --- m4/gcc.2.95.m4 19 Nov 2006 21:37:23 -0000 1.4 +++ m4/gcc.2.95.m4 6 Jun 2008 09:52:18 -0000 @@ -1,4 +1,4 @@ -AC_DEFUN(RFX_CHECK_OLDGCC, +AC_DEFUN([RFX_CHECK_OLDGCC], [ AC_MSG_CHECKING([whether gcc supports lazy variable declaration]) Index: m4/mingw.m4 =================================================================== RCS file: /cvsroot/swftools/swftools/m4/mingw.m4,v retrieving revision 1.4 diff -u -3 -p -r1.4 mingw.m4 --- m4/mingw.m4 19 Nov 2006 21:37:06 -0000 1.4 +++ m4/mingw.m4 6 Jun 2008 09:52:18 -0000 @@ -1,4 +1,4 @@ -AC_DEFUN(RFX_CHECK_MING, +AC_DEFUN([RFX_CHECK_MING], [ AC_CANONICAL_HOST AC_EXEEXT @@ -36,19 +36,19 @@ AC_SUBST(AR) dnl Checks for system services if test "x${CYGWIN}" = "xyes"; then - AC_DEFINE_UNQUOTED(CYGWIN, 1) + AC_DEFINE([CYGWIN], [1], [Define on cygwin]) AC_MSG_RESULT(cygwin) else if test "x${MINGW}" = "xyes"; then - AC_DEFINE_UNQUOTED(MINGW, 1) + AC_DEFINE([MINGW], [1], [Define on Mingw]) WIN32=1 - AC_DEFINE_UNQUOTED(WIN32, 1) + AC_DEFINE([WIN32], [1], [Define on windows]) LIBS="$LIBS -lws2_32 -lgdi32" - AC_MSG_RESULT(mingw) + AC_MSG_RESULT([mingw]) else LINUX=1 export LINUX - AC_DEFINE_UNQUOTED(LINUX, 1) + AC_DEFINE([LINUX], [1], [Define if not on cygwin or mingw]) AC_MSG_RESULT() fi fi Index: m4/python.m4 =================================================================== RCS file: /cvsroot/swftools/swftools/m4/python.m4,v retrieving revision 1.12 diff -u -3 -p -r1.12 python.m4 --- m4/python.m4 12 Dec 2007 10:59:00 -0000 1.12 +++ m4/python.m4 6 Jun 2008 09:52:18 -0000 @@ -1,4 +1,4 @@ -AC_DEFUN(RFX_CHECK_PYTHON, +AC_DEFUN([RFX_CHECK_PYTHON], [ AC_MSG_CHECKING([for Python.h]) @@ -53,7 +53,7 @@ else fi if test "x$PY_VERSION" "!=" "x"; then - AC_MSG_RESULT($PY_VERSION) + AC_MSG_RESULT([$PY_VERSION]) export PYTHON_INCLUDES PYTHON_LIB AC_SUBST(PYTHON_LIB) AC_SUBST(PYTHON_INCLUDES) @@ -97,7 +97,7 @@ EOF ac_link='$CC $CPPFLAGS $CFLAGS $PYTHON_INCLUDES conftest.c $LDFLAGS ${PYTHON_LIB2} $LIBS -o conftest${ac_exeext}' if { (eval echo python.m4: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then PYTHON_LIB="${PYTHON_LIB2}" - AC_DEFINE_UNQUOTED(HAVE_PYTHON_IMAGING, 1) + AC_DEFINE([HAVE_PYTHON_IMAGING], [1], [whether python-imaging was found]) HAVE_PYTHON_IMAGING=yes export HAVE_PYTHON_IMAGING AC_SUBST(HAVE_PYTHON_IMAGING) @@ -114,6 +114,6 @@ EOF fi rm -f conftest* else - AC_MSG_RESULT(nope) + AC_MSG_RESULT([nope]) fi ])