[PATCH] configure.ac: use proper quoting throughout the file

Yann Droneaud yann at droneaud.fr
Mon Mar 15 05:13:36 CDT 2010


Added quoting around macro parameters as recommanded by autoconf:
http://www.gnu.org/software/autoconf/manual/html_node/Autoconf-Language.html#Autoconf-Language

Autoconf output was checked to be the same with and without the patch,
so that it's easy to validate the patch: configure script is exactly the
same with or without the patch.

Note: Quoting were not added for WINE macros related to Makefile generation
as they broke things: there are some quoting magic in aclocal.m4 not
fixed by this patch.
---
 configure.ac |  866 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 433 insertions(+), 433 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8eb37a2..13abf00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,94 +5,94 @@ dnl See ChangeLog file for detailed change history.
 m4_define(WINE_VERSION,regexp(m4_include(VERSION),[version \([-.0-9A-Za-z]+\)],[\1]))
 
 dnl autoconf versions before 2.59d don't handle multi-line subst variables correctly
-AC_PREREQ(2.59d)
+AC_PREREQ([2.59d])
 AC_INIT([Wine],[WINE_VERSION],[wine-devel at winehq.org],[wine],[http://www.winehq.org])
-AC_CONFIG_SRCDIR(server/atom.c)
-AC_CONFIG_HEADERS(include/config.h)
-AC_CONFIG_AUX_DIR(tools)
+AC_CONFIG_SRCDIR([server/atom.c])
+AC_CONFIG_HEADERS([include/config.h])
+AC_CONFIG_AUX_DIR([tools])
 
 dnl autoconf versions before 2.63b don't have AS_VAR_APPEND
-m4_ifdef([AS_VAR_APPEND],,[as_fn_append () { eval $[1]=\$$[1]\$[2]; }
+m4_ifdef([AS_VAR_APPEND],[],[as_fn_append () { eval $[1]=\$$[1]\$[2]; }
 AC_DEFUN([AS_VAR_APPEND],[as_fn_append $1 $2])])dnl
 
 dnl **** Command-line arguments ****
 
-AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 support]))
-AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)]))
-AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests]))
-AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules]),
+AC_ARG_ENABLE([win16], [AS_HELP_STRING([--disable-win16],[do not include Win16 support])])
+AC_ARG_ENABLE([win64], [AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)])])
+AC_ARG_ENABLE([tests], [AS_HELP_STRING([--disable-tests],[do not build the regression tests])])
+AC_ARG_ENABLE([maintainer-mode], [AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules])],[]dnl
                                ,[AC_SUBST([MAINTAINER_MODE],[\#])])
 
-AC_ARG_WITH(alsa,      AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]),
+AC_ARG_WITH([alsa],      [AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support])],
             [if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi])
-AC_ARG_WITH(audioio,   AS_HELP_STRING([--without-audioio],[do not use the AudioIO sound support]),
+AC_ARG_WITH([audioio],   [AS_HELP_STRING([--without-audioio],[do not use the AudioIO sound support])],
             [if test "x$withval" = "xno"; then ac_cv_header_libaudioio_h=no; fi])
-AC_ARG_WITH(capi,      AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN support)]),
+AC_ARG_WITH([capi],      [AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN support)])],
             [if test "x$withval" = "xno"; then ac_cv_header_capi20_h=no; ac_cv_header_linux_capi_h=no; fi])
-AC_ARG_WITH(cms,       AS_HELP_STRING([--without-cms],[do not use CMS (color management support)]),
+AC_ARG_WITH([cms],       [AS_HELP_STRING([--without-cms],[do not use CMS (color management support)])],
             [if test "x$withval" = "xno"; then ac_cv_header_lcms_h=no; ac_cv_header_lcms_lcms_h=no; fi])
-AC_ARG_WITH(coreaudio, AS_HELP_STRING([--without-coreaudio],[do not use the CoreAudio sound support]),
+AC_ARG_WITH([coreaudio], [AS_HELP_STRING([--without-coreaudio],[do not use the CoreAudio sound support])],
             [if test "x$withval" = "xno"; then ac_cv_header_CoreAudio_CoreAudio_h=no; fi])
-AC_ARG_WITH(cups,      AS_HELP_STRING([--without-cups],[do not use CUPS]))
-AC_ARG_WITH(curses,    AS_HELP_STRING([--without-curses],[do not use (n)curses]),
+AC_ARG_WITH([cups],      [AS_HELP_STRING([--without-cups],[do not use CUPS])])
+AC_ARG_WITH([curses],    [AS_HELP_STRING([--without-curses],[do not use (n)curses])],
             [if test "x$withval" = "xno"; then ac_cv_header_ncurses_h=no; ac_cv_header_curses_h=no; fi])
-AC_ARG_WITH(esd,       AS_HELP_STRING([--without-esd],[do not use the EsounD sound support]))
-AC_ARG_WITH(fontconfig,AS_HELP_STRING([--without-fontconfig],[do not use fontconfig]),
+AC_ARG_WITH([esd],       [AS_HELP_STRING([--without-esd],[do not use the EsounD sound support])])
+AC_ARG_WITH([fontconfig],[AS_HELP_STRING([--without-fontconfig],[do not use fontconfig])],
             [if test "x$withval" = "xno"; then ac_cv_header_fontconfig_fontconfig_h=no; fi])
-AC_ARG_WITH(freetype,  AS_HELP_STRING([--without-freetype],[do not use the FreeType library]))
-AC_ARG_WITH(gphoto,    AS_HELP_STRING([--without-gphoto],[do not use gphoto (Digital Camera support)]))
-AC_ARG_WITH(glu,       AS_HELP_STRING([--without-glu],[do not use the GLU library]),
+AC_ARG_WITH([freetype],  [AS_HELP_STRING([--without-freetype],[do not use the FreeType library])])
+AC_ARG_WITH([gphoto],    [AS_HELP_STRING([--without-gphoto],[do not use gphoto (Digital Camera support)])])
+AC_ARG_WITH([glu],       [AS_HELP_STRING([--without-glu],[do not use the GLU library])],
             [if test "x$withval" = "xno"; then ac_cv_header_GL_glu_h=no; fi])
-AC_ARG_WITH(gnutls,    AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (schannel support)]))
-AC_ARG_WITH(gsm,       AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06.10 codec support)]),
+AC_ARG_WITH([gnutls],    [AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (schannel support)])])
+AC_ARG_WITH([gsm],       [AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06.10 codec support)])],
             [if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi])
-AC_ARG_WITH(hal,       AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)]))
-AC_ARG_WITH(jack,      AS_HELP_STRING([--without-jack],[do not use the Jack sound support]),
+AC_ARG_WITH([hal],       [AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)])])
+AC_ARG_WITH([jack],      [AS_HELP_STRING([--without-jack],[do not use the Jack sound support])],
             [if test "x$withval" = "xno"; then ac_cv_header_jack_jack_h=no; fi])
-AC_ARG_WITH(jpeg,      AS_HELP_STRING([--without-jpeg],[do not use JPEG]),
+AC_ARG_WITH([jpeg],      [AS_HELP_STRING([--without-jpeg],[do not use JPEG])],
             [if test "x$withval" = "xno"; then ac_cv_header_jpeglib_h=no; fi])
-AC_ARG_WITH(ldap,      AS_HELP_STRING([--without-ldap],[do not use LDAP]),
+AC_ARG_WITH([ldap],      [AS_HELP_STRING([--without-ldap],[do not use LDAP])],
             [if test "x$withval" = "xno"; then ac_cv_header_ldap_h=no; ac_cv_header_lber_h=no; fi])
-AC_ARG_WITH(mpg123,    AS_HELP_STRING([--without-mpg123],[do not use the mpg123 library]),
+AC_ARG_WITH([mpg123],    [AS_HELP_STRING([--without-mpg123],[do not use the mpg123 library])],
             [if test "x$withval" = "xno"; then ac_cv_header_mpg123_h=no; fi])
-AC_ARG_WITH(nas,       AS_HELP_STRING([--without-nas],[do not use the NAS sound support]),
+AC_ARG_WITH([nas],       [AS_HELP_STRING([--without-nas],[do not use the NAS sound support])],
             [if test "x$withval" = "xno"; then ac_cv_header_audio_audiolib_h=no; fi])
-AC_ARG_WITH(openal,    AS_HELP_STRING([--without-openal],[do not use OpenAL]),
+AC_ARG_WITH([openal],    [AS_HELP_STRING([--without-openal],[do not use OpenAL])],
             [if test "x$withval" = "xno"; then ac_cv_header_AL_al_h=no; ac_cv_header_OpenAL_al_h=no; fi])
-AC_ARG_WITH(opengl,    AS_HELP_STRING([--without-opengl],[do not use OpenGL]))
-AC_ARG_WITH(openssl,   AS_HELP_STRING([--without-openssl],[do not use OpenSSL]),
+AC_ARG_WITH([opengl],    [AS_HELP_STRING([--without-opengl],[do not use OpenGL])])
+AC_ARG_WITH([openssl],   [AS_HELP_STRING([--without-openssl],[do not use OpenSSL])],
             [if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi])
-AC_ARG_WITH(oss,       AS_HELP_STRING([--without-oss],[do not use the OSS sound support]),
+AC_ARG_WITH([oss],       [AS_HELP_STRING([--without-oss],[do not use the OSS sound support])],
             [if test "x$withval" = "xno"; then ac_cv_header_soundcard_h=no; ac_cv_header_sys_soundcard_h=no; ac_cv_header_machine_soundcard_h=no; fi])
-AC_ARG_WITH(png,       AS_HELP_STRING([--without-png],[do not use PNG]),
+AC_ARG_WITH([png],       [AS_HELP_STRING([--without-png],[do not use PNG])],
             [if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi])
-AC_ARG_WITH(pthread,   AS_HELP_STRING([--without-pthread],[do not use the pthread library]),
+AC_ARG_WITH([pthread],   [AS_HELP_STRING([--without-pthread],[do not use the pthread library])],
             [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi])
-AC_ARG_WITH(sane,      AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)]))
-AC_ARG_WITH(v4l,       AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)]))
-AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
+AC_ARG_WITH([sane],      [AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])])
+AC_ARG_WITH([v4l],       [AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])])
+AC_ARG_WITH([xcomposite],[AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension])],
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
-AC_ARG_WITH(xcursor,   AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]),
+AC_ARG_WITH([xcursor],   [AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension])],
             [if test "x$withval" = "xno"; then ac_cv_header_X11_Xcursor_Xcursor_h=no; fi])
-AC_ARG_WITH(xinerama,  AS_HELP_STRING([--without-xinerama],[do not use Xinerama (multi-monitor support)]),
+AC_ARG_WITH([xinerama],  [AS_HELP_STRING([--without-xinerama],[do not use Xinerama (multi-monitor support)])],
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi])
-AC_ARG_WITH(xinput,    AS_HELP_STRING([--without-xinput],[do not use the Xinput extension]),
+AC_ARG_WITH([xinput],    [AS_HELP_STRING([--without-xinput],[do not use the Xinput extension])],
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput_h=no; fi])
-AC_ARG_WITH(xml,       AS_HELP_STRING([--without-xml],[do not use XML]))
-AC_ARG_WITH(xrandr,    AS_HELP_STRING([--without-xrandr],[do not use Xrandr (resolution changes)]),
+AC_ARG_WITH([xml],       [AS_HELP_STRING([--without-xml],[do not use XML])])
+AC_ARG_WITH([xrandr],    [AS_HELP_STRING([--without-xrandr],[do not use Xrandr (resolution changes)])],
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrandr_h=no; fi])
-AC_ARG_WITH(xrender,   AS_HELP_STRING([--without-xrender],[do not use the Xrender extension]),
+AC_ARG_WITH([xrender],   [AS_HELP_STRING([--without-xrender],[do not use the Xrender extension])],
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrender_h=no; fi])
-AC_ARG_WITH(xshape,    AS_HELP_STRING([--without-xshape],[do not use the Xshape extension]),
+AC_ARG_WITH([xshape],    [AS_HELP_STRING([--without-xshape],[do not use the Xshape extension])],
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_shape_h=no; fi])
-AC_ARG_WITH(xshm,      AS_HELP_STRING([--without-xshm],[do not use XShm (shared memory extension)]),
+AC_ARG_WITH([xshm],      [AS_HELP_STRING([--without-xshm],[do not use XShm (shared memory extension)])],
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi])
-AC_ARG_WITH(xslt,      AS_HELP_STRING([--without-xslt],[do not use XSLT]))
-AC_ARG_WITH(xxf86vm,   AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]),
+AC_ARG_WITH([xslt],      [AS_HELP_STRING([--without-xslt],[do not use XSLT])])
+AC_ARG_WITH([xxf86vm],   [AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension])],
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi])
 
-AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR]))
-AC_ARG_WITH(wine64,    AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build]))
+AC_ARG_WITH([wine-tools],[AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR])])
+AC_ARG_WITH([wine64],    [AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build])])
 
 AC_CANONICAL_HOST
 
@@ -111,8 +111,8 @@ AC_PROG_MAKE_SET
 AC_PROG_CC
 AC_PROG_CXX
 dnl We can't use AC_PROG_CPP for winegcc, it uses by default $(CC) -E
-AC_CHECK_TOOL(CPPBIN,cpp,cpp)
-AC_DEFINE_UNQUOTED(EXEEXT,["$ac_exeext"],[Define to the file extension for executables.])
+AC_CHECK_TOOL([CPPBIN],[cpp],[cpp])
+AC_DEFINE_UNQUOTED([EXEEXT],["$ac_exeext"],[Define to the file extension for executables.])
 
 case $host in
   *-darwin*)
@@ -124,7 +124,7 @@ case $host in
       AS="${AS:-as} -arch x86_64"
       host_cpu="x86_64"
       notice_platform="64-bit "
-      AC_SUBST(TARGETFLAGS,"-m64")
+      AC_SUBST([TARGETFLAGS],["-m64"])
     else
       CC="$CC -m32"
       CXX="$CXX -m32"
@@ -132,7 +132,7 @@ case $host in
       AS="${AS:-as} -arch i386"
       host_cpu="i386"
       notice_platform="32-bit "
-      AC_SUBST(TARGETFLAGS,"-m32")
+      AC_SUBST([TARGETFLAGS],["-m32"])
       enable_win16=${enable_win16:-yes}
     fi
     ;;
@@ -142,14 +142,14 @@ case $host in
       CC="$CC -m32"
       CXX="$CXX -m32"
       AC_MSG_CHECKING([whether $CC works])
