From ea05d6482829c92dc5c37002e0b532ac94fb12d4 Mon Sep 17 00:00:00 2001 From: kramm Date: Mon, 9 Jun 2008 10:27:21 +0000 Subject: [PATCH] AC_DEFINE_UNQUOTED patch from Patrice Dumas --- configure.in | 16 ++++++++-------- m4/avi2swf.m4 | 6 +++--- m4/backticks.m4 | 6 +++--- m4/byteorder.m4 | 12 ++++++------ m4/fontconfig.m4 | 8 ++++---- m4/freetype.m4 | 20 ++++++++++---------- m4/gcc.2.95.m4 | 2 +- m4/mingw.m4 | 12 ++++++------ m4/python.m4 | 8 ++++---- 9 files changed, 45 insertions(+), 45 deletions(-) diff --git a/configure.in b/configure.in index 8d75f29..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=2008-04-02-1230 +VERSION=2008-06-08-1156 # ------------------------------------------------------------------ @@ -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) diff --git a/m4/avi2swf.m4 b/m4/avi2swf.m4 index 7ba5532..906fef1 100644 --- a/m4/avi2swf.m4 +++ b/m4/avi2swf.m4 @@ -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 diff --git a/m4/backticks.m4 b/m4/backticks.m4 index 73366d9..6c7b620 100644 --- a/m4/backticks.m4 +++ b/m4/backticks.m4 @@ -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 diff --git a/m4/byteorder.m4 b/m4/byteorder.m4 index 1bde3ae..9537533 100644 --- a/m4/byteorder.m4 +++ b/m4/byteorder.m4 @@ -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) diff --git a/m4/fontconfig.m4 b/m4/fontconfig.m4 index 6cfc6a0..9e91250 100644 --- a/m4/fontconfig.m4 +++ b/m4/fontconfig.m4 @@ -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 diff --git a/m4/freetype.m4 b/m4/freetype.m4 index 03b74df..f4ed031 100644 --- a/m4/freetype.m4 +++ b/m4/freetype.m4 @@ -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";then # 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 diff --git a/m4/gcc.2.95.m4 b/m4/gcc.2.95.m4 index d607b66..f8fa039 100644 --- a/m4/gcc.2.95.m4 +++ b/m4/gcc.2.95.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(RFX_CHECK_OLDGCC, +AC_DEFUN([RFX_CHECK_OLDGCC], [ AC_MSG_CHECKING([whether gcc supports lazy variable declaration]) diff --git a/m4/mingw.m4 b/m4/mingw.m4 index 3486ba4..c4d0434 100644 --- a/m4/mingw.m4 +++ b/m4/mingw.m4 @@ -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 diff --git a/m4/python.m4 b/m4/python.m4 index c697728..53493e9 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -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 ]) -- 1.7.10.4