- Issue #8509: Fix quoting in help strings and code snippets in configure.in.

3 files changed, 91 insertions, 86 deletions

diff --git a/Misc/NEWS b/Misc/NEWS
index 747c0c2..e9b3caf 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -91,6 +91,11 @@ Tests
 - Issue #8108: test_ftplib's non-blocking SSL server now has proper handling
   of SSL shutdowns.
 
+Build
+-----
+
+- Issue #8509: Fix quoting in help strings and code snippets in configure.in.
+
 
 What's New in Python 2.7 beta 1?
 ================================
diff --git a/configure b/configure
index 4e8a420..697df6d 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 79902 .
+# From configure.in Revision: 80187 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.7.
 #
@@ -3899,7 +3899,7 @@ else
   { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 
 
@@ -5471,7 +5471,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
@@ -5492,7 +5492,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
@@ -6592,7 +6592,7 @@ _ACEOF
 
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 { echo "$as_me:$LINENO: result: $was_it_defined" >&5
 echo "${ECHO_T}$was_it_defined" >&6; }
@@ -7122,7 +7122,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_type_uid_t=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
@@ -15945,7 +15945,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   unistd_defines_pthreads=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
     { echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5
 echo "${ECHO_T}$unistd_defines_pthreads" >&6; }
@@ -17559,7 +17559,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "yes" >/dev/null 2>&1; then
   ipv6type=$i
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 			;;
 		kame)
@@ -17582,7 +17582,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 				ipv6libdir=/usr/local/v6/lib
 				ipv6trylibc=yes
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 			;;
 		linux-glibc)
@@ -17603,7 +17603,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   ipv6type=$i;
 				ipv6trylibc=yes
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 			;;
 		linux-inet6)
@@ -17641,7 +17641,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 				ipv6lib=inet6;
 				ipv6libdir=/usr/local/v6/lib
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 			;;
 		v6d)
@@ -17664,7 +17664,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 				ipv6libdir=/usr/local/v6/lib;
 				BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 			;;
 		zeta)
@@ -17686,7 +17686,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 				ipv6lib=inet6;
 				ipv6libdir=/usr/local/v6/lib
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 			;;
 		esac