-      AC_LINK_IFELSE(AC_LANG_PROGRAM(),AC_MSG_RESULT([yes]),
+      AC_LINK_IFELSE([AC_LANG_PROGRAM()],[AC_MSG_RESULT([yes])],
                      [AC_MSG_RESULT([no])
                       AC_MSG_ERROR([Cannot build a 32-bit program, you need to install 32-bit development libraries.])])
       LD="${LD:-ld} -m elf_i386"
       AS="${AS:-as} --32"
       host_cpu="i386"
       notice_platform="32-bit "
-      AC_SUBST(TARGETFLAGS,"-m32")
+      AC_SUBST([TARGETFLAGS],["-m32"])
       enable_win16=${enable_win16:-yes}
     else
       if test "x${GCC}" = "xyes"
@@ -160,7 +160,7 @@ case $host in
                           [AC_MSG_RESULT([no])
                            AC_MSG_ERROR([You need gcc >= 4.4 to build Wine as 64-bit.])])
       fi
-      AC_SUBST(TARGETFLAGS,"-m64")
+      AC_SUBST([TARGETFLAGS],["-m64"])
     fi
     ;;
   *-mingw32*|*-cygwin*)
@@ -196,7 +196,7 @@ then
     test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32"
 fi
 
-AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
+AC_CACHE_CHECK([for the directory containing the Wine tools], [wine_cv_toolsdir],
   [wine_cv_toolsdir="$with_wine_tools"
    if test -z "$with_wine_tools"; then
      if test "$cross_compiling" = "yes"; then
@@ -215,14 +215,14 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
    else
      AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir])
    fi])
-AC_SUBST(TOOLSDIR,$wine_cv_toolsdir)
+AC_SUBST([TOOLSDIR],[$wine_cv_toolsdir])
 if test -n "$host_alias" -a "$host_alias" != "$build_alias"
 then
-    AC_SUBST(TARGETFLAGS,"-b $host_alias $TARGETFLAGS")
+    AC_SUBST([TARGETFLAGS],["-b $host_alias $TARGETFLAGS"])
 fi
 
 dnl Check for flex
-AC_CHECK_PROGS(FLEX,flex,none)
+AC_CHECK_PROGS([FLEX],[flex],[none])
 if test "$FLEX" = "none"
 then
   AC_MSG_ERROR([no suitable flex found. Please install the 'flex' package.])
@@ -243,19 +243,19 @@ else
 fi
 
 dnl Check for bison
-AC_CHECK_PROGS(BISON,bison,none)
+AC_CHECK_PROGS([BISON],[bison],[none])
 if test "$BISON" = "none"
 then
   AC_MSG_ERROR([no suitable bison found. Please install the 'bison' package.])
 fi
 
-AC_CHECK_TOOLS(AR,[ar gar],ar)
-AC_SUBST(ARFLAGS,rc)
+AC_CHECK_TOOLS([AR],[ar gar],[ar])
+AC_SUBST([ARFLAGS],[rc])
 AC_PROG_RANLIB
-AC_CHECK_TOOL(STRIP,strip,strip)
+AC_CHECK_TOOL([STRIP],[strip],[strip])
 AC_PROG_LN_S
 AC_PROG_EGREP
-AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH])
+AC_PATH_PROG([LDCONFIG], [ldconfig], [true], [/sbin /usr/sbin $PATH])
 AC_PROG_INSTALL
 dnl Prepend src dir to install path dir if it's a relative path
 case "$INSTALL" in
@@ -264,20 +264,20 @@ case "$INSTALL" in
 esac
 
 dnl Check for lint
-AC_CHECK_PROGS(LINT, lclint lint)
+AC_CHECK_PROGS([LINT], [lclint lint])
 if test "$LINT" = "lint"
 then
   LINTFLAGS="$LINTFLAGS -errchk=%all,no%longptr64 -errhdr=%user -Ncheck=macro -Nlevel=4"
   dnl LINTFLAGS='-D_SIZE_T "-Dsize_t=unsigned long" -errchk=longptr64'
 fi
-AC_SUBST(LINT)
-AC_SUBST(LINTFLAGS)
+AC_SUBST([LINT])
+AC_SUBST([LINTFLAGS])
 
 dnl Check for various programs
-AC_CHECK_PROGS(FONTFORGE, fontforge, false)
-AC_CHECK_PROGS(PKG_CONFIG, pkg-config, false)
-AC_CHECK_PROGS(RSVG, rsvg, false)
-AC_CHECK_PROGS(ICOTOOL, icotool, false)
+AC_CHECK_PROGS([FONTFORGE], [fontforge], [false])
+AC_CHECK_PROGS([PKG_CONFIG], [pkg-config], [false])
+AC_CHECK_PROGS([RSVG], [rsvg], [false])
+AC_CHECK_PROGS([ICOTOOL], [icotool], [false])
 
 if test "${enable_maintainer_mode+set}" = set
 then
@@ -288,25 +288,25 @@ fi
 
 case $host_cpu in
   *i[[3456789]]86*)
-    AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH])
+    AC_PATH_PROG([PRELINK], [prelink], [false], [/sbin /usr/sbin $PATH])
     ;;
 esac
 
 dnl **** Check for some libraries ****
 
 dnl Check for -li386 for NetBSD and OpenBSD
-AC_CHECK_LIB(i386,i386_set_ldt)
+AC_CHECK_LIB([i386],[i386_set_ldt])
 dnl Check for -lossaudio for NetBSD
-AC_CHECK_LIB(ossaudio,_oss_ioctl)
+AC_CHECK_LIB([ossaudio],[_oss_ioctl])
 
-AC_SUBST(XLIB,"")
-AC_SUBST(OPENGL_LIBS,"")
+AC_SUBST([XLIB],[""])
+AC_SUBST([OPENGL_LIBS],[""])
 
 dnl **** Check for header files ****
 
-AC_SYS_LARGEFILE()
+AC_SYS_LARGEFILE
 
