From 39f6d9cd9fc677481560ff0d25d149ce9c78dd87 Mon Sep 17 00:00:00 2001 From: yeoncheol-kim Date: Fri, 24 Jan 2025 09:11:36 +0900 Subject: [PATCH] INTERNAL: Remove whitespace in m4 files --- m4/bottom.m4 | 12 +- m4/eagain.m4 | 2 +- m4/lib-ld.m4 | 8 +- m4/lib-prefix.m4 | 4 +- m4/pandora_cinttypes.m4 | 2 +- m4/pandora_cstdint.m4 | 2 +- m4/pandora_ensure_gcc_version.m4 | 2 +- m4/pandora_have_better_malloc.m4 | 6 +- m4/pandora_have_boost.m4 | 4 +- m4/pandora_have_gcc_atomics.m4 | 2 +- m4/pandora_have_libcassandra.m4 | 6 +- m4/pandora_have_libdrizzle.m4 | 2 +- m4/pandora_have_libevent.m4 | 2 +- m4/pandora_have_libinnodb.m4 | 2 +- m4/pandora_have_libmemcached.m4 | 4 +- m4/pandora_have_libmysqlclient.m4 | 29 ++- m4/pandora_have_libndbclient.m4 | 6 +- m4/pandora_have_libpq.m4 | 2 +- m4/pandora_have_libpqxx.m4 | 6 +- m4/pandora_have_libtokyocabinet.m4 | 2 +- m4/pandora_have_libxml2.m4 | 2 +- m4/pandora_have_sasl.m4 | 2 +- m4/pandora_have_thrift.m4 | 4 +- m4/pandora_header_assert.m4 | 2 +- m4/pandora_intltool.m4 | 127 +++++++------ m4/pandora_optimize.m4 | 4 +- m4/pandora_platform.m4 | 4 +- m4/pandora_plugins.m4 | 2 +- m4/pandora_python3_devel.m4 | 292 ++++++++++++++--------------- m4/pandora_shared_ptr.m4 | 4 +- m4/pandora_stl_hash.m4 | 2 +- m4/pandora_swig.m4 | 4 +- m4/pandora_use_pipe.m4 | 2 +- m4/pandora_vc_build.m4 | 8 +- m4/pandora_warnings.m4 | 30 +-- m4/pandora_with_gettext.m4 | 4 +- m4/pandora_with_lua.m4 | 6 +- m4/pandora_with_perl.m4 | 10 +- m4/pandora_with_php.m4 | 4 +- m4/pandora_with_python.m4 | 6 +- m4/pandora_with_python3.m4 | 8 +- m4/pandora_with_r.m4 | 6 +- m4/pandora_with_ruby.m4 | 6 +- m4/setsockopt.m4 | 16 +- 44 files changed, 329 insertions(+), 331 deletions(-) diff --git a/m4/bottom.m4 b/m4/bottom.m4 index 55591be4..a1c0598b 100644 --- a/m4/bottom.m4 +++ b/m4/bottom.m4 @@ -2,12 +2,12 @@ AC_DEFUN([CONFIG_EXTRA], [ AH_BOTTOM([ -#if defined(__cplusplus) -#include CSTDINT_H -#include CINTTYPES_H -#else -#include -#include +#if defined(__cplusplus) +#include CSTDINT_H +#include CINTTYPES_H +#else +#include +#include #endif #if !defined(HAVE_ULONG) && !defined(__USE_MISC) diff --git a/m4/eagain.m4 b/m4/eagain.m4 index 3ba8c23f..e5a3d6b3 100644 --- a/m4/eagain.m4 +++ b/m4/eagain.m4 @@ -10,7 +10,7 @@ AC_DEFUN([DETECT_EAGAIN], #include ], [ int error = EAGAIN; -switch (error) +switch (error) { case EAGAIN: case EWOULDBLOCK: diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index 96c4e2c3..f7fd7a32 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -59,7 +59,7 @@ if test "$GCC" = yes; then # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -79,7 +79,7 @@ else fi AC_CACHE_VAL(acl_cv_path_LD, [if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then @@ -89,9 +89,9 @@ AC_CACHE_VAL(acl_cv_path_LD, # Break only if it was the GNU/non-GNU ld that we prefer. case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; + test "$with_gnu_ld" != no && break ;; *) - test "$with_gnu_ld" != yes && break ;; + test "$with_gnu_ld" != yes && break ;; esac fi done diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index bab0cb7f..fbbb1f48 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -187,7 +187,7 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB], [AC_RUN_IFELSE([ AC_LANG_PROGRAM([], [[ return sizeof(void*) == 8 ? 0 : 1; - ]]) + ]]) ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) ]) if test $gl_cv_solaris_64bit = yes; then @@ -201,7 +201,7 @@ AC_DEFUN([AC_LIB_PREPARE_MULTILIB], *) searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" + acl_save_IFS="${IFS= }"; IFS=":" for searchdir in $searchpath; do if test -d "$searchdir"; then case "$searchdir" in diff --git a/m4/pandora_cinttypes.m4 b/m4/pandora_cinttypes.m4 index e4a8b478..b2f82421 100644 --- a/m4/pandora_cinttypes.m4 +++ b/m4/pandora_cinttypes.m4 @@ -5,7 +5,7 @@ # We check two things: where the include file is for cinttypes. We # include AC_TRY_COMPILE for all the combinations we've seen in the -# wild. We define one of HAVE_CINTTYPES or HAVE_TR1_CINTTYPES or +# wild. We define one of HAVE_CINTTYPES or HAVE_TR1_CINTTYPES or # HAVE_BOOST_CINTTYPES depending # on location. diff --git a/m4/pandora_cstdint.m4 b/m4/pandora_cstdint.m4 index 9c848438..ff801195 100644 --- a/m4/pandora_cstdint.m4 +++ b/m4/pandora_cstdint.m4 @@ -5,7 +5,7 @@ # We check two things: where the include file is for cstdint. We # include AC_TRY_COMPILE for all the combinations we've seen in the -# wild. We define one of HAVE_CSTDINT or HAVE_TR1_CSTDINT or +# wild. We define one of HAVE_CSTDINT or HAVE_TR1_CSTDINT or # HAVE_BOOST_CSTDINT depending # on location. diff --git a/m4/pandora_ensure_gcc_version.m4 b/m4/pandora_ensure_gcc_version.m4 index 9d2f65d3..f6cf7cb4 100644 --- a/m4/pandora_ensure_gcc_version.m4 +++ b/m4/pandora_ensure_gcc_version.m4 @@ -41,7 +41,7 @@ AC_DEFUN([PANDORA_RH_GCC44], ]) ]) -dnl +dnl AC_DEFUN([PANDORA_ENSURE_GCC_VERSION],[ AC_REQUIRE([PANDORA_MAC_GCC42]) AC_REQUIRE([PANDORA_RH_GCC44]) diff --git a/m4/pandora_have_better_malloc.m4 b/m4/pandora_have_better_malloc.m4 index c984cbaf..eb525b58 100644 --- a/m4/pandora_have_better_malloc.m4 +++ b/m4/pandora_have_better_malloc.m4 @@ -19,19 +19,19 @@ AC_DEFUN([PANDORA_HAVE_BETTER_MALLOC],[ ;; esac ]) - + AC_ARG_ENABLE([tcmalloc], [AS_HELP_STRING([--enable-tcmalloc], [Enable linking with tcmalloc @<:@default=off@:>@])], [ac_enable_tcmalloc="$enableval"], [ac_enable_tcmalloc="no"]) - + AC_ARG_ENABLE([mtmalloc], [AS_HELP_STRING([--disable-mtmalloc], [Enable linking with mtmalloc @<:@default=on@:>@])], [ac_enable_mtmalloc="$enableval"], [ac_enable_mtmalloc="yes"]) - + save_LIBS="${LIBS}" LIBS= AS_IF([test "x$ac_enable_umem" = "xyes"],[ diff --git a/m4/pandora_have_boost.m4 b/m4/pandora_have_boost.m4 index 2a571dbb..73166d8f 100644 --- a/m4/pandora_have_boost.m4 +++ b/m4/pandora_have_boost.m4 @@ -27,7 +27,7 @@ AC_DEFUN([_PANDORA_SEARCH_BOOST],[ ],[ ac_cv_boost="no" ]) - + AS_IF([test "x$1" != "x"],[ AC_CACHE_CHECK([if boost is recent enough], @@ -78,7 +78,7 @@ AC_DEFUN([_PANDORA_SEARCH_BOOST],[ ]) AM_CONDITIONAL(HAVE_BOOST, [test "x${ac_cv_boost}" = "xyes"]) - + ]) AC_DEFUN([PANDORA_HAVE_BOOST],[ diff --git a/m4/pandora_have_gcc_atomics.m4 b/m4/pandora_have_gcc_atomics.m4 index a106895f..53d7fc10 100644 --- a/m4/pandora_have_gcc_atomics.m4 +++ b/m4/pandora_have_gcc_atomics.m4 @@ -9,7 +9,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([PANDORA_HAVE_GCC_ATOMICS],[ - + AC_CACHE_CHECK( [whether the compiler provides atomic builtins], [ac_cv_gcc_atomic_builtins], diff --git a/m4/pandora_have_libcassandra.m4 b/m4/pandora_have_libcassandra.m4 index e61eb2f4..7756917f 100644 --- a/m4/pandora_have_libcassandra.m4 +++ b/m4/pandora_have_libcassandra.m4 @@ -1,5 +1,5 @@ dnl Copyright (C) 2010 Padraig O'Sullivan -dnl This file is free software; +dnl This file is free software; dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -27,9 +27,9 @@ AC_DEFUN([_PANDORA_SEARCH_LIBCASSANDRA],[ ],[ ac_cv_libcassandra="no" ]) - + AM_CONDITIONAL(HAVE_LIBCASSANDRA, [test "x${ac_cv_libcassandra}" = "xyes"]) - + ]) AC_DEFUN([PANDORA_HAVE_LIBCASSANDRA],[ diff --git a/m4/pandora_have_libdrizzle.m4 b/m4/pandora_have_libdrizzle.m4 index bdd4b6a8..853277fb 100644 --- a/m4/pandora_have_libdrizzle.m4 +++ b/m4/pandora_have_libdrizzle.m4 @@ -26,7 +26,7 @@ AC_DEFUN([_PANDORA_SEARCH_LIBDRIZZLE],[ ],[ ac_cv_libdrizzle="no" ]) - + AM_CONDITIONAL(HAVE_LIBDRIZZLE, [test "x${ac_cv_libdrizzle}" = "xyes"]) ]) diff --git a/m4/pandora_have_libevent.m4 b/m4/pandora_have_libevent.m4 index c7a6c645..43fda7f0 100644 --- a/m4/pandora_have_libevent.m4 +++ b/m4/pandora_have_libevent.m4 @@ -22,7 +22,7 @@ AC_DEFUN([_PANDORA_SEARCH_LIBEVENT],[ bufferevent_settimeout(&bev, 1, 1); event_init(); event_loop(EVLOOP_ONCE); - ]) + ]) AM_CONDITIONAL(HAVE_LIBEVENT, [test "x${ac_cv_libevent}" = "xyes"]) diff --git a/m4/pandora_have_libinnodb.m4 b/m4/pandora_have_libinnodb.m4 index b49374a2..25d00190 100644 --- a/m4/pandora_have_libinnodb.m4 +++ b/m4/pandora_have_libinnodb.m4 @@ -49,7 +49,7 @@ AC_DEFUN([_PANDORA_SEARCH_LIBINNODB],[ AC_MSG_WARN([${PACKAGE} requires at least version 1.0.6 of Embedded InnoDB]) ac_cv_libinnodb=no ]) - + AM_CONDITIONAL(HAVE_LIBINNODB, [test "x${ac_cv_libinnodb}" = "xyes"]) ]) diff --git a/m4/pandora_have_libmemcached.m4 b/m4/pandora_have_libmemcached.m4 index a281306b..955106ca 100644 --- a/m4/pandora_have_libmemcached.m4 +++ b/m4/pandora_have_libmemcached.m4 @@ -38,7 +38,7 @@ AC_DEFUN([_PANDORA_SEARCH_LIBMEMCACHED],[ ],[ ac_cv_libmemcachedprotocol="no" ]) - + AC_CACHE_CHECK([if libmemcached has memcached_server_fn], [pandora_cv_libmemcached_server_fn], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ @@ -85,7 +85,7 @@ AC_DEFUN([_PANDORA_RECENT_LIBMEMCACHED],[ ]) AM_CONDITIONAL(HAVE_LIBMEMCACHED,[test "x${ac_cv_libmemcached}" = "xyes" -a "x${pandora_cv_recent_libmemcached}" = "xyes"]) - + ]) AC_DEFUN([PANDORA_HAVE_LIBMEMCACHED],[ diff --git a/m4/pandora_have_libmysqlclient.m4 b/m4/pandora_have_libmysqlclient.m4 index 63a1e2d6..21772697 100644 --- a/m4/pandora_have_libmysqlclient.m4 +++ b/m4/pandora_have_libmysqlclient.m4 @@ -10,7 +10,7 @@ dnl AC_DEFUN([PANDORA_WITH_MYSQL],[ AC_ARG_WITH([mysql], [AS_HELP_STRING([--with-mysql=PATH], - [path to mysql_config binary or mysql prefix dir])], + [path to mysql_config binary or mysql prefix dir])], [with_mysql=$withval], [with_mysql=":"]) @@ -19,7 +19,7 @@ AC_DEFUN([PANDORA_WITH_MYSQL],[ dnl 2) the location of mysql_config is given: we'll use that to determine dnl 3) a directory argument is given: that will be mysql_base - + dnl option 1: nothing, we need to insert something into MYSQL_CONFIG AS_IF([test "x$with_mysql" = "x:"],[ AC_CHECK_PROGS(MYSQL_CONFIG,[mysql_config]) @@ -60,7 +60,7 @@ MYSQL mysql; ]) AM_CONDITIONAL(HAVE_LIBMYSQLCLIENT, [test "x${ac_cv_libmysqlclient_r}" = "xyes"]) - + AC_DEFUN([PANDORA_HAVE_LIBMYSQLCLIENT],[ AC_REQUIRE([_PANDORA_SEARCH_LIBMYSQLCLIENT]) ]) @@ -83,7 +83,7 @@ AC_DEFUN([PANDORA_REQUIRE_LIBMYSQLCLIENT],[ IBASE=`$MYSQL_CONFIG --include` ADDIFLAGS="" # add regular MySQL C flags - ADDCFLAGS=`$MYSQL_CONFIG --cflags` + ADDCFLAGS=`$MYSQL_CONFIG --cflags` # add NdbAPI specific C flags LDFLAGS="$LDFLAGS "`$MYSQL_CONFIG --libs_r | sed 's/-lmysqlclient_r//'` ]) @@ -97,11 +97,11 @@ AC_DEFUN([PANDORA_REQUIRE_LIBMYSQLCLIENT],[ ADDIFLAGS="$ADDIFLAGS $IBASE/ndb/mgmapi" ADDIFLAGS="$ADDIFLAGS $IBASE" - CFLAGS="$CFLAGS $ADDCFLAGS $ADDIFLAGS" - CXXFLAGS="$CXXFLAGS $ADDCFLAGS $ADDIFLAGS" - MYSQL_INCLUDES="$IBASE $ADDIFLAGS" + CFLAGS="$CFLAGS $ADDCFLAGS $ADDIFLAGS" + CXXFLAGS="$CXXFLAGS $ADDCFLAGS $ADDIFLAGS" + MYSQL_INCLUDES="$IBASE $ADDIFLAGS" + - dnl AC_CHECK_LIB([mysqlclient_r],[safe_mutex_init],,[AC_MSG_ERROR([Can't link against libmysqlclient_r])]) dnl First test to see if we can run with only ndbclient AC_CHECK_LIB([ndbclient],[decimal_bin_size],,[dnl else @@ -113,7 +113,7 @@ AC_DEFUN([PANDORA_REQUIRE_LIBMYSQLCLIENT],[ AC_MSG_ERROR([Can't find decimal_bin_size])])]) AC_MSG_CHECKING(for NdbApi headers) AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[int attr=NdbTransaction::Commit; ]])],[ndbapi_found="yes"],[]) - AS_IF([test "$ndbapi_found" = "yes"], + AS_IF([test "$ndbapi_found" = "yes"], [AC_MSG_RESULT(found)], [AC_MSG_ERROR([Couldn't find NdbApi.hpp!])]) AC_MSG_CHECKING(for NDB_LE_ThreadConfigLoop) @@ -125,22 +125,21 @@ AC_DEFUN([PANDORA_REQUIRE_LIBMYSQLCLIENT],[ [AC_MSG_RESULT(missing)]) LDFLAGS="$LDFLAGS $LIBS" - + MYSQL_MAJOR_VERSION=`$MYSQL_CONFIG --version | sed -e 's/\.//g' -e 's/-//g' -e 's/[A-Za-z]//g' | cut -c1-2` - case "$MYSQL_MAJOR_VERSION" in + case "$MYSQL_MAJOR_VERSION" in 50) AC_DEFINE(MYSQL_50, [1], [mysql5.0]) - ;; + ;; 51) AC_DEFINE(MYSQL_51, [1], [mysql5.1]) ;; *) echo "Unsupported version of MySQL Detected!" ;; esac - + AC_SUBST(MYSQL_MAJOR_VERSION) AC_SUBST(MYSQL_CONFIG) - - + ]) diff --git a/m4/pandora_have_libndbclient.m4 b/m4/pandora_have_libndbclient.m4 index 08337ea7..107301a6 100644 --- a/m4/pandora_have_libndbclient.m4 +++ b/m4/pandora_have_libndbclient.m4 @@ -62,12 +62,12 @@ ndb_init(); AS_IF([test "x${ac_cv_libndbclient}" = "xno"],[ CPPFLAGS="${save_CPPFLAGS}" - ]) + ]) LIBS="${save_LIBS}" - + AM_CONDITIONAL(HAVE_LIBNDBCLIENT, [test "x${ac_cv_libndbclient}" = "xyes"]) ]) - + AC_DEFUN([PANDORA_HAVE_LIBNDBCLIENT],[ AC_REQUIRE([_PANDORA_SEARCH_LIBNDBCLIENT]) ]) diff --git a/m4/pandora_have_libpq.m4 b/m4/pandora_have_libpq.m4 index 28675d1a..60d0eb21 100644 --- a/m4/pandora_have_libpq.m4 +++ b/m4/pandora_have_libpq.m4 @@ -31,7 +31,7 @@ AC_DEFUN([_PANDORA_SEARCH_LIBPQ],[ ],[ ac_cv_libpq="no" ]) - + AM_CONDITIONAL(HAVE_LIBPQ, [test "x${ac_cv_libpq}" = "xyes"]) ]) diff --git a/m4/pandora_have_libpqxx.m4 b/m4/pandora_have_libpqxx.m4 index 30b94368..5c6dbed8 100644 --- a/m4/pandora_have_libpqxx.m4 +++ b/m4/pandora_have_libpqxx.m4 @@ -1,5 +1,5 @@ dnl Copyright (C) 2010 Padraig O'Sullivan -dnl This file is free software; +dnl This file is free software; dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -27,9 +27,9 @@ AC_DEFUN([_PANDORA_SEARCH_LIBPQXX],[ ],[ ac_cv_libpqxx="no" ]) - + AM_CONDITIONAL(HAVE_LIBPQXX, [test "x${ac_cv_libpqxx}" = "xyes"]) - + ]) AC_DEFUN([PANDORA_HAVE_LIBPQXX],[ diff --git a/m4/pandora_have_libtokyocabinet.m4 b/m4/pandora_have_libtokyocabinet.m4 index 91906a7c..6dc2bac6 100644 --- a/m4/pandora_have_libtokyocabinet.m4 +++ b/m4/pandora_have_libtokyocabinet.m4 @@ -2,7 +2,7 @@ dnl Copyright (C) 2009 Sun Microsystems, Inc. dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. - + dnl Provides support for finding libtokyocabinet. dnl LIBTOKYOCABINET_CFLAGS will be set, in addition to LIBTOKYOCABINET and LTLIBTOKYOCABINET diff --git a/m4/pandora_have_libxml2.m4 b/m4/pandora_have_libxml2.m4 index 76c5805c..a9d984ab 100644 --- a/m4/pandora_have_libxml2.m4 +++ b/m4/pandora_have_libxml2.m4 @@ -2,7 +2,7 @@ dnl Copyright (C) 2009 Sun Microsystems, Inc. dnl This file is free software; Sun Microsystems, Inc. dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. - + dnl Provides support for finding libxml2. dnl LIBXML2_CFLAGS will be set, in addition to LIBXML2 and LTLIBXML2 diff --git a/m4/pandora_have_sasl.m4 b/m4/pandora_have_sasl.m4 index ca4a21dc..a955c6bf 100644 --- a/m4/pandora_have_sasl.m4 +++ b/m4/pandora_have_sasl.m4 @@ -35,7 +35,7 @@ AC_DEFUN([_PANDORA_SEARCH_SASL],[ HAVE_LIBSASL="$HAVE_LIBSASL2" LIBSASL="$LIBSASL2" LIBSASL_PREFIX="$LIBSASL2_PREFIX" - LTLIBSASL="$LT_LIBSASL2" + LTLIBSASL="$LT_LIBSASL2" ]) ]) diff --git a/m4/pandora_have_thrift.m4 b/m4/pandora_have_thrift.m4 index b0b3a6c0..defd772b 100644 --- a/m4/pandora_have_thrift.m4 +++ b/m4/pandora_have_thrift.m4 @@ -27,9 +27,9 @@ AC_DEFUN([_PANDORA_SEARCH_THRIFT],[ ],[ ac_cv_thrift="no" ]) - + AM_CONDITIONAL(HAVE_THRIFT, [test "x${ac_cv_thrift}" = "xyes"]) - + ]) AC_DEFUN([PANDORA_HAVE_THRIFT],[ diff --git a/m4/pandora_header_assert.m4 b/m4/pandora_header_assert.m4 index 2fdf9d4c..ad7ab39a 100644 --- a/m4/pandora_header_assert.m4 +++ b/m4/pandora_header_assert.m4 @@ -17,7 +17,7 @@ AC_DEFUN([PANDORA_HEADER_ASSERT], [ac_cv_assert="yes"]) AC_MSG_RESULT([$ac_cv_assert]) - AS_IF([test "$ac_cv_assert" = "no"], + AS_IF([test "$ac_cv_assert" = "no"], [AC_DEFINE(NDEBUG, 1, [Define to 1 if assertions should be disabled.])]) ]) diff --git a/m4/pandora_intltool.m4 b/m4/pandora_intltool.m4 index b3e70625..ce990fa1 100644 --- a/m4/pandora_intltool.m4 +++ b/m4/pandora_intltool.m4 @@ -29,27 +29,28 @@ AC_PREREQ([2.50])dnl AC_REQUIRE([AM_NLS])dnl case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) + ;; + *) + # Do nothing + ;; esac if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - AS_IF([test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"],[ - pandora_have_intltool=yes - ],[ - pandora_have_intltool=no - AC_MSG_WARN([Your intltool is too old. You need intltool $1 or later.]) - ]) + AC_MSG_CHECKING([for intltool >= $1]) + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + ] + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) + AS_IF([test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"],[ + pandora_have_intltool=yes + ],[ + pandora_have_intltool=no + AC_MSG_WARN([Your intltool is too old. You need intltool $1 or later.]) + ]) fi AC_CHECK_HEADERS([libintl.h]) AS_IF([test "x${ac_cv_header_libintl_h}" = "xfalse" -o "x${ac_cv_header_libintl_h}" = "xno"],[ @@ -60,27 +61,27 @@ AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - AC_MSG_WARN([The intltool scripts were not found. Please install intltool.]) - AC_MSG_WARN([On Debian: apt-get install intltool. On Redhat: yum install intltool]) + AC_MSG_WARN([The intltool scripts were not found. Please install intltool.]) + AC_MSG_WARN([On Debian: apt-get install intltool. On Redhat: yum install intltool]) fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' @@ -110,34 +111,34 @@ AC_PATH_PROG(MSGMERGE, msgmerge) AC_PATH_PROG(MSGFMT, msgfmt) AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - AC_MSG_WARN([GNU gettext tools not found; required for intltool]) + AC_MSG_WARN([GNU gettext tools not found; required for intltool]) fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - AC_MSG_WARN([GNU gettext tools not found; required for intltool]) + AC_MSG_WARN([GNU gettext tools not found; required for intltool]) fi AC_PATH_PROG(INTLTOOL_PERL, perl) if test -z "$INTLTOOL_PERL"; then - AC_MSG_WARN([perl not found]) + AC_MSG_WARN([perl not found]) fi AC_MSG_CHECKING([for perl >= 5.8.1]) $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 if test $? -ne 0; then - AC_MSG_WARN([perl 5.8.1 is required for intltool]) + AC_MSG_WARN([perl 5.8.1 is required for intltool]) else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" - AC_MSG_RESULT([$IT_PERL_VERSION]) + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + AC_MSG_RESULT([$IT_PERL_VERSION]) fi if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_WARN([XML::Parser perl module is required for intltool]) - fi + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_WARN([XML::Parser perl module is required for intltool]) + fi fi # Substitute ALL_LINGUAS so we can use it in po/Makefile @@ -185,23 +186,21 @@ dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then - AC_MSG_WARN([$1/Makefile.in.in was not created by intltoolize.]) + AC_MSG_WARN([$1/Makefile.in.in was not created by intltoolize.]) else - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" - >"$1/stamp-it.tmp" - [sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" - ] - [sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r $1/POTFILES - } - ' "$1/Makefile.in" >"$1/Makefile"] - rm -f "$1/Makefile.tmp" - mv "$1/stamp-it.tmp" "$1/stamp-it" + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" >"$1/stamp-it.tmp" + [ sed '/^#/d' \ + -e 's/^[[].*] *//' \ + -e '/^[ ]*$/d' \ + -e "s|^| $ac_top_srcdir/|" \ + "$srcdir/$1/POTFILES.in" | + sed '$!s/$/ \\/' >"$1/POTFILES" ] + [ sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r $1/POTFILES + }' "$1/Makefile.in" > "$1/Makefile" ] + rm -f "$1/Makefile.tmp" + mv "$1/stamp-it.tmp" "$1/stamp-it" fi ]) ])dnl diff --git a/m4/pandora_optimize.m4 b/m4/pandora_optimize.m4 index 05154ed4..40f6b300 100644 --- a/m4/pandora_optimize.m4 +++ b/m4/pandora_optimize.m4 @@ -8,8 +8,8 @@ AC_DEFUN([PANDORA_OPTIMIZE],[ dnl First check for gcc and g++ AS_IF([test "$GCC" = "yes" -a "$INTELCC" = "no"],[ - dnl The following is required for portable results of floating point - dnl calculations on PowerPC. The same must also be done for IA-64, but + dnl The following is required for portable results of floating point + dnl calculations on PowerPC. The same must also be done for IA-64, but dnl this options is missing in the IA-64 gcc backend. case "$target_cpu" in *ppc* | *powerpc*) diff --git a/m4/pandora_platform.m4 b/m4/pandora_platform.m4 index 4d51d2b5..d7cc0966 100644 --- a/m4/pandora_platform.m4 +++ b/m4/pandora_platform.m4 @@ -1,6 +1,6 @@ dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -dnl +dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. dnl This file is free software; Sun Microsystems @@ -97,7 +97,7 @@ AC_DEFUN([PANDORA_PLATFORM],[ AC_CHECK_DECL([__ICC], [INTELCC="yes"], [INTELCC="no"]) AS_IF([test "$INTELCC" = "yes"], [enable_rpath=no]) - + dnl By default, Sun Studio grabs special versions of limits.h and string.h dnl when you use and . By setting this define, we can dnl disable that and cause those to wrap the standard headers instead. diff --git a/m4/pandora_plugins.m4 b/m4/pandora_plugins.m4 index 540443b0..dd794c66 100644 --- a/m4/pandora_plugins.m4 +++ b/m4/pandora_plugins.m4 @@ -15,7 +15,7 @@ AC_DEFUN([PANDORA_PLUGINS],[ dnl going to get there... dnl ANYWAY - syscmd gets called during aclocal - so before automake. It will dnl get called probably during autoconf too, so it's important to protect - dnl with test -f ... if the files exist, we don't have the chicken/egg + dnl with test -f ... if the files exist, we don't have the chicken/egg dnl problem and therefore don't need to do anything here m4_syscmd([PYTHON=${PYTHON:-python} && $PYTHON config/pandora-plugin > /dev/null]) m4_syscmd([test -f config/plugin.stamp || touch config/plugin.stamp aclocal.m4]) diff --git a/m4/pandora_python3_devel.m4 b/m4/pandora_python3_devel.m4 index 53a5ffdc..a940ba5d 100644 --- a/m4/pandora_python3_devel.m4 +++ b/m4/pandora_python3_devel.m4 @@ -1,6 +1,6 @@ dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -dnl +dnl dnl pandora-build: A pedantic build system dnl dnl Copyright (C) 2009 Sun Microsystems, Inc. @@ -63,154 +63,154 @@ dnl dnl 2009-08-23 AC_DEFUN([PANDORA_PYTHON3_DEVEL],[ - # - # Allow the use of a (user set) custom python version - # - AC_ARG_VAR([PYTHON3_VERSION],[The installed Python - version to use, for example '3.0'. This string - will be appended to the Python interpreter - canonical name.]) + # + # Allow the use of a (user set) custom python version + # + AC_ARG_VAR([PYTHON3_VERSION],[The installed Python + version to use, for example '3.0'. This string + will be appended to the Python interpreter + canonical name.]) AS_IF([test -z "$PYTHON3"],[ - AC_PATH_PROG([PYTHON3],[python[$PYTHON3_VERSION]]) + AC_PATH_PROG([PYTHON3],[python[$PYTHON3_VERSION]]) ]) - AS_IF([test -z "$PYTHON3"],[ - AC_MSG_ERROR([Cannot find python$PYTHON3_VERSION in your system path]) - PYTHON3_VERSION="" + AS_IF([test -z "$PYTHON3"],[ + AC_MSG_ERROR([Cannot find python$PYTHON3_VERSION in your system path]) + PYTHON3_VERSION="" ]) - # - # if the macro parameter ``version'' is set, honour it - # - if test -n "$1"; then - AC_MSG_CHECKING([for a version of Python $1]) - ac_supports_python3_ver=`$PYTHON3 -c "import sys, string; \ - ver = string.split(sys.version)[[0]]; \ - print(ver $1)"` - if test "$ac_supports_python3_ver" = "True"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([this package requires Python $1. + # + # if the macro parameter ``version'' is set, honour it + # + if test -n "$1"; then + AC_MSG_CHECKING([for a version of Python $1]) + ac_supports_python3_ver=`$PYTHON3 -c "import sys, string; \ + ver = string.split(sys.version)[[0]]; \ + print(ver $1)"` + if test "$ac_supports_python3_ver" = "True"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([this package requires Python $1. If you have it installed, but it isn't the default Python interpreter in your system path, please pass the PYTHON3_VERSION variable to configure. See ``configure --help'' for reference. ]) - PYTHON_VERSION="" - fi - fi - - # - # Check if you have distutils, else fail - # - AC_MSG_CHECKING([for Python3 distutils package]) - ac_python3_distutils_result=`$PYTHON3 -c "import distutils" 2>&1` - if test -z "$ac_python3_distutils_result"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([cannot import Python3 module "distutils". + PYTHON_VERSION="" + fi + fi + + # + # Check if you have distutils, else fail + # + AC_MSG_CHECKING([for Python3 distutils package]) + ac_python3_distutils_result=`$PYTHON3 -c "import distutils" 2>&1` + if test -z "$ac_python3_distutils_result"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([cannot import Python3 module "distutils". Please check your Python3 installation. The error was: $ac_python3_distutils_result]) - PYTHON3_VERSION="" - fi - - # - # Check for Python include path - # - AC_MSG_CHECKING([for Python3 include path]) - if test -z "$PYTHON3_CPPFLAGS"; then - python3_path=`$PYTHON3 -c "import distutils.sysconfig; \ - print(distutils.sysconfig.get_python_inc());"` - if test -n "${python3_path}"; then - python3_path="-I$python3_path" - fi - PYTHON3_CPPFLAGS=$python3_path - fi - AC_MSG_RESULT([$PYTHON3_CPPFLAGS]) - AC_SUBST([PYTHON3_CPPFLAGS]) - - # - # Check for Python library path - # - AC_MSG_CHECKING([for Python3 library path]) - if test -z "$PYTHON3_LDFLAGS"; then - # (makes two attempts to ensure we've got a version number - # from the interpreter) - py3_version=`$PYTHON3 -c "from distutils.sysconfig import *; \ - print(' '.join(get_config_vars('VERSION')))"` - if test "$py3_version" == "[None]"; then - if test -n "$PYTHON3_VERSION"; then - py3_version=$PYTHON3_VERSION - else - py3_version=`$PYTHON3 -c "import sys; \ - print(sys.version[[:3]])"` - fi - fi - - PYTHON3_LDFLAGS=`$PYTHON3 -c "from distutils.sysconfig import *; \ - print('-L' + get_python_lib(0,1), \ - '-lpython');"`$py3_version - fi - AC_MSG_RESULT([$PYTHON3_LDFLAGS]) - AC_SUBST([PYTHON3_LDFLAGS]) - - # - # Check for site packages - # - AC_MSG_CHECKING([for Python3 site-packages path]) - if test -z "$PYTHON3_SITE_PKG"; then - PYTHON3_SITE_PKG=`$PYTHON3 -c "import distutils.sysconfig; \ - print(distutils.sysconfig.get_python_lib(0,0));"` - fi - AC_MSG_RESULT([$PYTHON3_SITE_PKG]) - AC_SUBST([PYTHON3_SITE_PKG]) - - # - # libraries which must be linked in when embedding - # - AC_MSG_CHECKING(for Python3 embedding libraries) - if test -z "$PYTHON3_EMBED_LIBS"; then - PYTHON3_EMBED_LIBS=`$PYTHON3 -c "import distutils.sysconfig; \ - conf = distutils.sysconfig.get_config_var; \ - print(conf('LOCALMODLIBS'), conf('LIBS'))"` - fi - AC_MSG_RESULT([$PYTHON3_EMBED_LIBS]) - AC_SUBST(PYTHON3_EMBED_LIBS) - - # - # linking flags needed when embedding - # - AC_MSG_CHECKING(for Python3 embedding linking flags) - if test -z "$PYTHON3_EMBED_LDFLAGS"; then - PYTHON3_EMBED_LDFLAGS=`$PYTHON3 -c "import distutils.sysconfig; \ - conf = distutils.sysconfig.get_config_var; \ - print(conf('LINKFORSHARED'))"` - fi - AC_MSG_RESULT([$PYTHON3_EMBED_LDFLAGS]) - AC_SUBST(PYTHON3_EMBED_LDFLAGS) - - # - # final check to see if everything compiles alright - # - AC_MSG_CHECKING([for Python3 development environment consistency]) - AC_LANG_PUSH([C]) - # save current global flags + PYTHON3_VERSION="" + fi + + # + # Check for Python include path + # + AC_MSG_CHECKING([for Python3 include path]) + if test -z "$PYTHON3_CPPFLAGS"; then + python3_path=`$PYTHON3 -c "import distutils.sysconfig; \ + print(distutils.sysconfig.get_python_inc());"` + if test -n "${python3_path}"; then + python3_path="-I$python3_path" + fi + PYTHON3_CPPFLAGS=$python3_path + fi + AC_MSG_RESULT([$PYTHON3_CPPFLAGS]) + AC_SUBST([PYTHON3_CPPFLAGS]) + + # + # Check for Python library path + # + AC_MSG_CHECKING([for Python3 library path]) + if test -z "$PYTHON3_LDFLAGS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) + py3_version=`$PYTHON3 -c "from distutils.sysconfig import *; \ + print(' '.join(get_config_vars('VERSION')))"` + if test "$py3_version" == "[None]"; then + if test -n "$PYTHON3_VERSION"; then + py3_version=$PYTHON3_VERSION + else + py3_version=`$PYTHON3 -c "import sys; \ + print(sys.version[[:3]])"` + fi + fi + + PYTHON3_LDFLAGS=`$PYTHON3 -c "from distutils.sysconfig import *; \ + print('-L' + get_python_lib(0,1), \ + '-lpython');"`$py3_version + fi + AC_MSG_RESULT([$PYTHON3_LDFLAGS]) + AC_SUBST([PYTHON3_LDFLAGS]) + + # + # Check for site packages + # + AC_MSG_CHECKING([for Python3 site-packages path]) + if test -z "$PYTHON3_SITE_PKG"; then + PYTHON3_SITE_PKG=`$PYTHON3 -c "import distutils.sysconfig; \ + print(distutils.sysconfig.get_python_lib(0,0));"` + fi + AC_MSG_RESULT([$PYTHON3_SITE_PKG]) + AC_SUBST([PYTHON3_SITE_PKG]) + + # + # libraries which must be linked in when embedding + # + AC_MSG_CHECKING(for Python3 embedding libraries) + if test -z "$PYTHON3_EMBED_LIBS"; then + PYTHON3_EMBED_LIBS=`$PYTHON3 -c "import distutils.sysconfig; \ + conf = distutils.sysconfig.get_config_var; \ + print(conf('LOCALMODLIBS'), conf('LIBS'))"` + fi + AC_MSG_RESULT([$PYTHON3_EMBED_LIBS]) + AC_SUBST(PYTHON3_EMBED_LIBS) + + # + # linking flags needed when embedding + # + AC_MSG_CHECKING(for Python3 embedding linking flags) + if test -z "$PYTHON3_EMBED_LDFLAGS"; then + PYTHON3_EMBED_LDFLAGS=`$PYTHON3 -c "import distutils.sysconfig; \ + conf = distutils.sysconfig.get_config_var; \ + print(conf('LINKFORSHARED'))"` + fi + AC_MSG_RESULT([$PYTHON3_EMBED_LDFLAGS]) + AC_SUBST(PYTHON3_EMBED_LDFLAGS) + + # + # final check to see if everything compiles alright + # + AC_MSG_CHECKING([for Python3 development environment consistency]) + AC_LANG_PUSH([C]) + # save current global flags ac_save_LIBS="$LIBS" ac_save_CPPFLAGS="$CPPFLAGS" - LIBS="$ac_save_LIBS $PYTHON3_LDFLAGS" - CPPFLAGS="$ac_save_CPPFLAGS $PYTHON3_CPPFLAGS" - AC_TRY_LINK([ - #include - ],[ - Py_Initialize(); - ],[python3exists=yes],[python3exists=no]) - - AC_MSG_RESULT([$python3exists]) - - if test ! "$python3exists" = "yes"; then - AC_MSG_WARN([ + LIBS="$ac_save_LIBS $PYTHON3_LDFLAGS" + CPPFLAGS="$ac_save_CPPFLAGS $PYTHON3_CPPFLAGS" + AC_TRY_LINK([ + #include + ],[ + Py_Initialize(); + ],[python3exists=yes],[python3exists=no]) + + AC_MSG_RESULT([$python3exists]) + + if test ! "$python3exists" = "yes"; then + AC_MSG_WARN([ Could not link test program to Python3. Maybe the main Python3 library has been installed in some non-standard library path. If so, pass it to configure, via the LDFLAGS environment @@ -221,16 +221,16 @@ $ac_python3_distutils_result]) You probably have to install the development version of the Python3 package for your distribution. The exact name of this package varies among them. ============================================================================ - ]) - PYTHON3_VERSION="" - fi - AC_LANG_POP - # turn back to default flags - CPPFLAGS="$ac_save_CPPFLAGS" - LIBS="$ac_save_LIBS" - - # - # all done! - # + ]) + PYTHON3_VERSION="" + fi + AC_LANG_POP + # turn back to default flags + CPPFLAGS="$ac_save_CPPFLAGS" + LIBS="$ac_save_LIBS" + + # + # all done! + # ]) diff --git a/m4/pandora_shared_ptr.m4 b/m4/pandora_shared_ptr.m4 index 61fdf151..fd314cde 100644 --- a/m4/pandora_shared_ptr.m4 +++ b/m4/pandora_shared_ptr.m4 @@ -7,7 +7,7 @@ dnl We check two things: where is the memory include file, and in what dnl namespace does shared_ptr reside. dnl We include AC_COMPILE_IFELSE for all the combinations we've seen in the dnl wild: -dnl +dnl dnl GCC 4.3: namespace: std:: #include dnl GCC 4.2: namespace: tr1:: #include dnl GCC 4.2: namespace: boost:: #include @@ -15,7 +15,7 @@ dnl dnl We define one of HAVE_HAVE_TR1_SHARED_PTR or HAVE_BOOST_SHARED_PTR dnl depending on location, and SHARED_PTR_NAMESPACE to be the namespace in dnl which shared_ptr is defined. -dnl +dnl AC_DEFUN([PANDORA_SHARED_PTR],[ AC_REQUIRE([PANDORA_CHECK_CXX_STANDARD]) diff --git a/m4/pandora_stl_hash.m4 b/m4/pandora_stl_hash.m4 index ef1daac7..a2e2bf31 100644 --- a/m4/pandora_stl_hash.m4 +++ b/m4/pandora_stl_hash.m4 @@ -75,7 +75,7 @@ std::tr1::unordered_map t [if the compiler has boost::unordered_set]) pandora_has_unordered=yes ]) - + AS_IF([test "x${pandora_has_unordered}" != "xyes"],[ AC_MSG_WARN([could not find an STL unordered_map]) ]) diff --git a/m4/pandora_swig.m4 b/m4/pandora_swig.m4 index 89f12dd6..8f0478eb 100644 --- a/m4/pandora_swig.m4 +++ b/m4/pandora_swig.m4 @@ -1,6 +1,6 @@ dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -dnl +dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. dnl This file is free software; Sun Microsystem @@ -12,7 +12,7 @@ dnl From Monty Taylor AC_DEFUN([PANDORA_SWIG],[ AC_PROG_SWIG(1.3.31) - + AC_DEFINE_UNQUOTED([SWIG_TYPE_TABLE], [$PACKAGE], [Type Table name for SWIG symbol table]) diff --git a/m4/pandora_use_pipe.m4 b/m4/pandora_use_pipe.m4 index f877b7f6..4cebfe78 100644 --- a/m4/pandora_use_pipe.m4 +++ b/m4/pandora_use_pipe.m4 @@ -1,6 +1,6 @@ dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -dnl +dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. dnl This file is free software; Sun Microsystem diff --git a/m4/pandora_vc_build.m4 b/m4/pandora_vc_build.m4 index a1fb60b3..8bf6ccc9 100644 --- a/m4/pandora_vc_build.m4 +++ b/m4/pandora_vc_build.m4 @@ -42,7 +42,7 @@ AC_DEFUN([PANDORA_BUILDING_FROM_VC],[ ],[ vc_changelog=yes ]) - + [ PANDORA_RELEASE_DATE=`date +%Y.%m` @@ -79,7 +79,7 @@ AC_DEFUN([PANDORA_BUILDING_FROM_VC],[ mkdir -p config fi - if test "${pandora_building_from_bzr}" = "yes" -o ! -f config/pandora_vc_revinfo ; then + if test "${pandora_building_from_bzr}" = "yes" -o ! -f config/pandora_vc_revinfo ; then cat > config/pandora_vc_revinfo.tmp <() { CFLAGS="$save_CFLAGS"]) dnl GCC 3.4 doesn't have -Wno-attributes, so we can't turn them off - dnl by using that. + dnl by using that. AS_IF([test "$ac_cv_safe_to_use_Wattributes_" != "yes"],[ AS_IF([test "$ac_cv_safe_to_use_Wno_attributes_" = "yes"],[ CC_WARNINGS="${CC_WARNINGS} -Wno-attributes" NO_ATTRIBUTES="-Wno-attributes"])]) - - + + NO_REDUNDANT_DECLS="-Wno-redundant-decls" dnl TODO: Figure out a better way to deal with this: PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow -Wno-missing-braces ${NO_ATTRIBUTES}" diff --git a/m4/pandora_with_gettext.m4 b/m4/pandora_with_gettext.m4 index 9b13e56f..62ed10ea 100644 --- a/m4/pandora_with_gettext.m4 +++ b/m4/pandora_with_gettext.m4 @@ -1,6 +1,6 @@ dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -dnl +dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. dnl This file is free software; Sun Microsystems @@ -11,7 +11,7 @@ dnl From Monty Taylor AC_DEFUN([PANDORA_WITH_GETTEXT],[ - + m4_syscmd([if test -d po ; then echo "# This file is auto-generated from configure. Do not edit directly" > po/POTFILES.in.stamp PACKAGE=$(grep ^AC_INIT configure.ac | cut -f2-3 -d[ | cut -f1 -d]) diff --git a/m4/pandora_with_lua.m4 b/m4/pandora_with_lua.m4 index 322271f8..8181f439 100644 --- a/m4/pandora_with_lua.m4 +++ b/m4/pandora_with_lua.m4 @@ -1,6 +1,6 @@ dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -dnl +dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. dnl This file is free software; Sun Microsystems @@ -11,10 +11,10 @@ dnl From Monty Taylor AC_DEFUN([PANDORA_WITH_LUA],[ dnl Check for lua - AC_ARG_WITH([lua], + AC_ARG_WITH([lua], [AS_HELP_STRING([--with-lua], [Build Lua Bindings @<:@default=yes@:>@])], - [with_lua=$withval], + [with_lua=$withval], [with_lua=yes]) AS_IF([test "x$with_lua" != "xno"],[ diff --git a/m4/pandora_with_perl.m4 b/m4/pandora_with_perl.m4 index 5c1fa1cf..7a0825f0 100644 --- a/m4/pandora_with_perl.m4 +++ b/m4/pandora_with_perl.m4 @@ -1,6 +1,6 @@ dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -dnl +dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. dnl This file is free software; Sun Microsystems @@ -12,10 +12,10 @@ dnl From Monty Taylor AC_DEFUN([PANDORA_WITH_PERL], [ - AC_ARG_WITH([perl], + AC_ARG_WITH([perl], [AS_HELP_STRING([--with-perl], [Build Perl Bindings @<:@default=yes@:>@])], - [with_perl=$withval], + [with_perl=$withval], [with_perl=yes]) AC_ARG_WITH([perl-arch], @@ -43,7 +43,7 @@ AC_DEFUN([PANDORA_WITH_PERL], [ AC_CACHE_CHECK([for Perl development headers], [pandora_cv_perl_dev],[ - + save_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${PERL_CPPFLAGS}" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ @@ -70,7 +70,7 @@ AC_DEFUN([PANDORA_WITH_PERL], [ ]) pandora_cv_perl_archdir="${pandora_cv_perl_archdir}" ]) - + PERL_ARCHDIR="${pandora_cv_perl_archdir}" ]) AC_SUBST([PERL_CPPFLAGS]) diff --git a/m4/pandora_with_php.m4 b/m4/pandora_with_php.m4 index 070b00db..60c9d8ba 100644 --- a/m4/pandora_with_php.m4 +++ b/m4/pandora_with_php.m4 @@ -1,6 +1,6 @@ dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -dnl +dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. dnl This file is free software; Sun Microsystems @@ -51,6 +51,6 @@ AC_DEFUN([PANDORA_WITH_PHP],[ AC_SUBST(PHP_ARCH_DIR) AM_CONDITIONAL(BUILD_PHP, test "$with_php" = "yes") - + ]) diff --git a/m4/pandora_with_python.m4 b/m4/pandora_with_python.m4 index 5b28c8ed..9d6985b0 100644 --- a/m4/pandora_with_python.m4 +++ b/m4/pandora_with_python.m4 @@ -1,6 +1,6 @@ dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -dnl +dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. dnl This file is free software; Sun Microsystems @@ -12,12 +12,12 @@ dnl From Monty Taylor AC_DEFUN([PANDORA_WITH_PYTHON], [ - AC_ARG_WITH([python], + AC_ARG_WITH([python], [AS_HELP_STRING([--with-python], [Build Python Bindings @<:@default=yes@:>@])], [with_python=$withval python_requested=$withval - ], + ], [with_python=yes python_requested=no ]) diff --git a/m4/pandora_with_python3.m4 b/m4/pandora_with_python3.m4 index 0119ed94..c5afcbab 100644 --- a/m4/pandora_with_python3.m4 +++ b/m4/pandora_with_python3.m4 @@ -1,6 +1,6 @@ dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -dnl +dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. dnl This file is free software; Sun Microsystems @@ -13,12 +13,12 @@ AC_DEFUN([PANDORA_WITH_PYTHON3], [ AC_REQUIRE([PANDORA_SWIG]) - AC_ARG_WITH([python3], + AC_ARG_WITH([python3], [AS_HELP_STRING([--with-python3], [Build Python3 Bindings @<:@default=yes@:>@])],[ with_python3=$withval python3_requested=$withval - ],[ + ],[ with_python3=yes python3_requested=no ]) @@ -32,7 +32,7 @@ AC_DEFUN([PANDORA_WITH_PYTHON3], [ AC_PATH_PROG([PYTHON3],[python3],[no]) PANDORA_PYTHON3_DEVEL() AS_IF([test "x$python3exists" = "xno"],[with_python="no"]) - ]) + ]) ]) ]) AS_IF([test "x$with_python3" = "xno" -a "$python3_requested" = "yes"],[ diff --git a/m4/pandora_with_r.m4 b/m4/pandora_with_r.m4 index 843b201b..06bc65c2 100644 --- a/m4/pandora_with_r.m4 +++ b/m4/pandora_with_r.m4 @@ -1,6 +1,6 @@ dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -dnl +dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. dnl This file is free software; Sun Microsystems @@ -11,10 +11,10 @@ dnl From Monty Taylor AC_DEFUN([PANDORA_WITH_R],[ dnl Check for GNU R - AC_ARG_WITH([r], + AC_ARG_WITH([r], [AS_HELP_STRING([--with-r], [Build R Bindings @<:@default=yes@:>@])], - [with_r=$withval], + [with_r=$withval], [with_r=yes]) AS_IF([test "x$with_r" != "xno"],[ diff --git a/m4/pandora_with_ruby.m4 b/m4/pandora_with_ruby.m4 index 2d09e9b1..a6d4ad96 100644 --- a/m4/pandora_with_ruby.m4 +++ b/m4/pandora_with_ruby.m4 @@ -1,6 +1,6 @@ dnl -*- mode: m4; c-basic-offset: 2; indent-tabs-mode: nil; -*- dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab: -dnl +dnl dnl pandora-build: A pedantic build system dnl Copyright (C) 2009 Sun Microsystems, Inc. dnl This file is free software; Sun Microsystems @@ -33,7 +33,7 @@ AC_DEFUN([PANDORA_WITH_RUBY], [ changequote(<<, >>)dnl ruby_prefix=`$RUBY -rrbconfig -e "print Config::CONFIG['archdir']"` strip_ruby_prefix=`$RUBY -rrbconfig -e "print Config::CONFIG['prefix']" | sed 's/\//./g'` - + RUBY_LIB=`$RUBY -rrbconfig -e "puts Config::CONFIG['ruby_install_name']"` LIBRUBYARG_SHARED=`$RUBY -rrbconfig -e "puts Config::CONFIG['LIBRUBYARG_SHARED']"` RUBY_DIR=`$RUBY -rrbconfig -e "puts Config::CONFIG['archdir']"` @@ -48,7 +48,7 @@ AC_DEFUN([PANDORA_WITH_RUBY], [ CFLAGS="$ac_save_CFLAGS $RUBY_INCLUDES" CPPFLAGS="$ac_save_CPPFLAGS $RUBY_INCLUDES" LDFLAGS="$ac_save_LDFLAGS $LIBRUBYARG_SHARED" - + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[VALUE rb_ac_test = rb_define_module("actest");]])],[with_ruby="yes";AC_MSG_RESULT(found)],[with_ruby="no";AC_MSG_RESULT(missing)]) CPPFLAGS="$ac_save_CPPFLAGS" diff --git a/m4/setsockopt.m4 b/m4/setsockopt.m4 index 58c61c0a..5366bb55 100644 --- a/m4/setsockopt.m4 +++ b/m4/setsockopt.m4 @@ -4,7 +4,7 @@ dnl --------------------------------------------------------------------------- AC_DEFUN([SETSOCKOPT_SANITY],[ AC_CACHE_CHECK([for working SO_SNDTIMEO], [ac_cv_have_so_sndtimeo], AC_LANG_PUSH([C]) - AC_RUN_IFELSE([ + AC_RUN_IFELSE([ AC_LANG_PROGRAM([[ #include #include @@ -14,11 +14,11 @@ AC_DEFUN([SETSOCKOPT_SANITY],[ ]],[[ int sock = socket(AF_INET, SOCK_STREAM, 0); struct timeval waittime; - + waittime.tv_sec= 0; waittime.tv_usec= 500; - - if (setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, + + if (setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &waittime, (socklen_t)sizeof(struct timeval)) == -1) { if (errno == ENOPROTOOPT) { return 1; @@ -37,7 +37,7 @@ AC_DEFUN([SETSOCKOPT_SANITY],[ AC_CACHE_CHECK([for working SO_RCVTIMEO], [ac_cv_have_so_rcvtimeo], AC_LANG_PUSH([C]) - AC_RUN_IFELSE([ + AC_RUN_IFELSE([ AC_LANG_PROGRAM([[ #include #include @@ -47,11 +47,11 @@ AC_DEFUN([SETSOCKOPT_SANITY],[ ]],[[ int sock = socket(AF_INET, SOCK_STREAM, 0); struct timeval waittime; - + waittime.tv_sec= 0; waittime.tv_usec= 500; - - if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, + + if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &waittime, (socklen_t)sizeof(struct timeval)) == -1) { if (errno == ENOPROTOOPT) { return 1;