@@ -26232,7 +26232,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -26251,7 +26251,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
@@ -26521,7 +26521,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
diff --git a/configure.in b/configure.in
index a7a0814..63ed01c 100644
--- a/configure.in
+++ b/configure.in
@@ -88,7 +88,7 @@ CONFIG_ARGS="$ac_configure_args"
 
 AC_MSG_CHECKING([for --enable-universalsdk])
 AC_ARG_ENABLE(universalsdk,
-	AC_HELP_STRING(--enable-universalsdk@<:@=SDKDIR@:>@, Build against Mac OS X 10.4u SDK (ppc/i386)),
+	AC_HELP_STRING([--enable-universalsdk@<:@=SDKDIR@:>@], [Build against Mac OS X 10.4u SDK (ppc/i386)]),
 [
 	case $enableval in
 	yes)
@@ -131,7 +131,7 @@ UNIVERSAL_ARCHS="32-bit"
 AC_SUBST(LIPO_32BIT_FLAGS)
 AC_MSG_CHECKING(for --with-universal-archs)
 AC_ARG_WITH(universal-archs,
-    AC_HELP_STRING(--with-universal-archs=ARCH, select architectures for universal build ("32-bit", "64-bit", "3-way", "intel" or "all")),
+    AC_HELP_STRING([--with-universal-archs=ARCH], [select architectures for universal build ("32-bit", "64-bit", "3-way", "intel" or "all")]),
 [
 	AC_MSG_RESULT($withval)
 	UNIVERSAL_ARCHS="$withval"
@@ -148,8 +148,8 @@ AC_ARG_WITH(universal-archs,
 
 
 AC_ARG_WITH(framework-name,
-              AC_HELP_STRING(--with-framework-name=FRAMEWORK, 
-                             specify an alternate name of the framework built with --enable-framework),
+              AC_HELP_STRING([--with-framework-name=FRAMEWORK],
+                             [specify an alternate name of the framework built with --enable-framework]),
 [
     if test "${enable_framework}"; then
 	    :
@@ -166,7 +166,7 @@ AC_ARG_WITH(framework-name,
 ])
 dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
 AC_ARG_ENABLE(framework,
-              AC_HELP_STRING(--enable-framework@<:@=INSTALLDIR@:>@, Build (MacOSX|Darwin) framework),
+              AC_HELP_STRING([--enable-framework@<:@=INSTALLDIR@:>@], [Build (MacOSX|Darwin) framework]),
 [
 	case $enableval in
 	yes) 
@@ -1408,7 +1408,7 @@ AC_TRY_COMPILE([
 #define _LARGEFILE_SOURCE 1
 #define _FILE_OFFSET_BITS 64
 #include <sys/resource.h>
-],struct rlimit foo;,sol_lfs_bug=no,sol_lfs_bug=yes)
+],[struct rlimit foo;],sol_lfs_bug=no,sol_lfs_bug=yes)
 AC_MSG_RESULT($sol_lfs_bug)
 if test "$sol_lfs_bug" = "yes"; then
   use_lfs=no
@@ -1442,7 +1442,7 @@ AC_TYPE_UINT64_T
 AC_TYPE_INT32_T
 AC_TYPE_INT64_T
 AC_CHECK_TYPE(ssize_t,
-  AC_DEFINE(HAVE_SSIZE_T, 1, Define if your compiler provides ssize_t),,)
+  AC_DEFINE(HAVE_SSIZE_T, 1, [Define if your compiler provides ssize_t]),,)
 
 # Sizes of various common basic types
 # ANSI C requires sizeof(char) == 1, so no need to check it
@@ -1552,7 +1552,7 @@ CC="$ac_save_cc"
 
 AC_MSG_CHECKING(for --enable-toolbox-glue)
 AC_ARG_ENABLE(toolbox-glue,
-              AC_HELP_STRING(--enable-toolbox-glue, disable/enable MacOSX glue code for extensions))
+              AC_HELP_STRING([--enable-toolbox-glue], [disable/enable MacOSX glue code for extensions]))
 
 if test -z "$enable_toolbox_glue"
 then 
@@ -2041,7 +2041,7 @@ esac
 
 AC_MSG_CHECKING(for --with-libs)
 AC_ARG_WITH(libs,
-            AC_HELP_STRING(--with-libs='lib1 ...', link against additional libs),
+            AC_HELP_STRING([--with-libs='lib1 ...'], [link against additional libs]),
 [
 AC_MSG_RESULT($withval)
 LIBS="$withval $LIBS"
@@ -2053,14 +2053,14 @@ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 # Check for use of the system expat library
 AC_MSG_CHECKING(for --with-system-expat)
 AC_ARG_WITH(system_expat,
-            AC_HELP_STRING(--with-system-expat, build pyexpat module using an installed expat library))
+            AC_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]))
 
 AC_MSG_RESULT($with_system_expat)
 
 # Check for use of the system libffi library
 AC_MSG_CHECKING(for --with-system-ffi)
 AC_ARG_WITH(system_ffi,
-            AC_HELP_STRING(--with-system-ffi, build _ctypes module using an installed ffi library))
+            AC_HELP_STRING([--with-system-ffi], [build _ctypes module using an installed ffi library]))
 
 if test "$with_system_ffi" = "yes" && test -n "$PKG_CONFIG"; then
     LIBFFI_INCLUDEDIR="`"$PKG_CONFIG" libffi --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ *$//'`"
@@ -2094,7 +2094,7 @@ AC_SUBST(USE_SIGNAL_MODULE)
 AC_SUBST(SIGNAL_OBJS)
 AC_MSG_CHECKING(for --with-signal-module)
 AC_ARG_WITH(signal-module,
-            AC_HELP_STRING(--with-signal-module, disable/enable signal module))
+            AC_HELP_STRING([--with-signal-module], [disable/enable signal module]))
 
 if test -z "$with_signal_module"
 then with_signal_module="yes"
