Index: configure.in =================================================================== --- configure.in (Revision 80407) +++ configure.in (Arbeitskopie) @@ -88,7 +88,7 @@ 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 @@ 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(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 @@ ]) 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 @@ #define _LARGEFILE_SOURCE 1 #define _FILE_OFFSET_BITS 64 #include -],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_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 @@ 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 @@ 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 @@ # 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(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 @@ 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 @@ 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 @@ 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 @@ # 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 @@ AC_MSG_CHECKING(for OSX 10.5 SDK or later) AC_TRY_COMPILE([#include ], 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 @@ # 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 @@ # 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 @@ # 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 @@ # 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 @@ # 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 ], void *x=chroot, - AC_DEFINE(HAVE_CHROOT, 1, Define if you have the 'chroot' function.) +AC_TRY_COMPILE([#include ], [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 ], void *x=link, - AC_DEFINE(HAVE_LINK, 1, Define if you have the 'link' function.) +AC_TRY_COMPILE([#include ], [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 ], void *x=symlink, - AC_DEFINE(HAVE_SYMLINK, 1, Define if you have the 'symlink' function.) +AC_TRY_COMPILE([#include ], [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 ], void *x=fchdir, - AC_DEFINE(HAVE_FCHDIR, 1, Define if you have the 'fchdir' function.) +AC_TRY_COMPILE([#include ], [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 ], void *x=fsync, - AC_DEFINE(HAVE_FSYNC, 1, Define if you have the 'fsync' function.) +AC_TRY_COMPILE([#include ], [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 ], void *x=fdatasync, - AC_DEFINE(HAVE_FDATASYNC, 1, Define if you have the 'fdatasync' function.) +AC_TRY_COMPILE([#include ], [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 ], void *x=epoll_create, - AC_DEFINE(HAVE_EPOLL, 1, Define if you have the 'epoll' functions.) +AC_TRY_COMPILE([#include ], [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_TRY_COMPILE([ #include #include - ], 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_TRY_COMPILE([ #include "confdefs.h" #include -], 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_TRY_COMPILE([ #include "confdefs.h" #include -], 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_TRY_COMPILE([ #include "confdefs.h" #include -], 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 @@ 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 @@ 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 @@ ;; 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_TRY_LINK([ #include "confdefs.h" #include -], 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 @@ #include #include #include -], 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 @@ #include #include #include -], 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 @@ #include #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_TRY_COMPILE([ #include #include -], 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 @@ # 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 @@ 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 @@ 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 @@ 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 @@ fi AC_MSG_CHECKING(for is_term_resized) -AC_TRY_COMPILE([#include ], 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 ], [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 ], void *x=resize_term, - AC_DEFINE(HAVE_CURSES_RESIZE_TERM, 1, Define if you have the 'resize_term' function.) +AC_TRY_COMPILE([#include ], [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 ], void *x=resizeterm, - AC_DEFINE(HAVE_CURSES_RESIZETERM, 1, Define if you have the 'resizeterm' function.) +AC_TRY_COMPILE([#include ], [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 @@ AC_CHECK_TYPE(socklen_t,, AC_DEFINE(socklen_t,int, - Define to `int' if does not define.),[ + [Define to `int' if does not define.]),[ #ifdef HAVE_SYS_TYPES_H #include #endif