-AC_CHECK_HEADERS(\
+AC_CHECK_HEADERS([\
 	AL/al.h \
 	AudioUnit/AudioUnit.h \
 	Carbon/Carbon.h \
@@ -437,18 +437,18 @@ AC_CHECK_HEADERS(\
 	valgrind/memcheck.h \
 	valgrind/valgrind.h \
 	zlib.h
-)
-AC_HEADER_STAT()
+])
+AC_HEADER_STAT
 
 dnl **** Checks for headers that depend on other ones ****
 
-AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/sysctl.h sys/user.h sys/vfs.h],,,
+AC_CHECK_HEADERS([sys/mount.h sys/statfs.h sys/sysctl.h sys/user.h sys/vfs.h],[],[],
     [#include <sys/types.h>
      #ifdef HAVE_SYS_PARAM_H
      # include <sys/param.h>
      #endif])
 
-AC_CHECK_HEADERS(\
+AC_CHECK_HEADERS([\
 	netinet/ip.h \
 	net/if.h \
 	net/if_arp.h \
@@ -462,7 +462,7 @@ AC_CHECK_HEADERS(\
 	netinet/ip_var.h \
 	netinet/udp.h \
 	netipx/ipx.h \
-,,,[#include <sys/types.h>
+],[],[],[#include <sys/types.h>
      #ifdef HAVE_SYS_SOCKET_H
      # include <sys/socket.h>
      #endif
@@ -485,7 +485,7 @@ AC_CHECK_HEADERS(\
      # include <netinet/ip.h>
      #endif])
 
-AC_CHECK_HEADERS([netinet/tcp_timer.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_var.h ],,,
+AC_CHECK_HEADERS([netinet/tcp_timer.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_var.h ],[],[],
     [#include <sys/types.h>
      #ifdef HAVE_ALIAS_H
      # include <alias.h>
@@ -524,7 +524,7 @@ AC_CHECK_HEADERS([netinet/tcp_timer.h netinet/udp_var.h netinet/icmp_var.h netin
      #include <netinet/tcp_timer.h>
      #endif])
 
-AC_CHECK_HEADERS([linux/ipx.h linux/irda.h],,,
+AC_CHECK_HEADERS([linux/ipx.h linux/irda.h],[],[],
     [#include <sys/types.h>
      #ifdef HAVE_ASM_TYPES_H
      # include <asm/types.h>
@@ -536,7 +536,7 @@ AC_CHECK_HEADERS([linux/ipx.h linux/irda.h],,,
      # include <linux/types.h>
      #endif])
 
-AC_CHECK_HEADERS([mach-o/dyld_images.h],,,
+AC_CHECK_HEADERS([mach-o/dyld_images.h],[],[],
     [#ifdef HAVE_STDBOOL_H
      # include <stdbool.h>
      #endif
@@ -544,7 +544,7 @@ AC_CHECK_HEADERS([mach-o/dyld_images.h],,,
      # include <stdint.h>
      #endif])
 
-AC_CHECK_HEADERS([resolv.h],,,
+AC_CHECK_HEADERS([resolv.h],[],[],
     [#include <sys/types.h>
      #ifdef HAVE_SYS_SOCKET_H
      # include <sys/socket.h>
@@ -556,20 +556,20 @@ AC_CHECK_HEADERS([resolv.h],,,
      # include <arpa/nameser.h>
      #endif])
 
-AC_CHECK_HEADERS(ucontext.h,,,[#include <signal.h>])
+AC_CHECK_HEADERS([ucontext.h],[],[],[#include <signal.h>])
 
-AC_CHECK_HEADERS([sys/thr.h],,,
+AC_CHECK_HEADERS([sys/thr.h],[],[],
 [#include <sys/types.h>
 #ifdef HAVE_UCONTEXT_H
 #include <ucontext.h>
 #endif])
 
-AC_CHECK_HEADERS([pthread_np.h],,,
+AC_CHECK_HEADERS([pthread_np.h],[],[],
 [#ifdef HAVE_PTHREAD_H
 #include <pthread.h>
 #endif])
 
-AC_CHECK_HEADERS([linux/videodev.h],,,
+AC_CHECK_HEADERS([linux/videodev.h],[],[],
 [#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
@@ -579,25 +579,25 @@ AC_CHECK_HEADERS([linux/videodev.h],,,
 #endif])
 
 dnl Check for broken kernel header that doesn't define __user
-AC_CHECK_HEADERS([linux/capi.h],,,[#define __user])
+AC_CHECK_HEADERS([linux/capi.h],[],[],[#define __user])
 
 dnl **** Check for working dll ****
 
-AC_SUBST(DLLEXT,"")
-AC_SUBST(DLLFLAGS,"-D_REENTRANT")
-AC_SUBST(LDSHARED,"")
-AC_SUBST(LDDLLFLAGS,"")
-AC_SUBST(LIBEXT,"so")
-AC_SUBST(IMPLIBEXT,"def")
-AC_SUBST(LDRPATH_INSTALL,"")
-AC_SUBST(LDRPATH_LOCAL,"")
+AC_SUBST([DLLEXT],[""])
+AC_SUBST([DLLFLAGS],["-D_REENTRANT"])
+AC_SUBST([LDSHARED],[""])
+AC_SUBST([LDDLLFLAGS],[""])
+AC_SUBST([LIBEXT],["so"])
+AC_SUBST([IMPLIBEXT],["def"])
+AC_SUBST([LDRPATH_INSTALL],[""])
+AC_SUBST([LDRPATH_LOCAL],[""])
 STATIC_IMPLIBEXT="def.a"
 WINE_PATH_LDD
 
 case $host_os in
   cygwin*|mingw32*)
-    AC_CHECK_TOOL(DLLTOOL,dlltool,false)
-    AC_CHECK_TOOL(DLLWRAP,dllwrap,false)
+    AC_CHECK_TOOL([DLLTOOL],[dlltool],[false])
+    AC_CHECK_TOOL([DLLWRAP],[dllwrap],[false])
     if test "$DLLWRAP" = "false"; then
       LIBEXT="a"
     else
@@ -628,30 +628,30 @@ case $host_os in
     STRIP="$STRIP -x"
     LDRPATH_LOCAL="&& install_name_tool -change @executable_path/\`\$(RELPATH) \$(bindir) \$(libdir)\`/libwine.1.dylib @executable_path/\$(TOPOBJDIR)/libs/wine/libwine.1.dylib \$@ || \$(RM) \$@"
     dnl declare needed frameworks
-    AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation")
-    AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
-    AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation")
-    AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000"])
+    AC_SUBST([SECURITYLIB],["-framework Security -framework CoreFoundation"])
+    AC_SUBST([COREFOUNDATIONLIB],["-framework CoreFoundation"])
+    AC_SUBST([IOKITLIB],["-framework IOKit -framework CoreFoundation"])
+    AC_SUBST([LDEXECFLAGS],["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000"])
     if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes"
     then
         dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found
-        AC_SUBST(DISKARBITRATIONLIB,"-framework DiskArbitration -framework CoreFoundation")
+        AC_SUBST([DISKARBITRATIONLIB],["-framework DiskArbitration -framework CoreFoundation"])
     fi
     if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes"
     then
         dnl CoreServices needed by AudioUnit
-        AC_SUBST(COREAUDIO,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI")
+        AC_SUBST([COREAUDIO],["-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI"])
     fi
     if test "$ac_cv_header_OpenAL_al_h" = "yes"
     then
-        AC_SUBST(LIBOPENAL,"-framework OpenAL")
+        AC_SUBST([LIBOPENAL],["-framework OpenAL"])
         ac_cv_lib_openal_alGetSource3i=yes
     fi
     if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes"
     then
         ac_save_LIBS="$LIBS"
         LIBS="$LIBS $IOKITLIB"
-        AC_CHECK_FUNCS(IOHIDManagerCreate)
+        AC_CHECK_FUNCS([IOHIDManagerCreate])
         LIBS="$ac_save_LIBS"
     fi
     case $host_cpu in
@@ -662,33 +662,33 @@ case $host_os in
     dnl Enable quartz driver on Mac OS X
     if test "$ac_cv_header_Carbon_Carbon_h" = "yes"
     then
-        AC_SUBST(CARBONLIB,"-framework Carbon")
+        AC_SUBST([CARBONLIB],["-framework Carbon"])
         enable_winequartz_drv=${enable_winequartz_drv:-yes}
     fi
     dnl Check for Xcode 3.x broken 16-bit support
     if test "x$enable_win16" = "xyes"
     then
         AC_MSG_CHECKING([whether 16-bit code can be built correctly])
-        AC_RUN_IFELSE(AC_LANG_PROGRAM([[asm(".text\n"
+        AC_RUN_IFELSE([AC_LANG_PROGRAM([[asm(".text\n"
                                             "bad:\tnop;nop\n"
                                             "good:\tnop;nop\n\t"
                                             ".globl _testfunc\n"
                                             "_testfunc:\tcallw good");
                                         extern void testfunc();]],
                                       [[unsigned short *p = (unsigned short *)testfunc;
-                                        return p[[0]] != 0xe866 || p[[1]] != 0xfffa]]),
-                                      AC_MSG_RESULT(yes),
-                                      [AC_MSG_RESULT(no)
+                                        return p[0] != 0xe866 || p[1] != 0xfffa]])],
+                                      [AC_MSG_RESULT([yes])],
+                                      [AC_MSG_RESULT([no])
                                        AC_MSG_ERROR([Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support.])],
-                                       AC_MSG_RESULT([[cross-compiling, assuming yes]]))
+                                       [AC_MSG_RESULT([cross-compiling, assuming yes])])
     fi
     ;;
   *)
     DLLFLAGS="$DLLFLAGS -fPIC"
     DLLEXT=".so"
-    AC_CACHE_CHECK([whether we can build a GNU style ELF dll], ac_cv_c_dll_gnuelf,
+    AC_CACHE_CHECK([whether we can build a GNU style ELF dll], [ac_cv_c_dll_gnuelf],
         [WINE_TRY_SHLIB_FLAGS([-fPIC -shared -Wl,-Bsymbolic],
-                              ac_cv_c_dll_gnuelf="yes",ac_cv_c_dll_gnuelf="no")])
+                              [ac_cv_c_dll_gnuelf="yes"],[ac_cv_c_dll_gnuelf="no"])])
     if test "$ac_cv_c_dll_gnuelf" = "yes"
     then
       LDSHARED="\$(CC) -shared"
@@ -709,7 +709,7 @@ case $host_os in
       rm -f conftest.map
 
       WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic],
-                      [AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])])
+                      [AC_SUBST([LDEXECFLAGS],["-Wl,--export-dynamic"])])
 
       WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
                       [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
@@ -729,17 +729,17 @@ case $host_os in
       esac
 
     else
-      AC_CACHE_CHECK(whether we can build a UnixWare (Solaris) dll, ac_cv_c_dll_unixware,
+      AC_CACHE_CHECK([whether we can build a UnixWare (Solaris) dll], [ac_cv_c_dll_unixware],
           [WINE_TRY_SHLIB_FLAGS([-fPIC -Wl,-G,-h,conftest.so.1.0,-B,symbolic],
-                                ac_cv_c_dll_unixware="yes",ac_cv_c_dll_unixware="no")])
+                                [ac_cv_c_dll_unixware="yes"],[ac_cv_c_dll_unixware="no"])])
       if test "$ac_cv_c_dll_unixware" = "yes"
       then
         LDSHARED="\$(CC) -Wl,-G \$(SONAME:%=-Wl,-h,%)"
         LDDLLFLAGS="-Wl,-G,-B,symbolic"
 
       else
-        AC_CACHE_CHECK(whether we can build an HP-UX dll, ac_cv_c_dll_hpux,
-          [WINE_TRY_SHLIB_FLAGS([-shared], ac_cv_c_dll_hpux="yes", ac_cv_c_dll_hpux="no")])
+        AC_CACHE_CHECK([whether we can build an HP-UX dll], [ac_cv_c_dll_hpux],
+          [WINE_TRY_SHLIB_FLAGS([-shared], [ac_cv_c_dll_hpux="yes"], [ac_cv_c_dll_hpux="no"])])
         if test "$ac_cv_c_dll_hpux" = "yes"
         then
           LIBEXT="sl"
@@ -766,10 +766,10 @@ fi
 dnl Check for cross compiler to build test programs
 if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll"
 then
-    WINE_CHECK_MINGW_PROG(CROSSCC,gcc,false)
+    WINE_CHECK_MINGW_PROG([CROSSCC],[gcc],[false])
     if test "$CROSSCC" != "false"
     then
-        AC_SUBST(CROSSTEST,"\$(CROSSTEST)")
+        AC_SUBST([CROSSTEST],["\$(CROSSTEST)"])
         set x $CROSSCC
         shift
         target=""
@@ -782,7 +782,7 @@ then
         done
         if test -n "$target"
         then
-            AC_SUBST(CROSSTARGET,"$target")
+            AC_SUBST([CROSSTARGET],["$target"])
         fi
     fi
 fi
@@ -791,9 +791,9 @@ dnl **** Check for pthread ****
 
 if test "$ac_cv_header_pthread_h" = "yes"
 then
-    AC_CHECK_LIB(pthread,pthread_create,[AC_SUBST(LIBPTHREAD,"-lpthread")])
+    AC_CHECK_LIB([pthread],[pthread_create],[AC_SUBST([LIBPTHREAD],["-lpthread"])])
 fi
-WINE_ERROR_WITH(pthread,[test "x$LIBPTHREAD" = "x"],[pthread ${notice_platform}development files not found.
+WINE_ERROR_WITH([pthread],[test "x$LIBPTHREAD" = "x"],[pthread ${notice_platform}development files not found.
 Wine cannot support threads without libpthread.])
 
 dnl **** Check for X11 ****
@@ -806,8 +806,8 @@ then
     ac_save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 
-    WINE_CHECK_SONAME(X11,XCreateWindow,,,[$X_LIBS $X_EXTRA_LIBS])
-    WINE_CHECK_SONAME(Xext,XextCreateExtension,[XLIB="-lXext $XLIB"],,[$X_LIBS -lX11 $X_EXTRA_LIBS])
+    WINE_CHECK_SONAME([X11],[XCreateWindow],[],[],[$X_LIBS $X_EXTRA_LIBS])
+    WINE_CHECK_SONAME([Xext],[XextCreateExtension],[XLIB="-lXext $XLIB"],[],[$X_LIBS -lX11 $X_EXTRA_LIBS])
 
     dnl *** All of the following tests require X11/Xlib.h
     AC_CHECK_HEADERS([X11/Xlib.h \
@@ -822,7 +822,7 @@ then
                       X11/extensions/Xrandr.h \
                       X11/extensions/Xrender.h \
                       X11/extensions/xf86vmode.h \
-                      X11/extensions/xf86vmproto.h],,,
+                      X11/extensions/xf86vmproto.h],[],[],
 [#ifdef HAVE_X11_XLIB_H
 # include <X11/Xlib.h>
 #endif
@@ -833,66 +833,66 @@ then
         dnl *** Check for X keyboard extension
         if test "$ac_cv_header_X11_XKBlib_h" = "yes"
         then
-              AC_CHECK_LIB(X11, XkbQueryExtension,
-              AC_DEFINE(HAVE_XKB, 1, [Define if you have the XKB extension]),,
-              $X_LIBS $XLIB $X_EXTRA_LIBS)
+              AC_CHECK_LIB([X11], [XkbQueryExtension],
+              [AC_DEFINE([HAVE_XKB], 1, [Define if you have the XKB extension])],[],
+              [$X_LIBS $XLIB $X_EXTRA_LIBS])
         fi
 
         dnl *** Check for X cursor
         if test "$ac_cv_header_X11_Xcursor_Xcursor_h" = "yes"
         then
-            WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])
+            WINE_CHECK_SONAME([Xcursor],[XcursorImageLoadCursor],[],[],[$X_LIBS $XLIB $X_EXTRA_LIBS])
         fi
-        WINE_NOTICE_WITH(xcursor,[test "x$ac_cv_lib_soname_Xcursor" = "x"],
+        WINE_NOTICE_WITH([xcursor],[test "x$ac_cv_lib_soname_Xcursor" = "x"],
                          [libxcursor ${notice_platform}development files not found, the Xcursor extension won't be supported.])
 
         dnl *** Check for X input extension
         if test "$ac_cv_header_X11_extensions_XInput_h" = "yes"
         then
-            WINE_CHECK_SONAME(Xi,XOpenDevice,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])
+            WINE_CHECK_SONAME([Xi],[XOpenDevice],[],[],[$X_LIBS $XLIB $X_EXTRA_LIBS])
         fi
-        WINE_NOTICE_WITH(xinput,[test "x$ac_cv_lib_soname_Xi" = "x"],
+        WINE_NOTICE_WITH([xinput],[test "x$ac_cv_lib_soname_Xi" = "x"],
                          [libxi ${notice_platform}development files not found, the Xinput extension won't be supported.])
 
         dnl *** Check for X Shm extension
         if test "$ac_cv_header_X11_extensions_XShm_h" = "yes"
         then
-              AC_CHECK_LIB(Xext, XShmQueryExtension,
-              AC_DEFINE(HAVE_LIBXXSHM, 1, [Define if you have the X Shm extension]),,
-              $X_LIBS $XLIB $X_EXTRA_LIBS)
+              AC_CHECK_LIB([Xext], [XShmQueryExtension],
+              [AC_DEFINE([HAVE_LIBXXSHM], 1, [Define if you have the X Shm extension])],[],
+              [$X_LIBS $XLIB $X_EXTRA_LIBS])
         fi
-        WINE_NOTICE_WITH(xshm,[test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"],
+        WINE_NOTICE_WITH([xshm],[test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"],
                          [XShm ${notice_platform}development files not found, X Shared Memory won't be supported.])
 
         dnl *** Check for X shape extension
         if test "$ac_cv_header_X11_extensions_shape_h" = "yes"
         then
-              AC_CHECK_LIB(Xext,XShapeQueryExtension,
-	      AC_DEFINE(HAVE_LIBXSHAPE, 1, [Define if you have the X Shape extension]),,
-	      $X_LIBS $XLIB $X_EXTRA_LIBS)
+              AC_CHECK_LIB([Xext],[XShapeQueryExtension],
+	      [AC_DEFINE([HAVE_LIBXSHAPE], 1, [Define if you have the X Shape extension])],[],
+	      [$X_LIBS $XLIB $X_EXTRA_LIBS])
         fi
-        WINE_NOTICE_WITH(xshape,[test "$ac_cv_lib_Xext_XShapeQueryExtension" != "yes"],
+        WINE_NOTICE_WITH([xshape],[test "$ac_cv_lib_Xext_XShapeQueryExtension" != "yes"],
                          [XShape ${notice_platform}development files not found, XShape won't be supported.])
 
         dnl *** Check for XFree86 VMODE extension
         if test "$ac_cv_header_X11_extensions_xf86vmode_h" = "yes" -o "$ac_cv_header_X11_extensions_xf86vmproto_h" = "yes"
         then
-            WINE_CHECK_SONAME(Xxf86vm,XF86VidModeQueryExtension,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])
+            WINE_CHECK_SONAME([Xxf86vm],[XF86VidModeQueryExtension],[],[],[$X_LIBS $XLIB $X_EXTRA_LIBS])
         fi
-        WINE_NOTICE_WITH(xxf86vm,[test "x$ac_cv_lib_soname_Xxf86vm" = "x"],
+        WINE_NOTICE_WITH([xxf86vm],[test "x$ac_cv_lib_soname_Xxf86vm" = "x"],
                          [libXxf86vm ${notice_platform}development files not found, XFree86 Vidmode won't be supported.])
 
         dnl *** Check for Transform functions in Xrender
         if test "$ac_cv_header_X11_extensions_Xrender_h" = "yes" -a "x$ac_cv_lib_soname_X11" != "x" -a "x$ac_cv_lib_soname_Xext" != "x"
         then
-            WINE_CHECK_SONAME(Xrender,XRenderQueryExtension,
-              [AC_CHECK_LIB(Xrender,XRenderSetPictureTransform,
-                [AC_DEFINE(HAVE_XRENDERSETPICTURETRANSFORM, 1,
-                 [Define if Xrender has the XRenderSetPictureTransform function])],,
-                [$X_LIBS $XLIB $X_EXTRA_LIBS])],,[$X_LIBS $XLIB $X_EXTRA_LIBS])
+            WINE_CHECK_SONAME([Xrender],[XRenderQueryExtension],
+              [AC_CHECK_LIB([Xrender],[XRenderSetPictureTransform],
+                [AC_DEFINE([HAVE_XRENDERSETPICTURETRANSFORM], 1,
+                 [Define if Xrender has the XRenderSetPictureTransform function])],[],
+                [$X_LIBS $XLIB $X_EXTRA_LIBS])],[],[$X_LIBS $XLIB $X_EXTRA_LIBS])
 
         fi
-        WINE_WARNING_WITH(xrender,[test "x$ac_cv_lib_soname_Xrender" = "x"],
+        WINE_WARNING_WITH([xrender],[test "x$ac_cv_lib_soname_Xrender" = "x"],
                          [libxrender ${notice_platform}development files not found, XRender won't be supported.])
 
         dnl *** Check for X RandR extension
@@ -900,9 +900,9 @@ then
         then
                 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>]], [[static typeof(XRRSetScreenConfigAndRate) * func;]])],
-                  [WINE_CHECK_SONAME(Xrandr,XRRQueryExtension,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])])
+                  [WINE_CHECK_SONAME([Xrandr],[XRRQueryExtension],[],[],[$X_LIBS $XLIB $X_EXTRA_LIBS])])
         fi
-        WINE_NOTICE_WITH(xrandr,[test "x$ac_cv_lib_soname_Xrandr" = "x"],
+        WINE_NOTICE_WITH([xrandr],[test "x$ac_cv_lib_soname_Xrandr" = "x"],
                          [libxrandr ${notice_platform}development files not found, XRandr won't be supported.])
 
         dnl *** Check for Xinerama extension
@@ -910,21 +910,21 @@ then
         then
                 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h>
 #include <X11/extensions/Xinerama.h>]], [[static typeof(XineramaQueryScreens) * func;]])],
-                  [WINE_CHECK_SONAME(Xinerama,XineramaQueryScreens,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])])
+                  [WINE_CHECK_SONAME([Xinerama],[XineramaQueryScreens],[],[],[$X_LIBS $XLIB $X_EXTRA_LIBS])])
         fi
-        WINE_NOTICE_WITH(xinerama,[test "x$ac_cv_lib_soname_Xinerama" = "x"],
+        WINE_NOTICE_WITH([xinerama],[test "x$ac_cv_lib_soname_Xinerama" = "x"],
                          [libxinerama ${notice_platform}development files not found, multi-monitor setups won't be supported.])
 
         dnl *** Check for X Composite extension
         if test "$ac_cv_header_X11_extensions_Xcomposite_h" = "yes"
         then
-            WINE_CHECK_SONAME(Xcomposite,XCompositeRedirectWindow,,,[$X_LIBS $XLIB $X_EXTRA_LIBS])
+            WINE_CHECK_SONAME([Xcomposite],[XCompositeRedirectWindow],[],[],[$X_LIBS $XLIB $X_EXTRA_LIBS])
         fi
-        WINE_NOTICE_WITH(xcomposite,[test "x$ac_cv_lib_soname_Xcomposite" = "x"],
+        WINE_NOTICE_WITH([xcomposite],[test "x$ac_cv_lib_soname_Xcomposite" = "x"],
                          [libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported.])
 
         dnl *** Check for XICCallback struct
-        AC_CHECK_MEMBERS([XICCallback.callback],,,
+        AC_CHECK_MEMBERS([XICCallback.callback],[],[],
 [#ifdef HAVE_X11_XLIB_H
 #include <X11/Xlib.h>
 #endif])
@@ -935,27 +935,27 @@ then
     opengl_msg=""
     if test "x$with_opengl" != "xno"
     then
-	AC_CHECK_HEADERS(GL/gl.h GL/glx.h GL/glu.h,,,
+	AC_CHECK_HEADERS([GL/gl.h GL/glx.h GL/glu.h],[],[],
 [#ifdef HAVE_GL_GLX_H
 # include <GL/glx.h>
 #endif])
 	if test "$ac_cv_header_GL_gl_h" = "yes" -a "$ac_cv_header_GL_glx_h" = "yes"
 	then
 	    dnl Check for some problems due to old Mesa versions
-	    AC_CACHE_CHECK([for up-to-date OpenGL version], wine_cv_opengl_header_version_OK,
-	      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <GL/gl.h>]], [[GLenum test = GL_UNSIGNED_SHORT_5_6_5;]])],
+	    AC_CACHE_CHECK([for up-to-date OpenGL version], [wine_cv_opengl_header_version_OK],
+	      [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <GL/gl.h>]], [[GLenum test = GL_UNSIGNED_SHORT_5_6_5;]])],
 		[wine_cv_opengl_header_version_OK="yes"],
-		[wine_cv_opengl_header_version_OK="no"]))
+		[wine_cv_opengl_header_version_OK="no"])])
 
 	    if test "$wine_cv_opengl_header_version_OK" = "yes"
             then
 		dnl Check for the presence of the library
-		WINE_CHECK_SONAME(GL,glXCreateContext,
+		WINE_CHECK_SONAME([GL],[glXCreateContext],
 			     [OPENGL_LIBS="-lGL"
-                             AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])],
-                             [WINE_CHECK_SONAME(GL,glXCreateContext,
+                             AC_DEFINE([HAVE_OPENGL], 1, [Define if OpenGL is present on the system])],
+                             [WINE_CHECK_SONAME([GL],[glXCreateContext],
 				    [OPENGL_LIBS="-Xlinker -dylib_file -Xlinker /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -lGL"
-	                            AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])],
+	                            AC_DEFINE([HAVE_OPENGL], 1, [Define if OpenGL is present on the system])],
 				    [if test -f /usr/X11R6/lib/libGL.a
 	                            then
 		                        opengl_msg="/usr/X11R6/lib/libGL.a is present on your system.
@@ -964,12 +964,12 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
 	                                opengl_msg="No OpenGL library found on this system."
 	                            fi],
 				    $X_LIBS $XLIB -lm $X_EXTRA_LIBS -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib)],
-			     $X_LIBS $XLIB -lm $X_EXTRA_LIBS)
+			     [$X_LIBS $XLIB -lm $X_EXTRA_LIBS])
                  if test "$ac_cv_header_GL_glu_h" = "yes"
                  then
-                    WINE_CHECK_SONAME(GLU,gluLookAt,,,[$OPENGL_LIBS $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
+                    WINE_CHECK_SONAME([GLU],[gluLookAt],[],[],[$OPENGL_LIBS $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS])
                  fi
-                 WINE_NOTICE_WITH(glu,[test "x$ac_cv_lib_soname_GLU" = "x"],
+                 WINE_NOTICE_WITH([glu],[test "x$ac_cv_lib_soname_GLU" = "x"],
                                  [libGLU ${notice_platform}development files not found, GLU won't be supported.])
              else
                  opengl_msg="Old Mesa headers detected. Consider upgrading your Mesa libraries."
@@ -983,20 +983,20 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
          enable_opengl32=${enable_opengl32:-no}
          enable_glu32=${enable_glu32:-no}
     fi
-    WINE_WARNING_WITH(opengl,[test -n "$opengl_msg"],[$opengl_msg
+    WINE_WARNING_WITH([opengl],[test -n "$opengl_msg"],[$opengl_msg
 OpenGL and Direct3D won't be supported.])
 
     dnl **** Check for NAS ****
-    AC_SUBST(NASLIBS,"")
-    AC_CHECK_HEADERS(audio/audiolib.h,
-         [AC_CHECK_HEADERS(audio/soundlib.h,,,[#include <audio/audiolib.h>])
-          AC_CHECK_LIB(audio,AuCreateFlow,
-                       [AC_DEFINE(HAVE_NAS,1,[Define if you have NAS including devel headers])
-                        AC_CHECK_LIB(Xau,XauGetBestAuthByAddr,
+    AC_SUBST([NASLIBS],[""])
+    AC_CHECK_HEADERS([audio/audiolib.h],
+         [AC_CHECK_HEADERS([audio/soundlib.h],[],[],[#include <audio/audiolib.h>])
+          AC_CHECK_LIB([audio],[AuCreateFlow],
+                       [AC_DEFINE([HAVE_NAS],1,[Define if you have NAS including devel headers])
+                        AC_CHECK_LIB([Xau],[XauGetBestAuthByAddr],
                           [NASLIBS="-lXau -laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS"],
                           [NASLIBS="-laudio -lXt $X_LIBS $XLIB $X_EXTRA_LIBS"],
                           [$X_LIBS])
-                       ],,
+                       ],[],
                        [-lXt $X_LIBS $XLIB $X_EXTRA_LIBS])])
 
     CPPFLAGS="$ac_save_CPPFLAGS"
@@ -1008,15 +1008,15 @@ else
     enable_opengl32=${enable_opengl32:-no}
     enable_glu32=${enable_glu32:-no}
 fi
-WINE_ERROR_WITH(x,[test "x$XLIB" = "x"],[X ${notice_platform}development files not found. Wine will be built
+WINE_ERROR_WITH([x],[test "x$XLIB" = "x"],[X ${notice_platform}development files not found. Wine will be built
 without X support, which probably isn't what you want. You will need to install
 ${notice_platform}development packages of Xlib/Xfree86 at the very least.])
 
 dnl **** Check for libxml2 ****
 
-AC_SUBST(XML2LIBS,"")
-AC_SUBST(XML2INCL,"")
-AC_SUBST(XSLTINCL,"")
+AC_SUBST([XML2LIBS],[""])
+AC_SUBST([XML2INCL],[""])
+AC_SUBST([XSLTINCL],[""])
 if test "x$with_xml" != "xno"
 then
     ac_save_CPPFLAGS="$CPPFLAGS"
@@ -1029,19 +1029,19 @@ then
         ac_xml_cflags="`xml2-config --cflags  2>/dev/null`"
     fi
     CPPFLAGS="$CPPFLAGS $ac_xml_cflags"
-    AC_CHECK_HEADERS(libxml/parser.h,
-            [AC_CHECK_LIB(xml2, xmlParseMemory,
-                [AC_DEFINE(HAVE_LIBXML2, 1, [Define if you have the libxml2 library])
+    AC_CHECK_HEADERS([libxml/parser.h],
+            [AC_CHECK_LIB([xml2], [xmlParseMemory],
+                [AC_DEFINE([HAVE_LIBXML2], 1, [Define if you have the libxml2 library])
                  XML2LIBS="$ac_xml_libs"
-                 XML2INCL="$ac_xml_cflags"],,$ac_xml_libs)
-             AC_CHECK_LIB(xml2, xmlReadMemory,
-                [AC_DEFINE(HAVE_XMLREADMEMORY,1,[Define if libxml2 has the xmlReadMemory function])],,$ac_xml_libs)
-             AC_CHECK_LIB(xml2, xmlNewDocPI,
-                [AC_DEFINE(HAVE_XMLNEWDOCPI,1,[Define if libxml2 has the xmlNewDocPI function])],,$ac_xml_libs)
+                 XML2INCL="$ac_xml_cflags"],[],[$ac_xml_libs])
+             AC_CHECK_LIB([xml2], [xmlReadMemory],
+                [AC_DEFINE([HAVE_XMLREADMEMORY],1,[Define if libxml2 has the xmlReadMemory function])],[],[$ac_xml_libs])
+             AC_CHECK_LIB([xml2], [xmlNewDocPI],
+                [AC_DEFINE([HAVE_XMLNEWDOCPI],1,[Define if libxml2 has the xmlNewDocPI function])],[],[$ac_xml_libs])
         ])
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
-WINE_WARNING_WITH(xml,[test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"],
+WINE_WARNING_WITH([xml],[test "$ac_cv_lib_xml2_xmlParseMemory" != "yes"],
                  [libxml2 ${notice_platform}development files not found, XML won't be supported.])
 
 if test "x$with_xslt" != "xno"
@@ -1056,22 +1056,22 @@ then
     fi
     ac_save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="$CPPFLAGS $ac_xslt_cflags"
-    AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h],,,
+    AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h],[],[],
     [#ifdef HAVE_LIBXSLT_PATTERN_H
 # include <libxslt/pattern.h>
 #endif])
     CPPFLAGS="$ac_save_CPPFLAGS"
     if test "$ac_cv_header_libxslt_transform_h" = "yes"
     then
-        WINE_CHECK_SONAME(xslt,xsltCompilePattern,
-                         [XSLTINCL="$ac_xslt_cflags"],,[$ac_xslt_libs])
+        WINE_CHECK_SONAME([xslt],[xsltCompilePattern],
+                         [XSLTINCL="$ac_xslt_cflags"],[],[$ac_xslt_libs])
     fi
 fi
-WINE_WARNING_WITH(xslt,[test "x$ac_cv_lib_soname_xslt" = "x"],
+WINE_WARNING_WITH([xslt],[test "x$ac_cv_lib_soname_xslt" = "x"],
                  [libxslt ${notice_platform}development files not found, xslt won't be supported.])
 
 dnl **** Check for libhal ****
-AC_SUBST(HALINCL,"")
+AC_SUBST([HALINCL],[""])
 if test "x$with_hal" != "xno"
 then
     ac_save_CPPFLAGS="$CPPFLAGS"
@@ -1084,13 +1084,13 @@ then
     AC_CHECK_HEADERS([dbus/dbus.h hal/libhal.h])
     if test "$ac_cv_header_dbus_dbus_h" = "yes" -a "$ac_cv_header_hal_libhal_h" = "yes"
     then
-        AC_CHECK_LIB(dbus-1, dbus_connection_close,
-          [WINE_CHECK_SONAME(hal, libhal_ctx_new,
-            [HALINCL="$ac_hal_cflags"],,[$ac_hal_libs])],,[$ac_hal_libs])
+        AC_CHECK_LIB([dbus-1], [dbus_connection_close],
+          [WINE_CHECK_SONAME([hal], [libhal_ctx_new],
+            [HALINCL="$ac_hal_cflags"],[],[$ac_hal_libs])],[],[$ac_hal_libs])
     fi
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
-WINE_NOTICE_WITH(hal,[test "x$ac_cv_lib_soname_hal" = "x"],
+WINE_NOTICE_WITH([hal],[test "x$ac_cv_lib_soname_hal" = "x"],
                  [libhal/libdbus ${notice_platform}development files not found, no dynamic device support.])
 
 dnl **** Check for libgnutls ****
@@ -1103,63 +1103,63 @@ then
         ac_gnutls_cflags="`$PKG_CONFIG --cflags gnutls 2>/dev/null`"
         CPPFLAGS="$CPPFLAGS $ac_gnutls_cflags"
     fi
-    AC_CHECK_HEADER(gnutls/gnutls.h,
+    AC_CHECK_HEADER([gnutls/gnutls.h],
         [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[typeof(gnutls_mac_get_key_size) *pfunc;]])],
-            [WINE_CHECK_SONAME(gnutls,gnutls_global_init,
-                [AC_SUBST(GNUTLSINCL,"$ac_gnutls_cflags")],,[$ac_gnutls_libs])])])
+            [WINE_CHECK_SONAME([gnutls],[gnutls_global_init],
+                [AC_SUBST([GNUTLSINCL],["$ac_gnutls_cflags"])],[],[$ac_gnutls_libs])])])
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
-WINE_NOTICE_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],
+WINE_NOTICE_WITH([gnutls],[test "x$ac_cv_lib_soname_gnutls" = "x"],
                  [libgnutls ${notice_platform}development files not found, no schannel support.])
 
 dnl **** Check which curses lib to use ***
 CURSESLIBS=""
 if test "$ac_cv_header_ncurses_h" = "yes"
 then
-    WINE_CHECK_SONAME(ncurses,waddch,[CURSESLIBS="-lncurses"])
+    WINE_CHECK_SONAME([ncurses],[waddch],[CURSESLIBS="-lncurses"])
 elif test "$ac_cv_header_curses_h" = "yes"
 then
-    WINE_CHECK_SONAME(curses,waddch,[CURSESLIBS="-lcurses"])
+    WINE_CHECK_SONAME([curses],[waddch],[CURSESLIBS="-lcurses"])
 fi
 ac_save_LIBS="$LIBS"
 LIBS="$LIBS $CURSESLIBS"
-AC_CHECK_FUNCS(mousemask)
+AC_CHECK_FUNCS([mousemask])
 LIBS="$ac_save_LIBS"
-WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"],
+WINE_NOTICE_WITH([curses],[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"],
                  [lib(n)curses ${notice_platform}development files not found, curses won't be supported.])
 
 dnl **** Check for SANE ****
 if test "x$with_sane" != "xno"
 then
     ac_save_CPPFLAGS="$CPPFLAGS"
-    AC_CHECK_PROG(sane_devel,sane-config,sane-config,no)
+    AC_CHECK_PROG([sane_devel],[sane-config],[sane-config],[no])
     if test "$sane_devel" != "no"
     then
         ac_sane_incl="`$sane_devel --cflags`"
         ac_sane_libs="`$sane_devel --ldflags`"
         CPPFLAGS="$CPPFLAGS $ac_sane_incl"
     fi
-    AC_CHECK_HEADER(sane/sane.h,
-        [WINE_CHECK_SONAME(sane,sane_init,[AC_SUBST(SANEINCL,"$ac_sane_incl")],,[$ac_sane_libs])])
+    AC_CHECK_HEADER([sane/sane.h],
+        [WINE_CHECK_SONAME([sane],[sane_init],[AC_SUBST([SANEINCL],["$ac_sane_incl"])],[],[$ac_sane_libs])])
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
-WINE_NOTICE_WITH(sane,[test "x$ac_cv_lib_soname_sane" = "x"],
+WINE_NOTICE_WITH([sane],[test "x$ac_cv_lib_soname_sane" = "x"],
                  [libsane ${notice_platform}development files not found, scanners won't be supported.])
 
 dnl **** Check for libv4l1 ****
 if test "x$with_v4l" != "xno"
 then
-    WINE_CHECK_SONAME(v4l1,v4l1_open,,,)
+    WINE_CHECK_SONAME([v4l1],[v4l1_open],[],[],[])
 fi
-WINE_NOTICE_WITH(v4l,[test "x$ac_cv_lib_soname_v4l1" = "x"],
+WINE_NOTICE_WITH([v4l],[test "x$ac_cv_lib_soname_v4l1" = "x"],
                  [libv4l ${notice_platform}development files not found.])
 
 dnl **** Check for libgphoto2 ****
 if test "x$with_gphoto" != "xno"
 then
     ac_save_CPPFLAGS="$CPPFLAGS"
-    AC_CHECK_PROG(gphoto2_devel,gphoto2-config,gphoto2-config,no)
-    AC_CHECK_PROG(gphoto2port_devel,gphoto2-port-config,gphoto2-port-config,no)
+    AC_CHECK_PROG([gphoto2_devel],[gphoto2-config],[gphoto2-config],[no])
+    AC_CHECK_PROG([gphoto2port_devel],[gphoto2-port-config],[gphoto2-port-config],[no])
     if test "$gphoto2_devel" != "no" -a "$gphoto2port_devel" != "no"
     then
         ac_gphoto2_incl="`$gphoto2_devel --cflags` `$gphoto2port_devel --cflags`"
@@ -1174,20 +1174,20 @@ then
         CPPFLAGS="$CPPFLAGS $ac_gphoto2_incl"
     fi
     ac_gphoto2_libs=${ac_gphoto2_libs:-"-lgphoto2"}
-    AC_CHECK_HEADER(gphoto2-camera.h,
-                    [AC_CHECK_LIB(gphoto2,gp_camera_new,
-                                  [AC_DEFINE(HAVE_GPHOTO2, 1, [Define if we have libgphoto2 development environment])
-                                   AC_SUBST(GPHOTO2LIBS,"$ac_gphoto2_libs")
-                                   AC_SUBST(GPHOTO2INCL,"$ac_gphoto2_incl")],,
+    AC_CHECK_HEADER([gphoto2-camera.h],
+                    [AC_CHECK_LIB([gphoto2],[gp_camera_new],
+                                  [AC_DEFINE([HAVE_GPHOTO2], 1, [Define if we have libgphoto2 development environment])
+                                   AC_SUBST([GPHOTO2LIBS],["$ac_gphoto2_libs"])
+                                   AC_SUBST([GPHOTO2INCL],["$ac_gphoto2_incl"])],[],
                                   [$ac_gphoto2_libs])])
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
-WINE_NOTICE_WITH(gphoto,[test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"],
+WINE_NOTICE_WITH([gphoto],[test "$ac_cv_lib_gphoto2_gp_camera_new" != "yes"],
                  [libgphoto2 ${notice_platform}development files not found, digital cameras won't be supported.])
 
 
 dnl **** Check for resolver library ***
-AC_SUBST(RESOLVLIBS,"")
+AC_SUBST([RESOLVLIBS],[""])
 if test "$ac_cv_header_resolv_h" = "yes"
 then
     ac_save_LIBS="$LIBS"
@@ -1196,38 +1196,38 @@ then
 #include <netinet/in.h>
 #endif
 #include <resolv.h>]],[[res_init();]])],
-        [AC_DEFINE(HAVE_RESOLV, 1, [Define if you have the resolver library and header])
+        [AC_DEFINE([HAVE_RESOLV], 1, [Define if you have the resolver library and header])
          RESOLVLIBS="-lresolv"])
     LIBS="$ac_save_LIBS"
 fi
 
 dnl **** Check for LittleCMS ***
-AC_SUBST(LCMSLIBS,"")
+AC_SUBST([LCMSLIBS],[""])
 if test "$ac_cv_header_lcms_h" = "yes" -o "$ac_cv_header_lcms_lcms_h" = "yes"
 then
-    AC_CHECK_LIB(lcms, cmsOpenProfileFromFile,
-        [AC_DEFINE(HAVE_LCMS, 1, [Define if you have the LittleCMS development environment])
+    AC_CHECK_LIB([lcms], [cmsOpenProfileFromFile],
+        [AC_DEFINE([HAVE_LCMS], 1, [Define if you have the LittleCMS development environment])
          LCMSLIBS="-llcms"])
 fi
-WINE_NOTICE_WITH(cms,[test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"],
+WINE_NOTICE_WITH([cms],[test "$ac_cv_lib_lcms_cmsOpenProfileFromFile" != "yes"],
                  [liblcms ${notice_platform}development files not found, Color Management won't be supported.])
 
 dnl **** Check for FreeType 2 ****
 if test "x$with_freetype" != "xno"
 then
-    AC_CHECK_PROGS(ft_devel,[freetype-config freetype2-config],no)
+    AC_CHECK_PROGS([ft_devel],[freetype-config freetype2-config],[no])
     if test "$ft_devel" != "no"
     then
         ac_freetype_incl=`$ft_devel --cflags`
         ac_freetype_libs=`$ft_devel --libs`
     fi
     ac_freetype_libs=${ac_freetype_libs:-"-lfreetype"}
-    WINE_CHECK_SONAME(freetype,FT_Init_FreeType,[ft_lib=yes],[ft_lib=no],[$ac_freetype_libs])
+    WINE_CHECK_SONAME([freetype],[FT_Init_FreeType],[ft_lib=yes],[ft_lib=no],[$ac_freetype_libs])
     if test "$ft_lib" = "yes"
     then
 	ac_save_CPPFLAGS="$CPPFLAGS"
 	CPPFLAGS="$ac_freetype_incl $CPPFLAGS"
-	AC_CHECK_HEADERS(ft2build.h \
+	AC_CHECK_HEADERS([ft2build.h \
                          freetype/freetype.h \
                          freetype/ftglyph.h \
                          freetype/fttypes.h \
@@ -1238,61 +1238,61 @@ then
                          freetype/ftwinfnt.h \
                          freetype/ftmodapi.h \
                          freetype/ftlcdfil.h \
-                         freetype/internal/sfnt.h,,,
+                         freetype/internal/sfnt.h],[],[],
                          [#ifdef HAVE_FT2BUILD_H
                           # include <ft2build.h>
                           #endif])
 	AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <ft2build.h>
-                    #include <freetype/fttrigon.h>]])],[AC_DEFINE(HAVE_FREETYPE_FTTRIGON_H, 1,
+                    #include <freetype/fttrigon.h>]])],[AC_DEFINE([HAVE_FREETYPE_FTTRIGON_H], 1,
           [Define if you have the <freetype/fttrigon.h> header file.])
                     wine_cv_fttrigon=yes],[wine_cv_fttrigon=no])
-        AC_CHECK_TYPES(FT_TrueTypeEngineType,,,[#include <freetype/ftmodapi.h>])
+        AC_CHECK_TYPES([FT_TrueTypeEngineType],[],[],[#include <freetype/ftmodapi.h>])
         ac_save_CFLAGS="$CFLAGS"
         CFLAGS="$CFLAGS $ac_freetype_libs"
-        AC_CHECK_FUNCS(FT_Load_Sfnt_Table)
+        AC_CHECK_FUNCS([FT_Load_Sfnt_Table])
         CFLAGS="$ac_save_CFLAGS"
 	CPPFLAGS="$ac_save_CPPFLAGS"
 	dnl Check that we have at least freetype/freetype.h
 	if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes"
 	then
-	    AC_DEFINE(HAVE_FREETYPE, 1, [Define if FreeType 2 is installed])
-            AC_SUBST(FREETYPELIBS,"$ac_freetype_libs")
-            AC_SUBST(FREETYPEINCL,"$ac_freetype_incl")
+	    AC_DEFINE([HAVE_FREETYPE], 1, [Define if FreeType 2 is installed])
+            AC_SUBST([FREETYPELIBS],["$ac_freetype_libs"])
+            AC_SUBST([FREETYPEINCL],["$ac_freetype_incl"])
 	fi
     fi
 fi
-WINE_ERROR_WITH(freetype,[test "x$FREETYPELIBS" = "x"],[FreeType ${notice_platform}development files not found. Fonts will not be built.])
+WINE_ERROR_WITH([freetype],[test "x$FREETYPELIBS" = "x"],[FreeType ${notice_platform}development files not found. Fonts will not be built.])
 test "x$FREETYPELIBS" = "x" && enable_fonts=${enable_fonts:-no}
 
 dnl **** Check for parport (currently Linux only) ****
-AC_CACHE_CHECK([for parport header/ppdev.h], ac_cv_c_ppdev,
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <linux/ppdev.h>]], [[ioctl (1,PPCLAIM,0)]])],
-    [ac_cv_c_ppdev="yes"],[ac_cv_c_ppdev="no"]))
+AC_CACHE_CHECK([for parport header/ppdev.h], [ac_cv_c_ppdev],
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <linux/ppdev.h>]], [[ioctl (1,PPCLAIM,0)]])],
+    [ac_cv_c_ppdev="yes"],[ac_cv_c_ppdev="no"])])
 if test "$ac_cv_c_ppdev" = "yes"
 then
-    AC_DEFINE(HAVE_PPDEV, 1, [Define if we can use ppdev.h for parallel port access])
+    AC_DEFINE([HAVE_PPDEV], 1, [Define if we can use ppdev.h for parallel port access])
 fi
 
 dnl **** Check for pthread functions ****
-WINE_CHECK_LIB_FUNCS(\
+WINE_CHECK_LIB_FUNCS([\
         pthread_attr_get_np \
         pthread_getattr_np \
         pthread_get_stackaddr_np \
-        pthread_get_stacksize_np,
+        pthread_get_stacksize_np],
         [$LIBPTHREAD])
 
 dnl **** Check for zlib ****
 if test "$ac_cv_header_zlib_h" = "yes"
 then
-    AC_CHECK_LIB(z,inflate,[AC_DEFINE(HAVE_ZLIB,1,[Define to 1 if you have the `z' library (-lz).])
-                            AC_SUBST(ZLIB,"-lz")])
+    AC_CHECK_LIB([z],[inflate],[AC_DEFINE([HAVE_ZLIB],1,[Define to 1 if you have the `z' library (-lz).])
+                            AC_SUBST([ZLIB],["-lz"])])
 fi
 
 dnl **** Check for EsounD ****
 if test "x$with_esd" != xno
 then
     save_CFLAGS="$CFLAGS"
-    AC_PATH_PROG(ESDCONFIG, esd-config, no)
+    AC_PATH_PROG([ESDCONFIG], [esd-config], [no])
     if test "x$ESDCONFIG" != "xno"
     then
         ac_esd_incl=""
@@ -1306,74 +1306,74 @@ then
         CFLAGS="$CFLAGS $ac_esd_incl"
     fi
     ac_esd_libs=${ac_esd_libs:-"-lesd"}
-    AC_CHECK_HEADER(esd.h,
-        [AC_CHECK_LIB(esd,esd_open_sound,
-            [AC_SUBST(ESDINCL, "$ac_esd_incl")
-             AC_SUBST(ESDLIBS, "$ac_esd_libs")
-             AC_DEFINE(HAVE_ESD, 1, [Define if you have EsounD sound server])],,
+    AC_CHECK_HEADER([esd.h],
+        [AC_CHECK_LIB([esd],[esd_open_sound],
+            [AC_SUBST([ESDINCL], ["$ac_esd_incl"])
+             AC_SUBST([ESDLIBS], ["$ac_esd_libs"])
+             AC_DEFINE([HAVE_ESD], 1, [Define if you have EsounD sound server])],[],
             [$ac_esd_libs])])
     CFLAGS="$save_CFLAGS"
 fi
 
 dnl **** Check for ALSA 1.x ****
-AC_SUBST(ALSALIBS,"")
+AC_SUBST([ALSALIBS],[""])
 if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o "$ac_cv_header_alsa_asoundlib_h" = "yes"
 then
-    AC_CHECK_LIB(asound,snd_pcm_hw_params_get_access,
+    AC_CHECK_LIB([asound],[snd_pcm_hw_params_get_access],
         [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_ALSA_ASOUNDLIB_H
 #include <alsa/asoundlib.h>
 #elif defined(HAVE_SYS_ASOUNDLIB_H)
 #include <sys/asoundlib.h>
 #endif]], [[int ret = snd_pcm_hw_params_get_access(NULL, NULL)]])],
-                        [AC_DEFINE(HAVE_ALSA,1,[Define if you have ALSA 1.x including devel headers])
+                        [AC_DEFINE([HAVE_ALSA],1,[Define if you have ALSA 1.x including devel headers])
                          ALSALIBS="-lasound"],[])])
 fi
 
 dnl **** Check for libaudioio (which can be used to get solaris audio support) ****
-AC_SUBST(AUDIOIOLIBS,"")
+AC_SUBST([AUDIOIOLIBS],[""])
 if test "$ac_cv_header_libaudioio_h" = "yes"
 then
-    AC_CHECK_LIB(audioio,AudioIOGetVersion,
+    AC_CHECK_LIB([audioio],[AudioIOGetVersion],
                   [AUDIOIOLIBS="-laudioio"
-                   AC_DEFINE(HAVE_LIBAUDIOIO, 1, [Define if you have libaudioIO])])
+                   AC_DEFINE([HAVE_LIBAUDIOIO], 1, [Define if you have libaudioIO])])
 fi
 
 dnl **** Check for capi4linux ****
 
 if test "$ac_cv_header_capi20_h" = "yes" -a "$ac_cv_header_linux_capi_h" = "yes"
 then
-    WINE_CHECK_SONAME(capi20,capi20_register)
+    WINE_CHECK_SONAME([capi20],[capi20_register])
 fi
-WINE_NOTICE_WITH(capi,[test "x$ac_cv_lib_soname_capi20" = "x"],
+WINE_NOTICE_WITH([capi],[test "x$ac_cv_lib_soname_capi20" = "x"],
                  [libcapi20 ${notice_platform}development files not found, ISDN won't be supported.])
 
 dnl **** Check for cups ****
-AC_SUBST(CUPSINCL,"")
+AC_SUBST([CUPSINCL],[""])
 if test "x$with_cups" != "xno"
 then
     ac_save_CPPFLAGS="$CPPFLAGS"
     ac_cups_cflags=`cups-config --cflags 2>/dev/null`
     ac_cups_libs=`cups-config --ldflags 2>/dev/null`
     CPPFLAGS="$CPPFLAGS $ac_cups_cflags"
-    AC_CHECK_HEADERS(cups/cups.h,
-            [WINE_CHECK_SONAME(cups,cupsGetDefault,
-                       [CUPSINCL="$ac_cups_cflags"],,
+    AC_CHECK_HEADERS([cups/cups.h],
+            [WINE_CHECK_SONAME([cups],[cupsGetDefault],
+                       [CUPSINCL="$ac_cups_cflags"],[],
                        [$ac_cups_libs])])
     CPPFLAGS="$ac_save_CPPFLAGS"
 fi
-WINE_NOTICE_WITH(cups,[test "x$ac_cv_lib_soname_cups" = "x"],
+WINE_NOTICE_WITH([cups],[test "x$ac_cv_lib_soname_cups" = "x"],
                  [libcups ${notice_platform}development files not found, CUPS won't be supported.])
 
 dnl **** Check for jack ****
 if test "$ac_cv_header_jack_jack_h" = "yes"
 then
-    WINE_CHECK_SONAME(jack,jack_client_new,,,,[[libjack-*[[0-9.]]*]])
+    WINE_CHECK_SONAME([jack],[jack_client_new],[],[],[],[[libjack-*[[0-9.]]*]])
 fi
 
 dnl **** Check for fontconfig ****
 if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes"
 then
-    WINE_CHECK_SONAME(fontconfig,FcInit)
+    WINE_CHECK_SONAME([fontconfig],[FcInit])
 elif test -n "$X_CFLAGS" -a "x$with_fontconfig" != "xno"
 then
     dnl fontconfig is in the X directory on Mac OS X
@@ -1384,45 +1384,45 @@ then
     CPPFLAGS="$ac_save_CPPFLAGS"
     if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes"
     then
-        AC_SUBST(FONTCONFIGINCL,"$X_CFLAGS")
-        WINE_CHECK_SONAME(fontconfig,FcInit,,,[$X_LIBS])
+        AC_SUBST([FONTCONFIGINCL],["$X_CFLAGS"])
+        WINE_CHECK_SONAME([fontconfig],[FcInit],[],[],[$X_LIBS])
     fi
 fi
-WINE_NOTICE_WITH(fontconfig,[test "x$ac_cv_lib_soname_fontconfig" = "x"],
+WINE_NOTICE_WITH([fontconfig],[test "x$ac_cv_lib_soname_fontconfig" = "x"],
                  [fontconfig ${notice_platform}development files not found, fontconfig won't be supported.])
 
 dnl **** Check for SSL ****
 if test "$ac_cv_header_openssl_err_h" = "yes" -a "$ac_cv_header_openssl_ssl_h" = "yes"
 then
-    WINE_CHECK_SONAME(ssl,SSL_library_init)
-    WINE_CHECK_SONAME(crypto,BIO_new_socket)
+    WINE_CHECK_SONAME([ssl],[SSL_library_init])
+    WINE_CHECK_SONAME([crypto],[BIO_new_socket])
 fi
-WINE_WARNING_WITH(openssl,[test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"],
+WINE_WARNING_WITH([openssl],[test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"],
                  [OpenSSL ${notice_platform}development files not found, SSL won't be supported.])
 
 dnl **** Check for gsm codec ****
 if test "$ac_cv_header_gsm_h" = "yes" -o "$ac_cv_header_gsm_gsm_h" = "yes"
 then
-    WINE_CHECK_SONAME(gsm,gsm_create)
+    WINE_CHECK_SONAME([gsm],[gsm_create])
 fi
-WINE_NOTICE_WITH(gsm,[test "x$ac_cv_lib_soname_gsm" = "x"],
+WINE_NOTICE_WITH([gsm],[test "x$ac_cv_lib_soname_gsm" = "x"],
                  [libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.])
 
 dnl **** Check for libjpeg ****
 if test "$ac_cv_header_jpeglib_h" = "yes"
 then
-    WINE_CHECK_SONAME(jpeg,jpeg_start_decompress)
+    WINE_CHECK_SONAME([jpeg],[jpeg_start_decompress])
 fi
-WINE_WARNING_WITH(jpeg,[test "x$ac_cv_lib_soname_jpeg" = "x"],
+WINE_WARNING_WITH([jpeg],[test "x$ac_cv_lib_soname_jpeg" = "x"],
                  [libjpeg ${notice_platform}development files not found, JPEG won't be supported.])
 
 dnl **** Check for libpng ****
 if test "$ac_cv_header_png_h" = "yes"
 then
-    WINE_CHECK_SONAME(png,png_create_read_struct,,,-lm -lz,[[libpng[[0-9]]*]])
-    AC_CHECK_LIB(png,png_set_expand_gray_1_2_4_to_8,
-	[AC_DEFINE(HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8,1,[Define to 1 if libpng has the png_set_expand_gray_1_2_4_to_8 function.])]
-	,,-lm -lz)
+    WINE_CHECK_SONAME([png],[png_create_read_struct],[],[],[-lm -lz],[[libpng[[0-9]]*]])
+    AC_CHECK_LIB([png],[png_set_expand_gray_1_2_4_to_8],
+	[AC_DEFINE([HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8],1,[Define to 1 if libpng has the png_set_expand_gray_1_2_4_to_8 function.])]
+	,[],[-lm -lz])
 elif test -n "$X_CFLAGS" -a "x$with_png" != "xno"
 then
     dnl libpng is in the X directory on Mac OS X
@@ -1433,43 +1433,43 @@ then
     CPPFLAGS="$ac_save_CPPFLAGS"
     if test "$ac_cv_header_png_h" = "yes"
     then
-        AC_SUBST(PNGINCL,"$X_CFLAGS")
-        WINE_CHECK_SONAME(png,png_create_read_struct,,,[$X_LIBS -lm -lz],[[libpng[[0-9]]*]])
-        AC_CHECK_LIB(png,png_set_expand_gray_1_2_4_to_8,
-		[AC_DEFINE(HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8,1)],,[$X_LIBS -lm -lz])
+        AC_SUBST([PNGINCL],["$X_CFLAGS"])
+        WINE_CHECK_SONAME([png],[png_create_read_struct],[],[],[$X_LIBS -lm -lz],[[libpng[[0-9]]*]])
+        AC_CHECK_LIB([png],[png_set_expand_gray_1_2_4_to_8],
+		[AC_DEFINE([HAVE_PNG_SET_EXPAND_GRAY_1_2_4_TO_8],1)],[],[$X_LIBS -lm -lz])
     fi
 fi
-WINE_WARNING_WITH(png,[test "x$ac_cv_lib_soname_png" = "x"],
+WINE_WARNING_WITH([png],[test "x$ac_cv_lib_soname_png" = "x"],
                  [libpng ${notice_platform}development files not found, PNG won't be supported.])
 
 dnl **** Check for mpg123 ****
 if test "$ac_cv_header_mpg123_h" = "yes"
 then
-    AC_CHECK_LIB(mpg123,mpg123_feed,[AC_SUBST(LIBMPG123,"-lmpg123")])
+    AC_CHECK_LIB([mpg123],[mpg123_feed],[AC_SUBST([LIBMPG123],["-lmpg123"])])
 fi
-WINE_NOTICE_WITH(mpg123,[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes],
+WINE_NOTICE_WITH([mpg123],[test "x$ac_cv_lib_mpg123_mpg123_feed" != xyes],
                  [libmpg123 ${notice_platform}development files not found (or too old), mp3 codec won't be supported.])
 test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes || enable_winemp3_acm=${enable_winemp3_acm:-no}
 
 dnl **** Check for OpenAL 1.1 ****
 if test "$ac_cv_header_AL_al_h" = "yes"
 then
-    AC_CHECK_LIB(openal,alGetSource3i,[AC_SUBST(LIBOPENAL,"-lopenal")])
+    AC_CHECK_LIB([openal],[alGetSource3i],[AC_SUBST([LIBOPENAL],["-lopenal"])])
 fi
-WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal_alGetSource3i" != xyes],
+WINE_NOTICE_WITH([openal],[test "x$ac_cv_lib_openal_alGetSource3i" != xyes],
                  [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported.])
 test "x$ac_cv_lib_openal_alGetSource3i" = xyes || enable_openal32=${enable_openal32:-no}
 
 dnl **** Check for libkstat ****
 if test "$ac_cv_header_kstat_h" = "yes"
 then
-    AC_CHECK_LIB(kstat,kstat_open,
-                 [AC_DEFINE(HAVE_LIBKSTAT, 1, [Define to 1 if you have the `kstat' library (-lkstat).])
-                  AC_SUBST(LIBKSTAT,"-lkstat")])
+    AC_CHECK_LIB([kstat],[kstat_open],
+                 [AC_DEFINE([HAVE_LIBKSTAT], 1, [Define to 1 if you have the `kstat' library (-lkstat).])
+                  AC_SUBST([LIBKSTAT],["-lkstat"])])
 fi
 
 dnl **** Check for libodbc ****
-WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])
+WINE_CHECK_SONAME([odbc],[SQLConnect],[],[AC_DEFINE_UNQUOTED([SONAME_LIBODBC],["libodbc.$LIBEXT"])])
 
 dnl **** Check for any sound system ****
 if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
@@ -1483,29 +1483,29 @@ fi
 
 dnl **** Check for gcc specific options ****
 
-AC_SUBST(EXTRACFLAGS,"")
+AC_SUBST([EXTRACFLAGS],[""])
 if test "x${GCC}" = "xyes"
 then
   EXTRACFLAGS="-Wall -pipe"
 
   dnl Check for strength-reduce bug
-  AC_CACHE_CHECK( [for gcc strength-reduce bug], ac_cv_c_gcc_strength_bug,
-                  AC_RUN_IFELSE([AC_LANG_PROGRAM([[int L[[4]] = {0,1,2,3};]],
-[[static int Array[[3]];
+  AC_CACHE_CHECK( [for gcc strength-reduce bug], [ac_cv_c_gcc_strength_bug],
+                  [AC_RUN_IFELSE([AC_LANG_PROGRAM([[int L[4] = {0,1,2,3};]],
+[[static int Array[3];
   unsigned int B = 3;
   int i;
-  for(i=0; i<B; i++) Array[[i]] = i - 3;
-  for(i=0; i<4 - 1; i++) L[[i]] = L[[i + 1]];
-  L[[i]] = 4;
-  return (Array[[1]] != -2 || L[[2]] != 3)]])],
-    [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="yes"]) )
+  for(i=0; i<B; i++) Array[i] = i - 3;
+  for(i=0; i<4 - 1; i++) L[i] = L[i + 1];
+  L[i] = 4;
+  return (Array[1] != -2 || L[2] != 3)]])],
+    [ac_cv_c_gcc_strength_bug="no"],[ac_cv_c_gcc_strength_bug="yes"],[ac_cv_c_gcc_strength_bug="yes"])] )
   if test "$ac_cv_c_gcc_strength_bug" = "yes"
   then
     EXTRACFLAGS="$EXTRACFLAGS -fno-strength-reduce"
   fi
 
   dnl Check for some compiler flags
-  WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST(BUILTINFLAG,"-fno-builtin")])
+  WINE_TRY_CFLAGS([-fno-builtin],[AC_SUBST([BUILTINFLAG],["-fno-builtin"])])
   WINE_TRY_CFLAGS([-fno-strict-aliasing])
   WINE_TRY_CFLAGS([-Wdeclaration-after-statement])
   WINE_TRY_CFLAGS([-Wstrict-prototypes])
@@ -1515,8 +1515,8 @@ then
   dnl Check for noisy string.h
   saved_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Wpointer-arith -Werror"
-  AC_CACHE_CHECK([for broken string.h that generates warnings], ac_cv_c_string_h_warnings,
-      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]], [[]])],[ac_cv_c_string_h_warnings=no],[ac_cv_c_string_h_warnings=yes]))
+  AC_CACHE_CHECK([for broken string.h that generates warnings], [ac_cv_c_string_h_warnings],
+      [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]], [[]])],[ac_cv_c_string_h_warnings=no],[ac_cv_c_string_h_warnings=yes])])
   CFLAGS="$saved_CFLAGS"
   if test "$ac_cv_c_string_h_warnings" = "no"
   then
@@ -1532,41 +1532,41 @@ then
   dnl Check for ms_hook_prologue support
   saved_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Werror"
-  AC_CACHE_CHECK([for ms_hook_prologue attribute], ac_cv_have_ms_hook_prologue,
-                 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int __attribute__((__ms_hook_prologue__)) test(void) { return 0; }]])],
-                                   [ac_cv_have_ms_hook_prologue="yes"],[ac_cv_have_ms_hook_prologue="no"]))
+  AC_CACHE_CHECK([for ms_hook_prologue attribute], [ac_cv_have_ms_hook_prologue],
+                 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int __attribute__((__ms_hook_prologue__)) test(void) { return 0; }]])],
+                                   [ac_cv_have_ms_hook_prologue="yes"],[ac_cv_have_ms_hook_prologue="no"])])
   CFLAGS="$saved_CFLAGS"
   if test "$ac_cv_have_ms_hook_prologue" = "yes"
   then
-      AC_DEFINE(DECLSPEC_HOTPATCH, [__attribute__((__ms_hook_prologue__))],
+      AC_DEFINE([DECLSPEC_HOTPATCH], [__attribute__((__ms_hook_prologue__))],
                 [Define to a function attribute for Microsoft hotpatch assembly prefix.])
   else
-      AC_DEFINE(DECLSPEC_HOTPATCH, [/* */])
+      AC_DEFINE([DECLSPEC_HOTPATCH], [/* */])
   fi
 fi
 
 dnl **** Check for underscore on external symbols ****
 
-AC_CACHE_CHECK([whether external symbols need an underscore prefix], ac_cv_c_extern_prefix,
-    WINE_TRY_ASM_LINK([".globl _ac_test\n_ac_test:\t.long 0"],
+AC_CACHE_CHECK([whether external symbols need an underscore prefix], [ac_cv_c_extern_prefix],
+    [WINE_TRY_ASM_LINK([".globl _ac_test\n_ac_test:\t.long 0"],
                       [extern int ac_test;],
                       [if (ac_test) return 1],
-                      ac_cv_c_extern_prefix="yes",ac_cv_c_extern_prefix="no"))
+                      [ac_cv_c_extern_prefix="yes"],[ac_cv_c_extern_prefix="no"])])
 
 case $host_cpu in
   *i[[3456789]]86*)
-    AC_CACHE_CHECK([whether external symbols need stdcall decoration], ac_cv_c_stdcall_suffix,
-        WINE_TRY_ASM_LINK(["jmp _ac_test at 4"],
+    AC_CACHE_CHECK([whether external symbols need stdcall decoration], [ac_cv_c_stdcall_suffix],
+        [WINE_TRY_ASM_LINK(["jmp _ac_test at 4"],
 [#ifndef _MSC_VER
 #define __stdcall __attribute__((__stdcall__))
 #endif
 int __stdcall ac_test(int i) { return i; }],
                           [if (ac_test(1)) return 1],
-                          ac_cv_c_stdcall_suffix="yes",ac_cv_c_stdcall_suffix="no")) ;;
+                          [ac_cv_c_stdcall_suffix="yes"],[ac_cv_c_stdcall_suffix="no"])]) ;;
   *) ac_cv_c_stdcall_suffix="no" ;;
 esac
 
-AH_TEMPLATE(__ASM_NAME,[Define to a macro to generate an assembly name from a C symbol])
+AH_TEMPLATE([__ASM_NAME],[Define to a macro to generate an assembly name from a C symbol])
 if test "$ac_cv_c_extern_prefix" = "yes"
 then
     AC_DEFINE([__ASM_NAME(name)], ["_" name])
@@ -1576,7 +1576,7 @@ else
     asm_name_prefix=""
 fi
 
-AH_TEMPLATE(__ASM_STDCALL,[Define to a macro to generate an stdcall suffix])
+AH_TEMPLATE([__ASM_STDCALL],[Define to a macro to generate an stdcall suffix])
 if test "$ac_cv_c_stdcall_suffix" = "yes"
 then
     AC_DEFINE([__ASM_STDCALL(args)],["@" #args])
@@ -1586,17 +1586,17 @@ fi
 
 dnl **** Check how to define a function in assembly code ****
 
-AC_CACHE_CHECK([how to define a function in assembly code], ac_cv_asm_func_def,
-  WINE_TRY_ASM_LINK(
-      ["\t.globl _ac_test\n\t.def _ac_test; .scl 2; .type 32; .endef\n_ac_test:\t.long 0"],,,
-      ac_cv_asm_func_def=".def",
-    [WINE_TRY_ASM_LINK(["\t.globl _ac_test\n\t.type _ac_test, at function\n_ac_test:\t.long 0"],,,
-      ac_cv_asm_func_def=".type @function",
-    [WINE_TRY_ASM_LINK(["\t.globl _ac_test\n\t.type _ac_test,2\n_ac_test:\t.long 0"],,,
-      ac_cv_asm_func_def=".type 2",
-      ac_cv_asm_func_def="unknown")])]))
-
-AH_TEMPLATE(__ASM_FUNC,[Define to a macro to generate an assembly function directive])
+AC_CACHE_CHECK([how to define a function in assembly code], [ac_cv_asm_func_def],
+  [WINE_TRY_ASM_LINK(
+      ["\t.globl _ac_test\n\t.def _ac_test; .scl 2; .type 32; .endef\n_ac_test:\t.long 0"],[],[],
+      [ac_cv_asm_func_def=".def"],
+    [WINE_TRY_ASM_LINK(["\t.globl _ac_test\n\t.type _ac_test, at function\n_ac_test:\t.long 0"],[],[],
+      [ac_cv_asm_func_def=".type @function"],
+    [WINE_TRY_ASM_LINK(["\t.globl _ac_test\n\t.type _ac_test,2\n_ac_test:\t.long 0"],[],[],
+      [ac_cv_asm_func_def=".type 2"],
+      [ac_cv_asm_func_def="unknown"])])])])
+
+AH_TEMPLATE([__ASM_FUNC],[Define to a macro to generate an assembly function directive])
 case "$ac_cv_asm_func_def" in
   ".def")
      AC_DEFINE([__ASM_FUNC(name)], [".def " __ASM_NAME(name) "; .scl 2; .type 32; .endef"])
@@ -1612,17 +1612,17 @@ case "$ac_cv_asm_func_def" in
      asm_func_header="" ;;
 esac
 
-AC_CACHE_CHECK([whether asm() works outside of functions], ac_cv_c_asm_outside_funcs,
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[asm(".text\n\t.long 0");]],)],
-                      ac_cv_c_asm_outside_funcs="yes",ac_cv_c_asm_outside_funcs="no"))
+AC_CACHE_CHECK([whether asm() works outside of functions], [ac_cv_c_asm_outside_funcs],
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[asm(".text\n\t.long 0");]],[[]])],
+                      [ac_cv_c_asm_outside_funcs="yes"],[ac_cv_c_asm_outside_funcs="no"])])
 
-AC_CACHE_CHECK([whether .previous is supported in assembly code], ac_cv_c_dot_previous,
-    WINE_TRY_ASM_LINK([".text\nac_test:\t.long 0\n\t.previous"],,,
-                      ac_cv_c_dot_previous="yes",ac_cv_c_dot_previous="no"))
+AC_CACHE_CHECK([whether .previous is supported in assembly code], [ac_cv_c_dot_previous],
+    [WINE_TRY_ASM_LINK([".text\nac_test:\t.long 0\n\t.previous"],[],[],
+                      [ac_cv_c_dot_previous="yes"],[ac_cv_c_dot_previous="no"])])
 
-AC_CACHE_CHECK([whether CFI directives are supported in assembly code], ac_cv_c_cfi_support,
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[asm(".text\nac_test:\t.cfi_startproc\n\t.long 0\n\t.cfi_endproc");]])],
-                      ac_cv_c_cfi_support="yes",ac_cv_c_cfi_support="no"))
+AC_CACHE_CHECK([whether CFI directives are supported in assembly code], [ac_cv_c_cfi_support],
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[asm(".text\nac_test:\t.cfi_startproc\n\t.long 0\n\t.cfi_endproc");]])],
+                      [ac_cv_c_cfi_support="yes"],[ac_cv_c_cfi_support="no"])])
 
 asm_func_header=".globl $asm_name_prefix\" #name suffix \"\\n\\t$asm_func_header\\n$asm_name_prefix\" #name suffix \":\\n\\t"
 asm_func_trailer=""
@@ -1641,24 +1641,24 @@ fi
 
 asm_func_code="$asm_func_header\" code \"$asm_func_trailer"
 
-AH_TEMPLATE(__ASM_DEFINE_FUNC,[Define to a macro to define an assembly function])
+AH_TEMPLATE([__ASM_DEFINE_FUNC],[Define to a macro to define an assembly function])
 if test "$ac_cv_c_asm_outside_funcs" = "yes"
 then
     AC_DEFINE_UNQUOTED([__ASM_DEFINE_FUNC(name,suffix,code)],[asm(".text\n\t.align 4\n\t$asm_func_code");])
 else
     AC_DEFINE_UNQUOTED([__ASM_DEFINE_FUNC(name,suffix,code)],[void __asm_dummy_##name(void) { asm(".text\n\t.align 4\n\t$asm_func_code"); }])
 fi
-AC_DEFINE([__ASM_GLOBAL_FUNC(name,code)],[__ASM_DEFINE_FUNC(name,"",code)],
+AC_DEFINE([__ASM_GLOBAL_FUNC(name,code)],[__ASM_DEFINE_FUNC([name],[""],[code])],
           [Define to a macro to generate an assembly function with C calling convention])
-AC_DEFINE([__ASM_STDCALL_FUNC(name,args,code)],[__ASM_DEFINE_FUNC(name,__ASM_STDCALL(args),code)],
+AC_DEFINE([__ASM_STDCALL_FUNC(name,args,code)],[__ASM_DEFINE_FUNC([name],[__ASM_STDCALL(args)],[code])],
           [Define to a macro to generate an assembly function with stdcall calling convention])
 
 dnl **** Platform-specific checks ****
 
-AC_SUBST(LDPATH,"")
+AC_SUBST([LDPATH],[""])
 case $build_os in
   cygwin*|mingw32*)
-    AC_SUBST(TOOLSEXT,".exe")
+    AC_SUBST([TOOLSEXT],[".exe"])
     LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\""
     ;;
   darwin*|macosx*)
@@ -1671,19 +1671,19 @@ esac
 dnl Mingw needs explicit msvcrt for linking libwine and winsock for wininet
 case $host_os in
   mingw32*)
-    AC_SUBST(CRTLIBS,"-lmsvcrt")
-    AC_SUBST(SOCKETLIBS,"-L\$(TOPOBJDIR)/dlls/ws2_32 -lws2_32")
+    AC_SUBST([CRTLIBS],["-lmsvcrt"])
+    AC_SUBST([SOCKETLIBS],["-L\$(TOPOBJDIR)/dlls/ws2_32 -lws2_32"])
     ;;
 esac
 
-AC_SUBST(MAIN_BINARY,"wine")
+AC_SUBST([MAIN_BINARY],["wine"])
 test -z "$with_wine64" || MAIN_BINARY="wine32"
 
 case $host_cpu in
   *i[[3456789]]86*)
     case $host_os in
       linux*)
-        AC_SUBST(EXTRA_BINARIES,"wine-preloader") ;;
+        AC_SUBST([EXTRA_BINARIES],["wine-preloader"]) ;;
     esac
     ;;
 esac
@@ -1692,7 +1692,7 @@ dnl **** Check for functions ****
 
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $BUILTINFLAG"
-AC_CHECK_FUNCS(\
+AC_CHECK_FUNCS([\
 	_pclose \
 	_popen \
 	_snprintf \
@@ -1765,33 +1765,33 @@ AC_CHECK_FUNCS(\
 	vsnprintf \
 	wait4 \
 	waitpid \
-)
+])
 CFLAGS="$ac_save_CFLAGS"
 
 dnl Check for -ldl
 if test "$ac_cv_func_dlopen" = no
 then
-    AC_CHECK_LIB(dl,dlopen,[AC_DEFINE(HAVE_DLOPEN,1) AC_SUBST(LIBDL,"-ldl")])
+    AC_CHECK_LIB([dl],[dlopen],[AC_DEFINE([HAVE_DLOPEN],1) AC_SUBST([LIBDL],["-ldl"])])
 fi
-WINE_CHECK_LIB_FUNCS(dladdr,[$LIBDL])
+WINE_CHECK_LIB_FUNCS([dladdr],[$LIBDL])
 
 dnl Check for -lpoll for Mac OS X/Darwin
 if test "$ac_cv_func_poll" = no
 then
-    AC_CHECK_LIB(poll,poll,[AC_DEFINE(HAVE_POLL,1) AC_SUBST(LIBPOLL,"-lpoll")])
+    AC_CHECK_LIB([poll],[poll],[AC_DEFINE([HAVE_POLL],1) AC_SUBST([LIBPOLL],["-lpoll"])])
 fi
 
 dnl Check for -lnsl for Solaris
-AC_SEARCH_LIBS(gethostbyname, nsl)
+AC_SEARCH_LIBS([gethostbyname], [nsl])
 
 dnl Check for -lsocket for Solaris
-AC_SEARCH_LIBS(connect, socket)
+AC_SEARCH_LIBS([connect], [socket])
 
 dnl Check for -lresolv for Solaris
-AC_SEARCH_LIBS(inet_aton, resolv)
+AC_SEARCH_LIBS([inet_aton], [resolv])
 
 dnl **** Check for functions which may rely on -lsocket on Solaris.
-AC_CHECK_FUNCS(\
+AC_CHECK_FUNCS([\
 	getaddrinfo \
 	getnameinfo \
 	getnetbyname \
@@ -1803,21 +1803,21 @@ AC_CHECK_FUNCS(\
 	inet_pton \
 	sendmsg \
 	socketpair \
-)
+])
 
 dnl **** Check for OpenLDAP ***
-AC_SUBST(LDAPLIBS,"")
+AC_SUBST([LDAPLIBS],[""])
 if test "$ac_cv_header_ldap_h" = "yes" -a "$ac_cv_header_lber_h" = "yes"
 then
-    AC_CHECK_TYPE(LDAPSortKey,
-        [AC_CHECK_LIB(ldap_r, ldap_initialize,
-            [AC_CHECK_LIB(lber, ber_init,
-                [AC_DEFINE(HAVE_LDAP, 1, [Define if you have the OpenLDAP development environment])
-                 LDAPLIBS="-lldap_r -llber"],,
-                 [$LIBPTHREAD])],,
-                 [$LIBPTHREAD])],,
+    AC_CHECK_TYPE([LDAPSortKey],
+        [AC_CHECK_LIB([ldap_r], [ldap_initialize],
+            [AC_CHECK_LIB([lber], [ber_init],
+                [AC_DEFINE([HAVE_LDAP], 1, [Define if you have the OpenLDAP development environment])
+                 LDAPLIBS="-lldap_r -llber"],[],
+                 [$LIBPTHREAD])],[],
+                 [$LIBPTHREAD])],[],
         [#include <ldap.h>])
-    WINE_CHECK_LIB_FUNCS(\
+    WINE_CHECK_LIB_FUNCS([\
 	ldap_count_references \
 	ldap_first_reference \
 	ldap_next_reference \
@@ -1825,19 +1825,19 @@ then
 	ldap_parse_sort_control \
 	ldap_parse_sortresponse_control \
 	ldap_parse_vlv_control \
-	ldap_parse_vlvresponse_control,
+	ldap_parse_vlvresponse_control],
         [$LDAPLIBS $LIBPTHREAD])
 fi
-WINE_NOTICE_WITH(ldap,[test "x$LDAPLIBS" = "x"],
+WINE_NOTICE_WITH([ldap],[test "x$LDAPLIBS" = "x"],
                  [libldap (OpenLDAP) ${notice_platform}development files not found, LDAP won't be supported.])
 
 AC_CACHE_CHECK([whether mkdir takes only one argument],
-   	wine_cv_one_arg_mkdir,
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]],[[mkdir("foo");]])],
-                          [wine_cv_one_arg_mkdir=yes],[wine_cv_one_arg_mkdir=no]))
+	[wine_cv_one_arg_mkdir],
+	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]],[[mkdir("foo");]])],
+                          [wine_cv_one_arg_mkdir=yes],[wine_cv_one_arg_mkdir=no])])
 if test "$wine_cv_one_arg_mkdir" = "yes"
 then
-  AC_DEFINE(HAVE_ONE_ARG_MKDIR, 1, [Define if mkdir takes only one argument])
+  AC_DEFINE([HAVE_ONE_ARG_MKDIR], 1, [Define if mkdir takes only one argument])
 fi
 
 dnl **** Check for types ****
@@ -1845,11 +1845,11 @@ dnl **** Check for types ****
 AC_C_CONST
 AC_C_INLINE
 AC_CHECK_TYPES([mode_t, off_t, pid_t, size_t, ssize_t, long long, fsblkcnt_t, fsfilcnt_t])
-AC_CHECK_TYPES([sigset_t],,,[#include <sys/types.h>
+AC_CHECK_TYPES([sigset_t],[],[],[#include <sys/types.h>
 #include <signal.h>])
-AC_CHECK_TYPES([request_sense],,,[#include <linux/cdrom.h>])
+AC_CHECK_TYPES([request_sense],[],[],[#include <linux/cdrom.h>])
 
-AC_CHECK_TYPES([struct xinpgen],,,
+AC_CHECK_TYPES([struct xinpgen],[],[],
 [#include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
@@ -1873,22 +1873,22 @@ AC_CHECK_TYPES([struct xinpgen],,,
 #include <netinet/in_pcb.h>
 #endif])
 
-AC_CHECK_MEMBERS([struct ff_effect.direction],,,
+AC_CHECK_MEMBERS([struct ff_effect.direction],[],[],
 [#ifdef HAVE_LINUX_INPUT_H
 #include <linux/input.h>
 #endif])
 
-AC_CACHE_CHECK([for sigaddset],wine_cv_have_sigaddset,
-               AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <signal.h>]], [[sigset_t set; sigaddset(&set,SIGTERM);]])],[wine_cv_have_sigaddset=yes],[wine_cv_have_sigaddset=no]))
+AC_CACHE_CHECK([for sigaddset],[wine_cv_have_sigaddset],
+               [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <signal.h>]], [[sigset_t set; sigaddset(&set,SIGTERM);]])],[wine_cv_have_sigaddset=yes],[wine_cv_have_sigaddset=no])])
 if test "$wine_cv_have_sigaddset" = "yes"
 then
-  AC_DEFINE(HAVE_SIGADDSET, 1, [Define if sigaddset is supported])
+  AC_DEFINE([HAVE_SIGADDSET], 1, [Define if sigaddset is supported])
 fi
 
 
 AC_CACHE_CHECK([whether we can use re-entrant gethostbyname_r Linux style],
-   	wine_cv_linux_gethostbyname_r_6,
-	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]],[[
+	[wine_cv_linux_gethostbyname_r_6],
+	[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]],[[
     char *name=0;
     struct hostent he;
     struct hostent *result;
@@ -1902,18 +1902,18 @@ AC_CACHE_CHECK([whether we can use re-entrant gethostbyname_r Linux style],
     res=gethostbyaddr_r(addr, addrlen, addrtype,&he,buf,bufsize,&result,&errnr);
     ]])],[wine_cv_linux_gethostbyname_r_6=yes],[wine_cv_linux_gethostbyname_r_6=no
 	])
-   )
+   ])
    if test "$wine_cv_linux_gethostbyname_r_6" = "yes"
    then
-      AC_DEFINE(HAVE_LINUX_GETHOSTBYNAME_R_6, 1,
+      AC_DEFINE([HAVE_LINUX_GETHOSTBYNAME_R_6], 1,
                 [Define if Linux-style gethostbyname_r and gethostbyaddr_r are available])
    fi
 
 if test "$ac_cv_header_linux_joystick_h" = "yes"
 then
    AC_CACHE_CHECK([whether linux/joystick.h uses the Linux 2.2+ API],
-   	wine_cv_linux_joystick_22_api,
-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+	[wine_cv_linux_joystick_22_api],
+	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 	#include <sys/ioctl.h>
 	#include <sys/types.h>
 	#include <linux/joystick.h>
@@ -1923,10 +1923,10 @@ then
 	#error "no 2.2 header"
 	#endif
 	]], [[/*empty*/]])],[wine_cv_linux_joystick_22_api=yes],[wine_cv_linux_joystick_22_api=no])
-   )
+   ])
    if test "$wine_cv_linux_joystick_22_api" = "yes"
    then
-      AC_DEFINE(HAVE_LINUX_22_JOYSTICK_API, 1,
+      AC_DEFINE([HAVE_LINUX_22_JOYSTICK_API], 1,
                 [Define if <linux/joystick.h> defines the Linux 2.2 joystick API])
    fi
 fi
@@ -1934,7 +1934,7 @@ fi
 dnl **** FIXME: what about mixed cases, where we need two of them? ***
 
 dnl Check for statfs members
-AC_CHECK_MEMBERS([struct statfs.f_bfree, struct statfs.f_bavail, struct statfs.f_frsize, struct statfs.f_ffree, struct statfs.f_favail, struct statfs.f_namelen],,,
+AC_CHECK_MEMBERS([struct statfs.f_bfree, struct statfs.f_bavail, struct statfs.f_frsize, struct statfs.f_ffree, struct statfs.f_favail, struct statfs.f_namelen],[],[],
 [#include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
@@ -1949,13 +1949,13 @@ AC_CHECK_MEMBERS([struct statfs.f_bfree, struct statfs.f_bavail, struct statfs.f
 # include <sys/statfs.h>
 #endif])
 
-AC_CHECK_MEMBERS([struct statvfs.f_blocks],,,
+AC_CHECK_MEMBERS([struct statvfs.f_blocks],[],[],
 [#ifdef HAVE_SYS_STATVFS_H
 #include <sys/statvfs.h>
 #endif])
 
 dnl Check for socket structure members
-AC_CHECK_MEMBERS([struct msghdr.msg_accrights, struct sockaddr.sa_len, struct sockaddr_un.sun_len],,,
+AC_CHECK_MEMBERS([struct msghdr.msg_accrights, struct sockaddr.sa_len, struct sockaddr_un.sun_len],[],[],
 [#include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
@@ -1965,24 +1965,24 @@ AC_CHECK_MEMBERS([struct msghdr.msg_accrights, struct sockaddr.sa_len, struct so
 #endif])
 
 dnl Check for scsireq_t and sg_io_hdr_t members
-AC_CHECK_MEMBERS([scsireq_t.cmd, sg_io_hdr_t.interface_id],,,
+AC_CHECK_MEMBERS([scsireq_t.cmd, sg_io_hdr_t.interface_id],[],[],
 [#include <sys/types.h>
 #ifdef HAVE_SCSI_SG_H
 #include <scsi/sg.h>
 #endif])
 
 dnl Check for siginfo_t members
-AC_CHECK_MEMBERS([siginfo_t.si_fd],,,[#include <signal.h>])
+AC_CHECK_MEMBERS([siginfo_t.si_fd],[],[],[#include <signal.h>])
 
 dnl Check for struct mtget members
-AC_CHECK_MEMBERS([struct mtget.mt_blksiz, struct mtget.mt_gstat, struct mtget.mt_blkno],,,
+AC_CHECK_MEMBERS([struct mtget.mt_blksiz, struct mtget.mt_gstat, struct mtget.mt_blkno],[],[],
 [#include <sys/types.h>
 #ifdef HAVE_SYS_MTIO_H
 #include <sys/mtio.h>
 #endif])
 
 dnl Check for struct option
-AC_CHECK_MEMBERS([struct option.name],,,
+AC_CHECK_MEMBERS([struct option.name],[],[],
 [#ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif])
@@ -1991,7 +1991,7 @@ dnl Check for stat.st_blocks and ns-resolved times
 AC_CHECK_MEMBERS([struct stat.st_blocks,struct stat.st_mtim,struct stat.st_ctim,struct stat.st_atim])
 
 dnl Check for sin6_scope_id
-AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,,
+AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],[],[],
 [#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -2000,7 +2000,7 @@ AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,,
 #endif])
 
 dnl Check for ns_msg ptr member
-AC_CHECK_MEMBERS([ns_msg._msg_ptr],,,
+AC_CHECK_MEMBERS([ns_msg._msg_ptr],[],[],
 [#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -2012,7 +2012,7 @@ AC_CHECK_MEMBERS([ns_msg._msg_ptr],,,
 #endif])
 
 dnl Check for struct icmpstat.icps_outhist
-AC_CHECK_MEMBERS([struct icmpstat.icps_outhist],,,
+AC_CHECK_MEMBERS([struct icmpstat.icps_outhist],[],[],
 [#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -2048,33 +2048,33 @@ AC_CHECK_MEMBERS([struct icmpstat.icps_outhist],,,
 #endif])
 
 dnl Check for the external timezone variables timezone and daylight
-AC_CACHE_CHECK([for timezone variable], ac_cv_have_timezone,
-               AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[timezone = 1]])],[ac_cv_have_timezone="yes"],[ac_cv_have_timezone="no"]))
+AC_CACHE_CHECK([for timezone variable], [ac_cv_have_timezone],
+               [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[timezone = 1]])],[ac_cv_have_timezone="yes"],[ac_cv_have_timezone="no"])])
 if test "$ac_cv_have_timezone" = "yes"
 then
-    AC_DEFINE(HAVE_TIMEZONE, 1, [Define if you have the timezone variable])
+    AC_DEFINE([HAVE_TIMEZONE], 1, [Define if you have the timezone variable])
 fi
-AC_CACHE_CHECK([for daylight variable], ac_cv_have_daylight,
-               AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[daylight = 1]])],[ac_cv_have_daylight="yes"],[ac_cv_have_daylight="no"]))
+AC_CACHE_CHECK([for daylight variable], [ac_cv_have_daylight],
+               [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[daylight = 1]])],[ac_cv_have_daylight="yes"],[ac_cv_have_daylight="no"])])
 if test "$ac_cv_have_daylight" = "yes"
 then
-    AC_DEFINE(HAVE_DAYLIGHT, 1, [Define if you have the daylight variable])
+    AC_DEFINE([HAVE_DAYLIGHT], 1, [Define if you have the daylight variable])
 fi
 
 dnl Check for isinf
-AC_CACHE_CHECK([for isinf], ac_cv_have_isinf,
-               AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; int i=isinf(f)]])],[ac_cv_have_isinf="yes"],[ac_cv_have_isinf="no"]))
+AC_CACHE_CHECK([for isinf], [ac_cv_have_isinf],
+               [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; int i=isinf(f)]])],[ac_cv_have_isinf="yes"],[ac_cv_have_isinf="no"])])
 if test "$ac_cv_have_isinf" = "yes"
 then
-    AC_DEFINE(HAVE_ISINF, 1, [Define to 1 if you have the `isinf' function.])
+    AC_DEFINE([HAVE_ISINF], 1, [Define to 1 if you have the `isinf' function.])
 fi
 
 dnl Check for isnan
-AC_CACHE_CHECK([for isnan], ac_cv_have_isnan,
-               AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; int i=isnan(f)]])],[ac_cv_have_isnan="yes"],[ac_cv_have_isnan="no"]))
+AC_CACHE_CHECK([for isnan], [ac_cv_have_isnan],
+               [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; int i=isnan(f)]])],[ac_cv_have_isnan="yes"],[ac_cv_have_isnan="no"])])
 if test "$ac_cv_have_isnan" = "yes"
 then
-    AC_DEFINE(HAVE_ISNAN, 1, [Define to 1 if you have the `isnan' function.])
+    AC_DEFINE([HAVE_ISNAN], 1, [Define to 1 if you have the `isnan' function.])
 fi
 
 dnl *** check for the need to define platform-specific symbols
@@ -2093,30 +2093,30 @@ esac
 
 dnl **** Generate output files ****
 
-AC_SUBST(DEPENDENCIES,["### Dependencies:
+AC_SUBST([DEPENDENCIES],["### Dependencies:
 \$(OBJS) \$(CROSSOBJS): \$(IDL_GEN_HEADERS) \$(BISON_SRCS:.y=.tab.h)
 \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)
 \$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb)
 \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)
 \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"])
 
-AC_SUBST(ALL_MAKERULES,"")
-AC_SUBST(ALL_SYMLINKS,"")
-AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"])
-AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"])
-
-AC_SUBST(ALL_DIRS,"")
-AC_SUBST(ALL_TOP_DIRS,"")
-AC_SUBST(ALL_DLL_DIRS,"")
-AC_SUBST(ALL_TOOL_DIRS,"")
-AC_SUBST(ALL_STATICLIB_DIRS,"")
-AC_SUBST(ALL_STATIC_LIBS,"")
-AC_SUBST(ALL_IMPORT_LIBS,"")
-AC_SUBST(ALL_INSTALL_DIRS,"")
-AC_SUBST(ALL_TEST_DIRS,"")
-AC_SUBST(ALL_TEST_BINARIES,"")
-AC_SUBST(ALL_PROGRAM_DIRS,"")
-AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"")
+AC_SUBST([ALL_MAKERULES],[""])
+AC_SUBST([ALL_SYMLINKS],[""])
+AC_SUBST([ALL_MAKEFILE_DEPENDS],["# Makefile dependencies"])
+AC_SUBST([ALL_WINETEST_DEPENDS],["# Test binaries"])
+
+AC_SUBST([ALL_DIRS],[""])
+AC_SUBST([ALL_TOP_DIRS],[""])
+AC_SUBST([ALL_DLL_DIRS],[""])
+AC_SUBST([ALL_TOOL_DIRS],[""])
+AC_SUBST([ALL_STATICLIB_DIRS],[""])
+AC_SUBST([ALL_STATIC_LIBS],[""])
+AC_SUBST([ALL_IMPORT_LIBS],[""])
+AC_SUBST([ALL_INSTALL_DIRS],[""])
+AC_SUBST([ALL_TEST_DIRS],[""])
+AC_SUBST([ALL_TEST_BINARIES],[""])
+AC_SUBST([ALL_PROGRAM_DIRS],[""])
+AC_SUBST([ALL_PROGRAM_BIN_INSTALL_DIRS],[""])
 
 AH_TOP([#define __WINE_CONFIG_H])
 
-- 
1.6.2.5




More information about the wine-patches mailing list