@@ -2116,7 +2116,7 @@ USE_THREAD_MODULE=""
 AC_MSG_CHECKING(for --with-dec-threads)
 AC_SUBST(LDLAST)
 AC_ARG_WITH(dec-threads,
-            AC_HELP_STRING(--with-dec-threads, use DEC Alpha/OSF1 thread-safe libraries),
+            AC_HELP_STRING([--with-dec-threads], [use DEC Alpha/OSF1 thread-safe libraries]),
 [
 AC_MSG_RESULT($withval)
 LDLAST=-threads
@@ -2136,12 +2136,12 @@ AH_TEMPLATE(WITH_THREAD,
 AC_MSG_CHECKING(for --with-threads)
 dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
 AC_ARG_WITH(threads,
-            AC_HELP_STRING(--with(out)-threads@<:@=DIRECTORY@:>@, disable/enable thread support))
+            AC_HELP_STRING([--with(out)-threads@<:@=DIRECTORY@:>@], [disable/enable thread support]))
 
 # --with-thread is deprecated, but check for it anyway
 dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
 AC_ARG_WITH(thread,
-            AC_HELP_STRING(--with(out)-thread@<:@=DIRECTORY@:>@, deprecated; use --with(out)-threads),
+            AC_HELP_STRING([--with(out)-thread@<:@=DIRECTORY@:>@], [deprecated; use --with(out)-threads]),
             [with_threads=$with_thread])
 
 if test -z "$with_threads"
@@ -2222,7 +2222,7 @@ yes
     THREADOBJ="Python/thread.o"],[
     AC_MSG_CHECKING(for --with-pth)
     AC_ARG_WITH([pth],
-                AC_HELP_STRING(--with-pth, use GNU pth threading libraries),
+                AC_HELP_STRING([--with-pth], [use GNU pth threading libraries]),
                 [AC_MSG_RESULT($withval)
                   AC_DEFINE([WITH_THREAD])
                   AC_DEFINE([HAVE_PTH], 1,
@@ -2308,13 +2308,13 @@ if test "$posix_threads" = "yes"; then
       # Bug 662787: Using semaphores causes unexplicable hangs on Solaris 8.
       case  $ac_sys_system/$ac_sys_release in
   SunOS/5.6) AC_DEFINE(HAVE_PTHREAD_DESTRUCTOR, 1,
-                       Defined for Solaris 2.6 bug in pthread header.)
+                       [Defined for Solaris 2.6 bug in pthread header.])
 		       ;;
       SunOS/5.8) AC_DEFINE(HAVE_BROKEN_POSIX_SEMAPHORES, 1,
-		       Define if the Posix semaphores do not work on your system)
+		       [Define if the Posix semaphores do not work on your system])
 		       ;;
       AIX/5) AC_DEFINE(HAVE_BROKEN_POSIX_SEMAPHORES, 1,
-		       Define if the Posix semaphores do not work on your system)
+		       [Define if the Posix semaphores do not work on your system])
 		       ;;
       esac
 
