Skip to content

Commit

Permalink
INTERNAL: Remove whitespace in m4 files
Browse files Browse the repository at this point in the history
  • Loading branch information
ing-eoking committed Feb 3, 2025
1 parent 6804888 commit 2ddc13a
Show file tree
Hide file tree
Showing 44 changed files with 340 additions and 345 deletions.
12 changes: 6 additions & 6 deletions m4/bottom.m4
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ AC_DEFUN([CONFIG_EXTRA], [
AH_BOTTOM([
#if defined(__cplusplus)
#include CSTDINT_H
#include CINTTYPES_H
#else
#include <stdint.h>
#include <inttypes.h>
#if defined(__cplusplus)
#include CSTDINT_H
#include CINTTYPES_H
#else
#include <stdint.h>
#include <inttypes.h>
#endif
#if !defined(HAVE_ULONG) && !defined(__USE_MISC)
Expand Down
2 changes: 1 addition & 1 deletion m4/eagain.m4
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ AC_DEFUN([DETECT_EAGAIN],
#include <errno.h>
], [
int error = EAGAIN;
switch (error)
switch (error)
{
case EAGAIN:
case EWOULDBLOCK:
Expand Down
8 changes: 4 additions & 4 deletions m4/lib-ld.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions m4/lib-prefix.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion m4/pandora_cinttypes.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion m4/pandora_cstdint.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion m4/pandora_ensure_gcc_version.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
6 changes: 3 additions & 3 deletions m4/pandora_have_better_malloc.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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"],[
Expand Down
4 changes: 2 additions & 2 deletions m4/pandora_have_boost.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down Expand Up @@ -78,7 +78,7 @@ AC_DEFUN([_PANDORA_SEARCH_BOOST],[
])
AM_CONDITIONAL(HAVE_BOOST, [test "x${ac_cv_boost}" = "xyes"])
])

AC_DEFUN([PANDORA_HAVE_BOOST],[
Expand Down
2 changes: 1 addition & 1 deletion m4/pandora_have_gcc_atomics.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
6 changes: 3 additions & 3 deletions m4/pandora_have_libcassandra.m4
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -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],[
Expand Down
2 changes: 1 addition & 1 deletion m4/pandora_have_libdrizzle.m4
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ AC_DEFUN([_PANDORA_SEARCH_LIBDRIZZLE],[
],[
ac_cv_libdrizzle="no"
])
AM_CONDITIONAL(HAVE_LIBDRIZZLE, [test "x${ac_cv_libdrizzle}" = "xyes"])
])

Expand Down
2 changes: 1 addition & 1 deletion m4/pandora_have_libevent.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down
2 changes: 1 addition & 1 deletion m4/pandora_have_libinnodb.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
])

Expand Down
4 changes: 2 additions & 2 deletions m4/pandora_have_libmemcached.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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([[
Expand Down Expand Up @@ -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],[
Expand Down
29 changes: 14 additions & 15 deletions m4/pandora_have_libmysqlclient.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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=":"])
Expand All @@ -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])
Expand Down Expand Up @@ -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])
])
Expand All @@ -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//'`
])
Expand All @@ -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
Expand All @@ -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 <NdbApi.hpp>]], [[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)
Expand All @@ -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)
])

6 changes: 3 additions & 3 deletions m4/pandora_have_libndbclient.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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])
])
Expand Down
2 changes: 1 addition & 1 deletion m4/pandora_have_libpq.m4
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ AC_DEFUN([_PANDORA_SEARCH_LIBPQ],[
],[
ac_cv_libpq="no"
])
AM_CONDITIONAL(HAVE_LIBPQ, [test "x${ac_cv_libpq}" = "xyes"])
])

Expand Down
6 changes: 3 additions & 3 deletions m4/pandora_have_libpqxx.m4
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -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],[
Expand Down
2 changes: 1 addition & 1 deletion m4/pandora_have_libtokyocabinet.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion m4/pandora_have_libxml2.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading

0 comments on commit 2ddc13a

Please sign in to comment.