@@ -2519,7 +2519,7 @@ fi
 
 AC_MSG_CHECKING(for OSX 10.5 SDK or later)
 AC_TRY_COMPILE([#include <Carbon/Carbon.h>], FSIORefNum fRef = 0,
-  AC_DEFINE(HAVE_OSX105_SDK, 1, Define if compiling using MacOS X 10.5 SDK or later.)
+  AC_DEFINE(HAVE_OSX105_SDK, 1, [Define if compiling using MacOS X 10.5 SDK or later.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
@@ -2527,7 +2527,7 @@ AC_TRY_COMPILE([#include <Carbon/Carbon.h>], FSIORefNum fRef = 0,
 # Check for --with-doc-strings
 AC_MSG_CHECKING(for --with-doc-strings)
 AC_ARG_WITH(doc-strings,
-            AC_HELP_STRING(--with(out)-doc-strings, disable/enable documentation strings))
+            AC_HELP_STRING([--with(out)-doc-strings], [disable/enable documentation strings]))
 
 if test -z "$with_doc_strings"
 then with_doc_strings="yes"
@@ -2542,7 +2542,7 @@ AC_MSG_RESULT($with_doc_strings)
 # Check for Python-specific malloc support
 AC_MSG_CHECKING(for --with-tsc)
 AC_ARG_WITH(tsc,
-[  --with(out)-tsc         enable/disable timestamp counter profile], [
+	    AC_HELP_STRING([--with(out)-tsc],[enable/disable timestamp counter profile]),[
 if test "$withval" != no
 then 
   AC_DEFINE(WITH_TSC, 1, 
@@ -2555,7 +2555,7 @@ fi],
 # Check for Python-specific malloc support
 AC_MSG_CHECKING(for --with-pymalloc)
 AC_ARG_WITH(pymalloc,
-            AC_HELP_STRING(--with(out)-pymalloc, disable/enable specialized mallocs))
+            AC_HELP_STRING([--with(out)-pymalloc], [disable/enable specialized mallocs]))
 
 if test -z "$with_pymalloc"
 then with_pymalloc="yes"
@@ -2583,7 +2583,7 @@ fi
 # Check for --with-wctype-functions
 AC_MSG_CHECKING(for --with-wctype-functions)
 AC_ARG_WITH(wctype-functions, 
-            AC_HELP_STRING(--with-wctype-functions, use wctype.h functions),
+            AC_HELP_STRING([--with-wctype-functions], [use wctype.h functions]),
 [
 if test "$withval" != no
 then 
@@ -2670,44 +2670,44 @@ AC_CHECK_FUNCS(alarm setitimer getitimer bind_textdomain_codeset chown \
 # For some functions, having a definition is not sufficient, since
 # we want to take their address.
 AC_MSG_CHECKING(for chroot)
-AC_TRY_COMPILE([#include <unistd.h>], void *x=chroot,
-  AC_DEFINE(HAVE_CHROOT, 1, Define if you have the 'chroot' function.)
+AC_TRY_COMPILE([#include <unistd.h>], [void *x=chroot],
+  AC_DEFINE(HAVE_CHROOT, 1, [Define if you have the 'chroot' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
 AC_MSG_CHECKING(for link)
-AC_TRY_COMPILE([#include <unistd.h>], void *x=link,
-  AC_DEFINE(HAVE_LINK, 1, Define if you have the 'link' function.)
+AC_TRY_COMPILE([#include <unistd.h>], [void *x=link],
+  AC_DEFINE(HAVE_LINK, 1, [Define if you have the 'link' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
 AC_MSG_CHECKING(for symlink)
-AC_TRY_COMPILE([#include <unistd.h>], void *x=symlink,
-  AC_DEFINE(HAVE_SYMLINK, 1, Define if you have the 'symlink' function.)
+AC_TRY_COMPILE([#include <unistd.h>], [void *x=symlink],
+  AC_DEFINE(HAVE_SYMLINK, 1, [Define if you have the 'symlink' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
 AC_MSG_CHECKING(for fchdir)
-AC_TRY_COMPILE([#include <unistd.h>], void *x=fchdir,
-  AC_DEFINE(HAVE_FCHDIR, 1, Define if you have the 'fchdir' function.)
+AC_TRY_COMPILE([#include <unistd.h>], [void *x=fchdir],
+  AC_DEFINE(HAVE_FCHDIR, 1, [Define if you have the 'fchdir' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
 AC_MSG_CHECKING(for fsync)
-AC_TRY_COMPILE([#include <unistd.h>], void *x=fsync,
-  AC_DEFINE(HAVE_FSYNC, 1, Define if you have the 'fsync' function.)
+AC_TRY_COMPILE([#include <unistd.h>], [void *x=fsync],
+  AC_DEFINE(HAVE_FSYNC, 1, [Define if you have the 'fsync' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
 AC_MSG_CHECKING(for fdatasync)
-AC_TRY_COMPILE([#include <unistd.h>], void *x=fdatasync,
-  AC_DEFINE(HAVE_FDATASYNC, 1, Define if you have the 'fdatasync' function.)
+AC_TRY_COMPILE([#include <unistd.h>], [void *x=fdatasync],
+  AC_DEFINE(HAVE_FDATASYNC, 1, [Define if you have the 'fdatasync' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
 AC_MSG_CHECKING(for epoll)
-AC_TRY_COMPILE([#include <sys/epoll.h>], void *x=epoll_create,
-  AC_DEFINE(HAVE_EPOLL, 1, Define if you have the 'epoll' functions.)
+AC_TRY_COMPILE([#include <sys/epoll.h>], [void *x=epoll_create],
+  AC_DEFINE(HAVE_EPOLL, 1, [Define if you have the 'epoll' functions.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
@@ -2715,8 +2715,8 @@ AC_MSG_CHECKING(for kqueue)
 AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <sys/event.h>
-    ], int x=kqueue(),
-  AC_DEFINE(HAVE_KQUEUE, 1, Define if you have the 'kqueue' functions.)
+    ], [int x=kqueue()],
+  AC_DEFINE(HAVE_KQUEUE, 1, [Define if you have the 'kqueue' functions.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
@@ -2730,8 +2730,8 @@ AC_MSG_CHECKING(for ctermid_r)
 AC_TRY_COMPILE([
 #include "confdefs.h" 
 #include <stdio.h>
-], void* p = ctermid_r,
-  AC_DEFINE(HAVE_CTERMID_R, 1, Define if you have the 'ctermid_r' function.)
+], [void* p = ctermid_r],
+  AC_DEFINE(HAVE_CTERMID_R, 1, [Define if you have the 'ctermid_r' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
@@ -2740,8 +2740,8 @@ AC_MSG_CHECKING(for flock)
 AC_TRY_COMPILE([
 #include "confdefs.h" 
 #include <sys/file.h>
-], void* p = flock,
-  AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.)
+], [void* p = flock],
+  AC_DEFINE(HAVE_FLOCK, 1, [Define if you have the 'flock' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
@@ -2750,8 +2750,8 @@ AC_MSG_CHECKING(for getpagesize)
 AC_TRY_COMPILE([
 #include "confdefs.h" 
 #include <unistd.h>
-], void* p = getpagesize,
-  AC_DEFINE(HAVE_GETPAGESIZE, 1, Define if you have the 'getpagesize' function.)
+], [void* p = getpagesize],
+  AC_DEFINE(HAVE_GETPAGESIZE, 1, [Define if you have the 'getpagesize' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
@@ -2785,7 +2785,7 @@ if test "$ac_cv_have_chflags" = cross ; then
   AC_CHECK_FUNC([chflags], [ac_cv_have_chflags="yes"], [ac_cv_have_chflags="no"])
 fi
 if test "$ac_cv_have_chflags" = yes ; then
-  AC_DEFINE(HAVE_CHFLAGS, 1, Define to 1 if you have the `chflags' function.)
+  AC_DEFINE(HAVE_CHFLAGS, 1, [Define to 1 if you have the `chflags' function.])
 fi
 
 AC_CACHE_CHECK([for lchflags], [ac_cv_have_lchflags], [dnl
@@ -2806,7 +2806,7 @@ if test "$ac_cv_have_lchflags" = cross ; then
   AC_CHECK_FUNC([lchflags], [ac_cv_have_lchflags="yes"], [ac_cv_have_lchflags="no"])
 fi
 if test "$ac_cv_have_lchflags" = yes ; then
-  AC_DEFINE(HAVE_LCHFLAGS, 1, Define to 1 if you have the `lchflags' function.)
+  AC_DEFINE(HAVE_LCHFLAGS, 1, [Define to 1 if you have the `lchflags' function.])
 fi
 
 dnl Check if system zlib has *Copy() functions
@@ -2829,7 +2829,7 @@ Darwin/*)
 	;;
 esac
 
-AC_CHECK_LIB(z, inflateCopy, AC_DEFINE(HAVE_ZLIB_COPY, 1, Define if the zlib library has inflateCopy))
+AC_CHECK_LIB(z, inflateCopy, AC_DEFINE(HAVE_ZLIB_COPY, 1, [Define if the zlib library has inflateCopy]))
 
 case $ac_sys_system/$ac_sys_release in
 Darwin/*) 
@@ -2842,8 +2842,8 @@ AC_MSG_CHECKING(for hstrerror)
 AC_TRY_LINK([
 #include "confdefs.h" 
 #include <netdb.h>
-], void* p = hstrerror; hstrerror(0),
-  AC_DEFINE(HAVE_HSTRERROR, 1, Define if you have the 'hstrerror' function.)
+], [void* p = hstrerror; hstrerror(0)],
+  AC_DEFINE(HAVE_HSTRERROR, 1, [Define if you have the 'hstrerror' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
@@ -2855,8 +2855,8 @@ AC_TRY_LINK([
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-], void* p = inet_aton;inet_aton(0,0),
-  AC_DEFINE(HAVE_INET_ATON, 1, Define if you have the 'inet_aton' function.)
+], [void* p = inet_aton;inet_aton(0,0)],
+  AC_DEFINE(HAVE_INET_ATON, 1, [Define if you have the 'inet_aton' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
@@ -2868,8 +2868,8 @@ AC_TRY_COMPILE([
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-], void* p = inet_pton,
-  AC_DEFINE(HAVE_INET_PTON, 1, Define if you have the 'inet_pton' function.)
+], [void* p = inet_pton],
+  AC_DEFINE(HAVE_INET_PTON, 1, [Define if you have the 'inet_pton' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
@@ -2883,8 +2883,8 @@ AC_TRY_COMPILE([
 #include <grp.h>
 #endif
 ], 
-void* p = setgroups,
-  AC_DEFINE(HAVE_SETGROUPS, 1, Define if you have the 'setgroups' function.)
+[void* p = setgroups],
+  AC_DEFINE(HAVE_SETGROUPS, 1, [Define if you have the 'setgroups' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
@@ -3186,8 +3186,8 @@ AC_MSG_CHECKING(for socketpair)
 AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <sys/socket.h>
-], void *x=socketpair,
-  AC_DEFINE(HAVE_SOCKETPAIR, 1, Define if you have the 'socketpair' function.)
+], [void *x=socketpair],
+  AC_DEFINE(HAVE_SOCKETPAIR, 1, [Define if you have the 'socketpair' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
@@ -3301,7 +3301,7 @@ AC_CHECK_FUNC(__fpu_control,
 # Check for --with-fpectl
 AC_MSG_CHECKING(for --with-fpectl)
 AC_ARG_WITH(fpectl,
-            AC_HELP_STRING(--with-fpectl, enable SIGFPE catching),
+            AC_HELP_STRING([--with-fpectl], [enable SIGFPE catching]),
 [
 if test "$withval" != no
 then 
@@ -3321,7 +3321,7 @@ BeOS) ;;
 esac
 AC_MSG_CHECKING(for --with-libm=STRING)
 AC_ARG_WITH(libm,
-            AC_HELP_STRING(--with-libm=STRING, math library),
+            AC_HELP_STRING([--with-libm=STRING], [math library]),
 [
 if test "$withval" = no
 then LIBM=
@@ -3337,7 +3337,7 @@ fi],
 AC_SUBST(LIBC)
 AC_MSG_CHECKING(for --with-libc=STRING)
 AC_ARG_WITH(libc,
-            AC_HELP_STRING(--with-libc=STRING, C library),
+            AC_HELP_STRING([--with-libc=STRING], [C library]),
 [
 if test "$withval" = no
 then LIBC=
@@ -3668,7 +3668,7 @@ fi
 AC_MSG_CHECKING(what type to use for unicode)
 dnl quadrigraphs "@<:@" and "@:>@" produce "[" and "]" in the output
 AC_ARG_ENABLE(unicode, 
-              AC_HELP_STRING(--enable-unicode@<:@=ucs@<:@24@:>@@:>@, Enable Unicode strings (default is yes)),
+              AC_HELP_STRING([--enable-unicode@<:@=ucs@<:@24@:>@@:>@], [Enable Unicode strings (default is yes)]),
               [],
               [enable_unicode=yes])
 
@@ -4057,22 +4057,22 @@ then
 fi
 
 AC_MSG_CHECKING(for is_term_resized)
-AC_TRY_COMPILE([#include <curses.h>], void *x=is_term_resized,
-  AC_DEFINE(HAVE_CURSES_IS_TERM_RESIZED, 1, Define if you have the 'is_term_resized' function.)
+AC_TRY_COMPILE([#include <curses.h>], [void *x=is_term_resized],
+  AC_DEFINE(HAVE_CURSES_IS_TERM_RESIZED, 1, [Define if you have the 'is_term_resized' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
 
 AC_MSG_CHECKING(for resize_term)
-AC_TRY_COMPILE([#include <curses.h>], void *x=resize_term,
-  AC_DEFINE(HAVE_CURSES_RESIZE_TERM, 1, Define if you have the 'resize_term' function.)
+AC_TRY_COMPILE([#include <curses.h>], [void *x=resize_term],
+  AC_DEFINE(HAVE_CURSES_RESIZE_TERM, 1, [Define if you have the 'resize_term' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
 
 AC_MSG_CHECKING(for resizeterm)
-AC_TRY_COMPILE([#include <curses.h>], void *x=resizeterm,
-  AC_DEFINE(HAVE_CURSES_RESIZETERM, 1, Define if you have the 'resizeterm' function.)
+AC_TRY_COMPILE([#include <curses.h>], [void *x=resizeterm],
+  AC_DEFINE(HAVE_CURSES_RESIZETERM, 1, [Define if you have the 'resizeterm' function.])
   AC_MSG_RESULT(yes),
   AC_MSG_RESULT(no)
 )
@@ -4199,7 +4199,7 @@ fi
 
 AC_CHECK_TYPE(socklen_t,,
   AC_DEFINE(socklen_t,int,
-            Define to `int' if <sys/socket.h> does not define.),[
+            [Define to `int' if <sys/socket.h> does not define.]),[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif