| autoconf-archive-maintainers | |
[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
5 patches, 4 whitespace clean-up, one for autoconf-2.68
|
From: |
Jim Meyering |
|
Subject: |
5 patches, 4 whitespace clean-up, one for autoconf-2.68 |
|
Date: |
Fri, 24 Sep 2010 12:06:35 +0200 |
Hello,
Yesterday I used macros from your project for the first time.
Thank you! FYI, they were these three:
AX_BOOST_BASE
AX_BOOST_SYSTEM
AX_BOOST_THREAD
in a nascent project, http://repo.or.cz/w/iwhd.git
Using them as-is made autoconf-2.68 print many warnings.
I fixed them in two of the .m4 files I'd copied, then
went to prepare a patch for "upstream" (you).
While reading the sources, the whitespace inconsistencies (thanks to
emacs syntax highlighting) jumped out at me, so I first removed those.
That process resulted in the first four change sets. They're separated
the way they are because each change was performed via a single (perhaps
repeated) command line invocation, usually mentioned in the commit log.
With white space consistent (you appear to prefer leading TABs not
leading spaces), I fixed the problem that brought me here in all other
files that had exactly the same syntax:
AC_LINK_IFELSE(AC_LANG_PROGRAM(...)
I converted each to this:
AC_LINK_IFELSE([AC_LANG_PROGRAM(...)]
There may well be other warning-provoking usage, but I didn't look further.
Regards,
Jim
>From d8b70d251b1b3501c96b1292cbd3b1986187fd46 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 24 Sep 2010 10:53:28 +0200
Subject: [PATCH 1/5] replace SP{8}TAB by TABTAB
---
m4/ax_blas.m4 | 2 +-
m4/ax_boost_asio.m4 | 2 +-
m4/ax_boost_date_time.m4 | 2 +-
m4/ax_boost_filesystem.m4 | 4 ++--
m4/ax_boost_iostreams.m4 | 2 +-
m4/ax_boost_program_options.m4 | 4 ++--
m4/ax_boost_regex.m4 | 2 +-
m4/ax_boost_serialization.m4 | 2 +-
m4/ax_boost_signals.m4 | 2 +-
m4/ax_boost_system.m4 | 2 +-
m4/ax_boost_test_exec_monitor.m4 | 6 +++---
m4/ax_boost_thread.m4 | 2 +-
m4/ax_boost_unit_test_framework.m4 | 8 ++++----
m4/ax_boost_wave.m4 | 4 ++--
m4/ax_boost_wserialization.m4 | 2 +-
m4/ax_cc_maxopt.m4 | 2 +-
m4/ax_python_devel.m4 | 2 +-
17 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/m4/ax_blas.m4 b/m4/ax_blas.m4
index c5e545e..ace44a7 100644
--- a/m4/ax_blas.m4
+++ b/m4/ax_blas.m4
@@ -153,7 +153,7 @@ if test $ax_blas_ok = no; then
if test "x$GCC" != xyes; then # only works with Sun CC
AC_CHECK_LIB(sunmath, acosp,
[AC_CHECK_LIB(sunperf, $sgemm,
- [BLAS_LIBS="-xlic_lib=sunperf -lsunmath"
+ [BLAS_LIBS="-xlic_lib=sunperf -lsunmath"
ax_blas_ok=yes],[],[-lsunmath])])
fi
fi
diff --git a/m4/ax_boost_asio.m4 b/m4/ax_boost_asio.m4
index 8cc4666..6014502 100644
--- a/m4/ax_boost_asio.m4
+++ b/m4/ax_boost_asio.m4
@@ -46,7 +46,7 @@ AC_DEFUN([AX_BOOST_ASIO],
ax_boost_user_asio_lib=""
else
want_boost="yes"
- ax_boost_user_asio_lib="$withval"
+ ax_boost_user_asio_lib="$withval"
fi
],
[want_boost="yes"]
diff --git a/m4/ax_boost_date_time.m4 b/m4/ax_boost_date_time.m4
index 9aa1183..577e228 100644
--- a/m4/ax_boost_date_time.m4
+++ b/m4/ax_boost_date_time.m4
@@ -46,7 +46,7 @@ AC_DEFUN([AX_BOOST_DATE_TIME],
ax_boost_user_date_time_lib=""
else
want_boost="yes"
- ax_boost_user_date_time_lib="$withval"
+ ax_boost_user_date_time_lib="$withval"
fi
],
[want_boost="yes"]
diff --git a/m4/ax_boost_filesystem.m4 b/m4/ax_boost_filesystem.m4
index d8dcfc9..b9fffde 100644
--- a/m4/ax_boost_filesystem.m4
+++ b/m4/ax_boost_filesystem.m4
@@ -47,7 +47,7 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
ax_boost_user_filesystem_lib=""
else
want_boost="yes"
- ax_boost_user_filesystem_lib="$withval"
+ ax_boost_user_filesystem_lib="$withval"
fi
],
[want_boost="yes"]
@@ -74,7 +74,7 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
[[using namespace boost::filesystem;
path my_path( "foo/bar/data.txt" );
return 0;]]),
- ax_cv_boost_filesystem=yes,
ax_cv_boost_filesystem=no)
+ ax_cv_boost_filesystem=yes,
ax_cv_boost_filesystem=no)
AC_LANG_POP([C++])
])
if test "x$ax_cv_boost_filesystem" = "xyes"; then
diff --git a/m4/ax_boost_iostreams.m4 b/m4/ax_boost_iostreams.m4
index 63c9ad6..807d12f 100644
--- a/m4/ax_boost_iostreams.m4
+++ b/m4/ax_boost_iostreams.m4
@@ -45,7 +45,7 @@ AC_DEFUN([AX_BOOST_IOSTREAMS],
ax_boost_user_iostreams_lib=""
else
want_boost="yes"
- ax_boost_user_iostreams_lib="$withval"
+ ax_boost_user_iostreams_lib="$withval"
fi
],
[want_boost="yes"]
diff --git a/m4/ax_boost_program_options.m4 b/m4/ax_boost_program_options.m4
index 386ecea..91e51e2 100644
--- a/m4/ax_boost_program_options.m4
+++ b/m4/ax_boost_program_options.m4
@@ -45,7 +45,7 @@ AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
ax_boost_user_program_options_lib=""
else
want_boost="yes"
- ax_boost_user_program_options_lib="$withval"
+ ax_boost_user_program_options_lib="$withval"
fi
],
[want_boost="yes"]
@@ -68,7 +68,7 @@ AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
[[boost::program_options::options_description generic("Generic options");
return 0;]]),
ax_cv_boost_program_options=yes,
ax_cv_boost_program_options=no)
- AC_LANG_POP([C++])
+ AC_LANG_POP([C++])
])
if test "$ax_cv_boost_program_options" = yes; then
AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define
if the Boost::PROGRAM_OPTIONS library is available])
diff --git a/m4/ax_boost_regex.m4 b/m4/ax_boost_regex.m4
index b758aa5..29e31e6 100644
--- a/m4/ax_boost_regex.m4
+++ b/m4/ax_boost_regex.m4
@@ -46,7 +46,7 @@ AC_DEFUN([AX_BOOST_REGEX],
ax_boost_user_regex_lib=""
else
want_boost="yes"
- ax_boost_user_regex_lib="$withval"
+ ax_boost_user_regex_lib="$withval"
fi
],
[want_boost="yes"]
diff --git a/m4/ax_boost_serialization.m4 b/m4/ax_boost_serialization.m4
index 7b71f54..78fe72b 100644
--- a/m4/ax_boost_serialization.m4
+++ b/m4/ax_boost_serialization.m4
@@ -45,7 +45,7 @@ AC_DEFUN([AX_BOOST_SERIALIZATION],
ax_boost_user_serialization_lib=""
else
want_boost="yes"
- ax_boost_user_serialization_lib="$withval"
+ ax_boost_user_serialization_lib="$withval"
fi
],
[want_boost="yes"]
diff --git a/m4/ax_boost_signals.m4 b/m4/ax_boost_signals.m4
index fff2bab..b845cbc 100644
--- a/m4/ax_boost_signals.m4
+++ b/m4/ax_boost_signals.m4
@@ -46,7 +46,7 @@ AC_DEFUN([AX_BOOST_SIGNALS],
ax_boost_user_signals_lib=""
else
want_boost="yes"
- ax_boost_user_signals_lib="$withval"
+ ax_boost_user_signals_lib="$withval"
fi
],
[want_boost="yes"]
diff --git a/m4/ax_boost_system.m4 b/m4/ax_boost_system.m4
index b4fe81e..a6b61be 100644
--- a/m4/ax_boost_system.m4
+++ b/m4/ax_boost_system.m4
@@ -47,7 +47,7 @@ AC_DEFUN([AX_BOOST_SYSTEM],
ax_boost_user_system_lib=""
else
want_boost="yes"
- ax_boost_user_system_lib="$withval"
+ ax_boost_user_system_lib="$withval"
fi
],
[want_boost="yes"]
diff --git a/m4/ax_boost_test_exec_monitor.m4 b/m4/ax_boost_test_exec_monitor.m4
index 86f3ec7..689a438 100644
--- a/m4/ax_boost_test_exec_monitor.m4
+++ b/m4/ax_boost_test_exec_monitor.m4
@@ -46,7 +46,7 @@ AC_DEFUN([AX_BOOST_TEST_EXEC_MONITOR],
ax_boost_user_test_exec_monitor_lib=""
else
want_boost="yes"
- ax_boost_user_test_exec_monitor_lib="$withval"
+ ax_boost_user_test_exec_monitor_lib="$withval"
fi
],
[want_boost="yes"]
@@ -75,7 +75,7 @@ AC_DEFUN([AX_BOOST_TEST_EXEC_MONITOR],
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
if test "x$ax_boost_user_test_exec_monitor_lib" = "x"; then
- saved_ldflags="${LDFLAGS}"
+ saved_ldflags="${LDFLAGS}"
for monitor_library in `ls
$BOOSTLIBDIR/libboost_test_exec_monitor*.so*
$BOOSTLIBDIR/libboost_test_exec_monitor*.a* 2>/dev/null` ; do
if test -r $monitor_library ; then
@@ -103,7 +103,7 @@ AC_DEFUN([AX_BOOST_TEST_EXEC_MONITOR],
else
link_test_exec_monitor="no"
- saved_ldflags="${LDFLAGS}"
+ saved_ldflags="${LDFLAGS}"
for ax_lib in
boost_test_exec_monitor-$ax_boost_user_test_exec_monitor_lib
$ax_boost_user_test_exec_monitor_lib ; do
if test "x$link_test_exec_monitor" = "xyes"; then
break;
diff --git a/m4/ax_boost_thread.m4 b/m4/ax_boost_thread.m4
index fb7e530..76ee890 100644
--- a/m4/ax_boost_thread.m4
+++ b/m4/ax_boost_thread.m4
@@ -46,7 +46,7 @@ AC_DEFUN([AX_BOOST_THREAD],
ax_boost_user_thread_lib=""
else
want_boost="yes"
- ax_boost_user_thread_lib="$withval"
+ ax_boost_user_thread_lib="$withval"
fi
],
[want_boost="yes"]
diff --git a/m4/ax_boost_unit_test_framework.m4
b/m4/ax_boost_unit_test_framework.m4
index 8cfc9c9..4ddf244 100644
--- a/m4/ax_boost_unit_test_framework.m4
+++ b/m4/ax_boost_unit_test_framework.m4
@@ -45,7 +45,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
ax_boost_user_unit_test_framework_lib=""
else
want_boost="yes"
- ax_boost_user_unit_test_framework_lib="$withval"
+ ax_boost_user_unit_test_framework_lib="$withval"
fi
],
[want_boost="yes"]
@@ -75,7 +75,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then
- saved_ldflags="${LDFLAGS}"
+ saved_ldflags="${LDFLAGS}"
for monitor_library in `ls
$BOOSTLIBDIR/libboost_unit_test_framework*.so*
$BOOSTLIBDIR/libboost_unit_test_framework*.a* 2>/dev/null` ; do
if test -r $monitor_library ; then
libextension=`echo $monitor_library | sed 's,.*/,,' |
sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e
's;^lib\(boost_unit_test_framework.*\)\.a*$;\1;'`
@@ -85,7 +85,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
link_unit_test_framework="no"
fi
- if test "x$link_unit_test_framework" = "xyes"; then
+ if test "x$link_unit_test_framework" = "xyes"; then
BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
break
@@ -101,7 +101,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
fi
else
link_unit_test_framework="no"
- saved_ldflags="${LDFLAGS}"
+ saved_ldflags="${LDFLAGS}"
for ax_lib in
boost_unit_test_framework-$ax_boost_user_unit_test_framework_lib
$ax_boost_user_unit_test_framework_lib ; do
if test "x$link_unit_test_framework" = "xyes"; then
break;
diff --git a/m4/ax_boost_wave.m4 b/m4/ax_boost_wave.m4
index 04e87c4..9b4d959 100644
--- a/m4/ax_boost_wave.m4
+++ b/m4/ax_boost_wave.m4
@@ -46,7 +46,7 @@ AC_DEFUN([AX_BOOST_WAVE],
ax_boost_user_wave_lib=""
else
want_boost="yes"
- ax_boost_user_wave_lib="$withval"
+ ax_boost_user_wave_lib="$withval"
fi
],
[want_boost="yes"]
@@ -120,7 +120,7 @@ AC_DEFUN([AX_BOOST_WAVE],
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
LIBS="$LIBS_SAVED"
fi
diff --git a/m4/ax_boost_wserialization.m4 b/m4/ax_boost_wserialization.m4
index 7ed2640..60c2b71 100644
--- a/m4/ax_boost_wserialization.m4
+++ b/m4/ax_boost_wserialization.m4
@@ -45,7 +45,7 @@ AC_DEFUN([AX_BOOST_WSERIALIZATION],
ax_boost_user_wserialization_lib=""
else
want_boost="yes"
- ax_boost_user_wserialization_lib="$withval"
+ ax_boost_user_wserialization_lib="$withval"
fi
],
[want_boost="yes"]
diff --git a/m4/ax_cc_maxopt.m4 b/m4/ax_cc_maxopt.m4
index 8fb4c8b..e88d7e0 100644
--- a/m4/ax_cc_maxopt.m4
+++ b/m4/ax_cc_maxopt.m4
@@ -91,7 +91,7 @@ if test "$ac_test_CFLAGS" != "set"; then
xlc_opt="-qtune=auto"
fi
AX_CHECK_COMPILER_FLAGS($xlc_opt,
- CFLAGS="-O3 -qansialias -w $xlc_opt",
+ CFLAGS="-O3 -qansialias -w $xlc_opt",
[CFLAGS="-O3 -qansialias -w"
echo "******************************************************"
echo "* You seem to have the IBM C compiler. It is *"
diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
index 8dfa5e1..c4ed314 100644
--- a/m4/ax_python_devel.m4
+++ b/m4/ax_python_devel.m4
@@ -152,7 +152,7 @@ $ac_distutils_result])
AC_MSG_CHECKING([for Python include path])
if test -z "$PYTHON_CPPFLAGS"; then
python_path=`$PYTHON -c "import distutils.sysconfig; \
- print (distutils.sysconfig.get_python_inc ());"`
+ print (distutils.sysconfig.get_python_inc ());"`
if test -n "${python_path}"; then
python_path="-I$python_path"
fi
--
1.7.3.234.g7bba3
>From a795bac76390005e622413e2ef57dd1d653820a7 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 24 Sep 2010 10:56:55 +0200
Subject: [PATCH 2/5] change SP-TAB inside a [...] expression to TAB-SP
git grep -l '\[ .*\]' \
| xargs perl -pi -e 's/\[ \t([^]]*\])/[\t $1/g'
---
m4/ax_enable_builddir.m4 | 2 +-
m4/ax_spec_file.m4 | 24 ++++++++++++------------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/m4/ax_enable_builddir.m4 b/m4/ax_enable_builddir.m4
index 1f4f5ca..3361610 100644
--- a/m4/ax_enable_builddir.m4
+++ b/m4/ax_enable_builddir.m4
@@ -179,7 +179,7 @@ x
:M
s/\\(\\n\\) /\\1 /g
/^ /d
-/^[[ ]]*[[\\#]]/d
+/^[[ ]]*[[\\#]]/d
/^VPATH *=/d
s/^srcdir *=.*/srcdir = ./
s/^top_srcdir *=.*/top_srcdir = ./
diff --git a/m4/ax_spec_file.m4 b/m4/ax_spec_file.m4
index 71ec1e4..d52774d 100644
--- a/m4/ax_spec_file.m4
+++ b/m4/ax_spec_file.m4
@@ -101,16 +101,16 @@ dnl AX_SPEC_EXTRACT(shellvar [,specvar [,defaultvalue]])
AC_DEFUN([AX_SPEC_EXTRACT],
[
if test ".$[]$1" = "." ; then
- $1=`grep -i '^[[ ]]*m4_ifval([$2],[$2],[$1])[[ ]]*:' dnl
- "$ax_spec_file" | sed -e 's/.*:[[ ]]*//' dnl
- -e 's/[[ ]][[ ]]*/ /g' -e 's/^ //' -e 's/ $[]//' -e 'q'`
+ $1=`grep -i '^[[ ]]*m4_ifval([$2],[$2],[$1])[[ ]]*:' dnl
+ "$ax_spec_file" | sed -e 's/.*:[[ ]]*//' dnl
+ -e 's/[[ ]][[ ]]*/ /g' -e 's/^ //' -e 's/ $[]//' -e 'q'`
if test ".$[]$1" = "." ; then
for $1 in $2 $1 m4_tolower([$1]) ; do
$1=`echo "$[]$1" | sed -e 's/^%//g'`
$1=`sed dnl
- -e "/^%[[ ]]*def[]ine[[ ]][[ ]]*$[]$1[[ ]]/!d" dnl
- -e "s/^%[[ ]]*def[]ine[[ ]][[ ]]*$[]$1[[ ]]*//" dnl
- -e 's/[[ ]][[ ]]*/ /' -e 's/ $[]//' -e 'q' $ax_spec_file`
+ -e "/^%[[ ]]*def[]ine[[ ]][[ ]]*$[]$1[[ ]]/!d" dnl
+ -e "s/^%[[ ]]*def[]ine[[ ]][[ ]]*$[]$1[[ ]]*//" dnl
+ -e 's/[[ ]][[ ]]*/ /' -e 's/ $[]//' -e 'q' $ax_spec_file`
test ".$1" != "." && break
done
fi
@@ -118,15 +118,15 @@ AC_DEFUN([AX_SPEC_EXTRACT],
.%{*)
$1=`echo "$[]$1" | sed -e 's/%{//' -e 's/}$[]//'`
$1=`sed dnl
- -e "/^%[[ ]]*def[]ine[[ ]][[ ]]*$[]$1[[ ]]/!d" dnl
- -e "s/^%[[ ]]*def[]ine[[ ]][[ ]]*$[]$1[[ ]]*//" dnl
- -e 's/[[ ]][[ ]]*/ /' -e 's/ $[]//' -e 'q' $ax_spec_file` ;;
+ -e "/^%[[ ]]*def[]ine[[ ]][[ ]]*$[]$1[[ ]]/!d" dnl
+ -e "s/^%[[ ]]*def[]ine[[ ]][[ ]]*$[]$1[[ ]]*//" dnl
+ -e 's/[[ ]][[ ]]*/ /' -e 's/ $[]//' -e 'q' $ax_spec_file` ;;
.%*)
$1=`echo "$[]$1" | sed -e 's/%//'`
$1=`sed dnl
- -e "/^%[[ ]]*def[]ine[[ ]][[ ]]*$[]$1[[ ]]/!d" dnl
- -e "s/^%[[ ]]*def[]ine[[ ]][[ ]]*$[]$1[[ ]]*//" dnl
- -e 's/[[ ]][[ ]]*/ /' -e 's/ $[]//' -e 'q' $ax_spec_file` ;;
+ -e "/^%[[ ]]*def[]ine[[ ]][[ ]]*$[]$1[[ ]]/!d" dnl
+ -e "s/^%[[ ]]*def[]ine[[ ]][[ ]]*$[]$1[[ ]]*//" dnl
+ -e 's/[[ ]][[ ]]*/ /' -e 's/ $[]//' -e 'q' $ax_spec_file` ;;
esac
m4_ifval([$3],[test ".$[]$1" = "." && $1="$3"])
fi # test ".$[]$1" = "."
--
1.7.3.234.g7bba3
>From c5e6d6110270b9ad8d49543321883ee6f0eb8711 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 24 Sep 2010 10:58:57 +0200
Subject: [PATCH 3/5] replace SP*-TAB by TAB, now that we know there are fewer
than 8 SP
git grep -l ' '|xargs perl -pi -e 's/ +\t/\t/'
---
m4/ax_arg_with_path_style.m4 | 16 ++++++++--------
m4/ax_boost_asio.m4 | 4 ++--
m4/ax_boost_date_time.m4 | 6 +++---
m4/ax_boost_filesystem.m4 | 8 ++++----
m4/ax_boost_iostreams.m4 | 8 ++++----
m4/ax_boost_program_options.m4 | 10 +++++-----
m4/ax_boost_python.m4 | 4 ++--
m4/ax_boost_regex.m4 | 6 +++---
m4/ax_boost_serialization.m4 | 6 +++---
m4/ax_boost_signals.m4 | 6 +++---
m4/ax_boost_system.m4 | 6 +++---
m4/ax_boost_test_exec_monitor.m4 | 8 ++++----
m4/ax_boost_thread.m4 | 8 ++++----
m4/ax_boost_unit_test_framework.m4 | 8 ++++----
m4/ax_boost_wave.m4 | 6 +++---
m4/ax_boost_wserialization.m4 | 6 +++---
m4/ax_cc_maxopt.m4 | 2 +-
m4/ax_cond_with_level.m4 | 32 ++++++++++++++++----------------
m4/ax_cvs.m4 | 6 +++---
m4/ax_dist_msi.m4 | 4 ++--
m4/ax_dist_rpm.m4 | 18 +++++++++---------
m4/ax_gcc_option.m4 | 8 ++++----
m4/ax_lib_gcrypt.m4 | 2 +-
m4/ax_llvm.m4 | 2 +-
m4/ax_prog_cc_char_subscripts.m4 | 18 +++++++++---------
m4/ax_python_devel.m4 | 6 +++---
26 files changed, 107 insertions(+), 107 deletions(-)
diff --git a/m4/ax_arg_with_path_style.m4 b/m4/ax_arg_with_path_style.m4
index da908a6..96c7cf1 100644
--- a/m4/ax_arg_with_path_style.m4
+++ b/m4/ax_arg_with_path_style.m4
@@ -95,7 +95,7 @@ AC_DEFUN([AX_ARG_WITH_PATH_STYLE],
case ",$ac_with_path_style," in
*,unx,*|*,unix,*|*,bsd,*|*,posix,*) :
ac_with_path_style__unx="32" ;;
- *) ac_with_path_style__unx="0" ;;
+ *) ac_with_path_style__unx="0" ;;
esac
case ",$ac_with_path_style," in
*,dos,*|*,win,*|*,windows,*) :
@@ -105,37 +105,37 @@ AC_DEFUN([AX_ARG_WITH_PATH_STYLE],
case ",$ac_with_path_style," in
*,web,*|*,url,*|*,www,*) :
ac_with_path_style__url="64" ;;
- *) ac_with_path_style__url="0" ;;
+ *) ac_with_path_style__url="0" ;;
esac
case ",$ac_with_path_style," in
*,mac,*|*,macintosh,*|*,apple,*) :
ac_with_path_style__mac="128" ;;
- *) ac_with_path_style__mac="0" ;;
+ *) ac_with_path_style__mac="0" ;;
esac
case ",$ac_with_path_style," in
*,def,*|*,define,*|*,special,*) :
ac_with_path_style__def="256" ;;
- *) ac_with_path_style__def="0" ;;
+ *) ac_with_path_style__def="0" ;;
esac
case ",$ac_with_path_style," in
*,also,*|*,strict,*|*,accept,*|*,convert,*) :
ac_with_path_style__use="512" ;;
- *) ac_with_path_style__use="0" ;;
+ *) ac_with_path_style__use="0" ;;
esac
case ",$ac_with_path_style," in
*,sl,*|*,slash,*|*,forwslash,*|*,slashsep,*) :
ac_with_path_style__slash="1024" ;;
- *) ac_with_path_style__slash="0" ;;
+ *) ac_with_path_style__slash="0" ;;
esac
case ",$ac_with_path_style," in
*,sc,*|*,semi,*|*,semisep,*|*,semicolon,*|*,semicolonsep,*) :
ac_with_path_style__semic="2048" ;;
- *) ac_with_path_style__semic="0" ;;
+ *) ac_with_path_style__semic="0" ;;
esac
case ",$ac_with_path_style," in
*,cm,*|*,comma,*|*,commasep,*) :
ac_with_path_style__comma="4096" ;;
- *) ac_with_path_style__comma="0" ;;
+ *) ac_with_path_style__comma="0" ;;
esac
if test "$ac_with_path_style__unx" != "0" ; then
diff --git a/m4/ax_boost_asio.m4 b/m4/ax_boost_asio.m4
index 6014502..f436e5c 100644
--- a/m4/ax_boost_asio.m4
+++ b/m4/ax_boost_asio.m4
@@ -88,7 +88,7 @@ AC_DEFUN([AX_BOOST_ASIO],
$BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s
$BN-mgw-s ; do
AC_CHECK_LIB($ax_lib, main,
[BOOST_ASIO_LIB="-l$ax_lib" AC_SUBST(BOOST_ASIO_LIB) link_thread="yes" break],
[link_thread="no"])
- done
+ done
else
for ax_lib in $ax_boost_user_asio_lib
$BN-$ax_boost_user_asio_lib; do
AC_CHECK_LIB($ax_lib, main,
@@ -106,6 +106,6 @@ AC_DEFUN([AX_BOOST_ASIO],
fi
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
fi
])
diff --git a/m4/ax_boost_date_time.m4 b/m4/ax_boost_date_time.m4
index 577e228..2c77d71 100644
--- a/m4/ax_boost_date_time.m4
+++ b/m4/ax_boost_date_time.m4
@@ -81,14 +81,14 @@ AC_DEFUN([AX_BOOST_DATE_TIME],
AC_CHECK_LIB($ax_lib, exit,
[BOOST_DATE_TIME_LIB="-l$ax_lib";
AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
[link_date_time="no"])
- done
+ done
if test "x$link_date_time" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_date_time*.{dll,a}*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_date_time.*\)\.dll.*$;\1;' -e
's;^\(boost_date_time.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_DATE_TIME_LIB="-l$ax_lib";
AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
[link_date_time="no"])
- done
+ done
fi
else
@@ -108,6 +108,6 @@ AC_DEFUN([AX_BOOST_DATE_TIME],
fi
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
fi
])
diff --git a/m4/ax_boost_filesystem.m4 b/m4/ax_boost_filesystem.m4
index b9fffde..8ae04b7 100644
--- a/m4/ax_boost_filesystem.m4
+++ b/m4/ax_boost_filesystem.m4
@@ -74,7 +74,7 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
[[using namespace boost::filesystem;
path my_path( "foo/bar/data.txt" );
return 0;]]),
- ax_cv_boost_filesystem=yes,
ax_cv_boost_filesystem=no)
+ ax_cv_boost_filesystem=yes,
ax_cv_boost_filesystem=no)
AC_LANG_POP([C++])
])
if test "x$ax_cv_boost_filesystem" = "xyes"; then
@@ -86,14 +86,14 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
AC_CHECK_LIB($ax_lib, exit,
[BOOST_FILESYSTEM_LIB="-l$ax_lib";
AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
[link_filesystem="no"])
- done
+ done
if test "x$link_program_options" != "xyes"; then
for libextension in `ls
$BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e
's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e
's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_FILESYSTEM_LIB="-l$ax_lib";
AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
[link_filesystem="no"])
- done
+ done
fi
else
for ax_lib in $ax_boost_user_filesystem_lib
boost_filesystem-$ax_boost_user_filesystem_lib; do
@@ -112,7 +112,7 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
fi
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
LIBS="$LIBS_SAVED"
fi
])
diff --git a/m4/ax_boost_iostreams.m4 b/m4/ax_boost_iostreams.m4
index 807d12f..8bad151 100644
--- a/m4/ax_boost_iostreams.m4
+++ b/m4/ax_boost_iostreams.m4
@@ -68,7 +68,7 @@ AC_DEFUN([AX_BOOST_IOSTREAMS],
@%:@include <boost/range/iterator_range.hpp>
]],
[[std::string input = "Hello World!";
-
namespace io = boost::iostreams;
+ namespace io =
boost::iostreams;
io::filtering_istream in(boost::make_iterator_range(input));
return
0;
]]),
@@ -84,14 +84,14 @@ AC_DEFUN([AX_BOOST_IOSTREAMS],
AC_CHECK_LIB($ax_lib, exit,
[BOOST_IOSTREAMS_LIB="-l$ax_lib";
AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
[link_iostreams="no"])
- done
+ done
if test "x$link_iostreams" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_iostreams*.{dll,a}*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_iostreams.*\)\.dll.*$;\1;' -e
's;^\(boost_iostreams.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_IOSTREAMS_LIB="-l$ax_lib";
AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
[link_iostreams="no"])
- done
+ done
fi
else
@@ -111,6 +111,6 @@ AC_DEFUN([AX_BOOST_IOSTREAMS],
fi
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
fi
])
diff --git a/m4/ax_boost_program_options.m4 b/m4/ax_boost_program_options.m4
index 91e51e2..4432e8b 100644
--- a/m4/ax_boost_program_options.m4
+++ b/m4/ax_boost_program_options.m4
@@ -63,12 +63,12 @@ AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
AC_CACHE_CHECK([whether the Boost::Program_Options library is
available],
ax_cv_boost_program_options,
[AC_LANG_PUSH(C++)
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/program_options.hpp>
+
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/program_options.hpp>
]],
[[boost::program_options::options_description generic("Generic options");
return 0;]]),
ax_cv_boost_program_options=yes,
ax_cv_boost_program_options=no)
- AC_LANG_POP([C++])
+ AC_LANG_POP([C++])
])
if test "$ax_cv_boost_program_options" = yes; then
AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define
if the Boost::PROGRAM_OPTIONS library is available])
@@ -79,14 +79,14 @@ AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
AC_CHECK_LIB($ax_lib, exit,
[BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib";
AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break],
[link_program_options="no"])
- done
+ done
if test "x$link_program_options" != "xyes"; then
for libextension in `ls
$BOOSTLIBDIR/boost_program_options*.dll* 2>/dev/null | sed 's,.*/,,' | sed -e
's;^\(boost_program_options.*\)\.dll.*$;\1;'` `ls
$BOOSTLIBDIR/boost_program_options*.a* 2>/dev/null | sed 's,.*/,,' | sed -e
's;^\(boost_program_options.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib";
AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break],
[link_program_options="no"])
- done
+ done
fi
else
for ax_lib in $ax_boost_user_program_options_lib
boost_program_options-$ax_boost_user_program_options_lib; do
@@ -103,6 +103,6 @@ AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
fi
fi
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
fi
])
diff --git a/m4/ax_boost_python.m4 b/m4/ax_boost_python.m4
index 2bb75d1..fa7cc98 100644
--- a/m4/ax_boost_python.m4
+++ b/m4/ax_boost_python.m4
@@ -67,8 +67,8 @@ ac_cv_boost_python,
#include <boost/python/module.hpp>
using namespace boost::python;
BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]],
- [[return 0;]]),
- ac_cv_boost_python=yes, ac_cv_boost_python=no)
+ [[return 0;]]),
+ ac_cv_boost_python=yes, ac_cv_boost_python=no)
AC_LANG_RESTORE
CPPFLAGS=$CPPFLAGS_SAVE
])
diff --git a/m4/ax_boost_regex.m4 b/m4/ax_boost_regex.m4
index 29e31e6..2f1170c 100644
--- a/m4/ax_boost_regex.m4
+++ b/m4/ax_boost_regex.m4
@@ -80,14 +80,14 @@ AC_DEFUN([AX_BOOST_REGEX],
AC_CHECK_LIB($ax_lib, exit,
[BOOST_REGEX_LIB="-l$ax_lib";
AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
[link_regex="no"])
- done
+ done
if test "x$link_regex" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_regex*.{dll,a}*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e
's;^\(boost_regex.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_REGEX_LIB="-l$ax_lib";
AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
[link_regex="no"])
- done
+ done
fi
else
@@ -106,6 +106,6 @@ AC_DEFUN([AX_BOOST_REGEX],
fi
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
fi
])
diff --git a/m4/ax_boost_serialization.m4 b/m4/ax_boost_serialization.m4
index 78fe72b..d72089d 100644
--- a/m4/ax_boost_serialization.m4
+++ b/m4/ax_boost_serialization.m4
@@ -85,14 +85,14 @@ AC_DEFUN([AX_BOOST_SERIALIZATION],
AC_CHECK_LIB($ax_lib, exit,
[BOOST_SERIALIZATION_LIB="-l$ax_lib";
AC_SUBST(BOOST_SERIALIZATION_LIB) link_serialization="yes"; break],
[link_serialization="no"])
- done
+ done
if test "x$link_serialization" != "xyes"; then
for libextension in `ls
$BOOSTLIBDIR/boost_serialization*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e
's;^\(boost_serialization.*\)\.dll.*$;\1;' -e
's;^\(boost_serialization.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_SERIALIZATION_LIB="-l$ax_lib";
AC_SUBST(BOOST_SERIALIZATION_LIB) link_serialization="yes"; break],
[link_serialization="no"])
- done
+ done
fi
else
@@ -112,6 +112,6 @@ AC_DEFUN([AX_BOOST_SERIALIZATION],
fi
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
fi
])
diff --git a/m4/ax_boost_signals.m4 b/m4/ax_boost_signals.m4
index b845cbc..3c4af73 100644
--- a/m4/ax_boost_signals.m4
+++ b/m4/ax_boost_signals.m4
@@ -82,14 +82,14 @@ AC_DEFUN([AX_BOOST_SIGNALS],
AC_CHECK_LIB($ax_lib, exit,
[BOOST_SIGNALS_LIB="-l$ax_lib";
AC_SUBST(BOOST_SIGNALS_LIB) link_signals="yes"; break],
[link_signals="no"])
- done
+ done
if test "x$link_signals" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_signals*.{dll,a}*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_signals.*\)\.dll.*$;\1;' -e
's;^\(boost_signals.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_SIGNALS_LIB="-l$ax_lib";
AC_SUBST(BOOST_SIGNALS_LIB) link_signals="yes"; break],
[link_signals="no"])
- done
+ done
fi
else
@@ -109,6 +109,6 @@ AC_DEFUN([AX_BOOST_SIGNALS],
fi
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
fi
])
diff --git a/m4/ax_boost_system.m4 b/m4/ax_boost_system.m4
index a6b61be..430881c 100644
--- a/m4/ax_boost_system.m4
+++ b/m4/ax_boost_system.m4
@@ -88,14 +88,14 @@ AC_DEFUN([AX_BOOST_SYSTEM],
AC_CHECK_LIB($ax_lib, exit,
[BOOST_SYSTEM_LIB="-l$ax_lib";
AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
[link_system="no"])
- done
+ done
if test "x$link_system" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e
's;^\(boost_system.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_SYSTEM_LIB="-l$ax_lib";
AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
[link_system="no"])
- done
+ done
fi
else
@@ -115,6 +115,6 @@ AC_DEFUN([AX_BOOST_SYSTEM],
fi
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
fi
])
diff --git a/m4/ax_boost_test_exec_monitor.m4 b/m4/ax_boost_test_exec_monitor.m4
index 689a438..4a37b29 100644
--- a/m4/ax_boost_test_exec_monitor.m4
+++ b/m4/ax_boost_test_exec_monitor.m4
@@ -75,7 +75,7 @@ AC_DEFUN([AX_BOOST_TEST_EXEC_MONITOR],
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
if test "x$ax_boost_user_test_exec_monitor_lib" = "x"; then
- saved_ldflags="${LDFLAGS}"
+ saved_ldflags="${LDFLAGS}"
for monitor_library in `ls
$BOOSTLIBDIR/libboost_test_exec_monitor*.so*
$BOOSTLIBDIR/libboost_test_exec_monitor*.a* 2>/dev/null` ; do
if test -r $monitor_library ; then
@@ -98,12 +98,12 @@ AC_DEFUN([AX_BOOST_TEST_EXEC_MONITOR],
AC_CHECK_LIB($ax_lib, exit,
[BOOST_TEST_EXEC_MONITOR_LIB="-l$ax_lib";
AC_SUBST(BOOST_TEST_EXEC_MONITOR_LIB) link_test_exec_monitor="yes"; break],
[link_test_exec_monitor="no"])
- done
+ done
fi
else
link_test_exec_monitor="no"
- saved_ldflags="${LDFLAGS}"
+ saved_ldflags="${LDFLAGS}"
for ax_lib in
boost_test_exec_monitor-$ax_boost_user_test_exec_monitor_lib
$ax_boost_user_test_exec_monitor_lib ; do
if test "x$link_test_exec_monitor" = "xyes"; then
break;
@@ -134,6 +134,6 @@ AC_DEFUN([AX_BOOST_TEST_EXEC_MONITOR],
fi
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
fi
])
diff --git a/m4/ax_boost_thread.m4 b/m4/ax_boost_thread.m4
index 76ee890..d3bf7e1 100644
--- a/m4/ax_boost_thread.m4
+++ b/m4/ax_boost_thread.m4
@@ -69,7 +69,7 @@ AC_DEFUN([AX_BOOST_THREAD],
CXXFLAGS_SAVE=$CXXFLAGS
if test "x$build_os" = "xsolaris" ; then
- CXXFLAGS="-pthreads $CXXFLAGS"
+ CXXFLAGS="-pthreads $CXXFLAGS"
elif test "x$build_os" = "xming32" ; then
CXXFLAGS="-mthreads $CXXFLAGS"
else
@@ -109,14 +109,14 @@ AC_DEFUN([AX_BOOST_THREAD],
AC_CHECK_LIB($ax_lib, exit,
[BOOST_THREAD_LIB="-l$ax_lib";
AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
[link_thread="no"])
- done
+ done
if test "x$link_thread" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_thread*.dll*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.dll.*$;\1;'` `ls
$BOOSTLIBDIR/boost_thread*.a* 2>/dev/null | sed 's,.*/,,' | sed -e
's;^\(boost_thread.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_THREAD_LIB="-l$ax_lib";
AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
[link_thread="no"])
- done
+ done
fi
else
@@ -144,6 +144,6 @@ AC_DEFUN([AX_BOOST_THREAD],
fi
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
fi
])
diff --git a/m4/ax_boost_unit_test_framework.m4
b/m4/ax_boost_unit_test_framework.m4
index 4ddf244..4ca40cd 100644
--- a/m4/ax_boost_unit_test_framework.m4
+++ b/m4/ax_boost_unit_test_framework.m4
@@ -75,7 +75,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then
- saved_ldflags="${LDFLAGS}"
+ saved_ldflags="${LDFLAGS}"
for monitor_library in `ls
$BOOSTLIBDIR/libboost_unit_test_framework*.so*
$BOOSTLIBDIR/libboost_unit_test_framework*.a* 2>/dev/null` ; do
if test -r $monitor_library ; then
libextension=`echo $monitor_library | sed 's,.*/,,' |
sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e
's;^lib\(boost_unit_test_framework.*\)\.a*$;\1;'`
@@ -97,11 +97,11 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
AC_CHECK_LIB($ax_lib, exit,
[BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib";
AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB) link_unit_test_framework="yes"; break],
[link_unit_test_framework="no"])
- done
+ done
fi
else
link_unit_test_framework="no"
- saved_ldflags="${LDFLAGS}"
+ saved_ldflags="${LDFLAGS}"
for ax_lib in
boost_unit_test_framework-$ax_boost_user_unit_test_framework_lib
$ax_boost_user_unit_test_framework_lib ; do
if test "x$link_unit_test_framework" = "xyes"; then
break;
@@ -132,6 +132,6 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
fi
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
fi
])
diff --git a/m4/ax_boost_wave.m4 b/m4/ax_boost_wave.m4
index 9b4d959..8739e0b 100644
--- a/m4/ax_boost_wave.m4
+++ b/m4/ax_boost_wave.m4
@@ -86,14 +86,14 @@ AC_DEFUN([AX_BOOST_WAVE],
AC_CHECK_LIB($ax_lib, exit,
[BOOST_WAVE_LIB="-l$ax_lib";
AC_SUBST(BOOST_WAVE_LIB) link_wave="yes"; break],
[link_wave="no"])
- done
+ done
if test "x$link_wave" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_wave*.{dll,a}*
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_wave.*\)\.dll.*$;\1;' -e
's;^\(boost_wave.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_WAVE_LIB="-l$ax_lib";
AC_SUBST(BOOST_WAVE_LIB) link_wave="yes"; break],
[link_wave="no"])
- done
+ done
fi
else
@@ -120,7 +120,7 @@ AC_DEFUN([AX_BOOST_WAVE],
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
LIBS="$LIBS_SAVED"
fi
diff --git a/m4/ax_boost_wserialization.m4 b/m4/ax_boost_wserialization.m4
index 60c2b71..6e5dde7 100644
--- a/m4/ax_boost_wserialization.m4
+++ b/m4/ax_boost_wserialization.m4
@@ -84,14 +84,14 @@ AC_DEFUN([AX_BOOST_WSERIALIZATION],
AC_CHECK_LIB($ax_lib, exit,
[BOOST_WSERIALIZATION_LIB="-l$ax_lib";
AC_SUBST(BOOST_WSERIALIZATION_LIB) link_wserialization="yes"; break],
[link_wserialization="no"])
- done
+ done
if test "x$link_wserialization" != "xyes"; then
for libextension in `ls
$BOOSTLIBDIR/boost_wserialization*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed
-e 's;^\(boost_wserialization.*\)\.dll.*$;\1;' -e
's;^\(boost_wserialization.*\)\.a*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_WSERIALIZATION_LIB="-l$ax_lib";
AC_SUBST(BOOST_WSERIALIZATION_LIB) link_wserialization="yes"; break],
[link_wserialization="no"])
- done
+ done
fi
else
@@ -111,6 +111,6 @@ AC_DEFUN([AX_BOOST_WSERIALIZATION],
fi
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
fi
])
diff --git a/m4/ax_cc_maxopt.m4 b/m4/ax_cc_maxopt.m4
index e88d7e0..8ef4324 100644
--- a/m4/ax_cc_maxopt.m4
+++ b/m4/ax_cc_maxopt.m4
@@ -91,7 +91,7 @@ if test "$ac_test_CFLAGS" != "set"; then
xlc_opt="-qtune=auto"
fi
AX_CHECK_COMPILER_FLAGS($xlc_opt,
- CFLAGS="-O3 -qansialias -w $xlc_opt",
+ CFLAGS="-O3 -qansialias -w $xlc_opt",
[CFLAGS="-O3 -qansialias -w"
echo "******************************************************"
echo "* You seem to have the IBM C compiler. It is *"
diff --git a/m4/ax_cond_with_level.m4 b/m4/ax_cond_with_level.m4
index 1c3c6a4..439fadf 100644
--- a/m4/ax_cond_with_level.m4
+++ b/m4/ax_cond_with_level.m4
@@ -88,24 +88,24 @@ if test "$WITH_VAR" != "no"; then
case "$WITH_VAR" in
9|9,*|ultrasome|ultrasome,*|insane)
withval=9
VAR_WITHVAL=9 ; VAR_WITHDEF="-D""VAR_WITH=9" ;;
- 8|8,*|ultra|ultra,*|experimental) withval=8
+ 8|8,*|ultra|ultra,*|experimental) withval=8
VAR_WITHVAL=8 ; VAR_WITHDEF="-D""VAR_WITH=8" ;;
7|7,*|muchmore|somemanymore|somemanymore,*|all) withval=7
VAR_WITHVAL=7 ; VAR_WITHDEF="-D""VAR_WITH=7" ;;
- 6|6,*|manymore|manymore,*|most) withval=6
+ 6|6,*|manymore|manymore,*|most) withval=6
VAR_WITHVAL=6 ; VAR_WITHDEF="-D""VAR_WITH=6" ;;
- 5|5,*|somemore|somemore,*|almost) withval=5
+ 5|5,*|somemore|somemore,*|almost) withval=5
VAR_WITHVAL=5 ; VAR_WITHDEF="-D""VAR_WITH=5" ;;
- 4|4,*|more|more,*)
withval=4
+ 4|4,*|more|more,*) withval=4
VAR_WITHVAL=4 ; VAR_WITHDEF="-D""VAR_WITH=4" ;;
3|3,*|much|somemany,*) withval=3
VAR_WITHVAL=3 ; VAR_WITHDEF="-D""VAR_WITH=3" ;;
- 2|2,*|many|many,*)
withval=2
+ 2|2,*|many|many,*) withval=2
VAR_WITHVAL=2 ; VAR_WITHDEF="-D""VAR_WITH=2" ;;
- 1|1,*|some|some,*)
withval=1
+ 1|1,*|some|some,*) withval=1
VAR_WITHVAL=1 ; VAR_WITHDEF="-D""VAR_WITH=1" ;;
- *) withval=-
- AC_MSG_ERROR([dnl
+ *) withval=-
+ AC_MSG_ERROR([dnl
bad value of --with-$1 option, choose a number or some|many|more|all... ])
esac
else withval=0
@@ -142,24 +142,24 @@ if test "$WITH_VAR" != "no"; then
case "$WITH_VAR" in
9|9,*|ultrasome|ultrasome,*|insane)
withval=9
VAR_WITHVAL=9 ; VAR_WITHDEF="-D""VAR_WITH=9" ;;
- 8|8,*|ultra|ultra,*|experimental) withval=8
+ 8|8,*|ultra|ultra,*|experimental) withval=8
VAR_WITHVAL=8 ; VAR_WITHDEF="-D""VAR_WITH=8" ;;
7|7,*|muchmore|somemanymore|somemanymore,*|all) withval=7
VAR_WITHVAL=7 ; VAR_WITHDEF="-D""VAR_WITH=7" ;;
- 6|6,*|manymore|manymore,*|most) withval=6
+ 6|6,*|manymore|manymore,*|most) withval=6
VAR_WITHVAL=6 ; VAR_WITHDEF="-D""VAR_WITH=6" ;;
- 5|5,*|somemore|somemore,*|almost) withval=5
+ 5|5,*|somemore|somemore,*|almost) withval=5
VAR_WITHVAL=5 ; VAR_WITHDEF="-D""VAR_WITH=5" ;;
- 4|4,*|more|more,*)
withval=4
+ 4|4,*|more|more,*) withval=4
VAR_WITHVAL=4 ; VAR_WITHDEF="-D""VAR_WITH=4" ;;
3|3,*|much|somemany,*) withval=3
VAR_WITHVAL=3 ; VAR_WITHDEF="-D""VAR_WITH=3" ;;
- 2|2,*|many|many,*)
withval=2
+ 2|2,*|many|many,*) withval=2
VAR_WITHVAL=2 ; VAR_WITHDEF="-D""VAR_WITH=2" ;;
- 1|1,*|some|some,*)
withval=1
+ 1|1,*|some|some,*) withval=1
VAR_WITHVAL=1 ; VAR_WITHDEF="-D""VAR_WITH=1" ;;
- *) withval=-
- AC_MSG_ERROR([dnl
+ *) withval=-
+ AC_MSG_ERROR([dnl
bad value of --with-$1 option, choose a number or some|many|more|all... ])
esac
dnl -- the additional line is here --
diff --git a/m4/ax_cvs.m4 b/m4/ax_cvs.m4
index 0278dc0..f1d662d 100644
--- a/m4/ax_cvs.m4
+++ b/m4/ax_cvs.m4
@@ -101,9 +101,9 @@ fi
AC_ARG_ENABLE(cvs-support,
AS_HELP_STRING(--enable-cvs-support[=ARG],
[enable cvs support. Used by the $PACKAGE
developers.
- ARG can be "yes" or "no". If the CVSROOT is
found,
+ ARG can be "yes" or "no". If the CVSROOT is
found,
then the default is yes,
- otherwise the default is no.]),
+ otherwise the default is no.]),
AX_USING_CVS=$enableval )
if test "x$AX_USING_CVS" != "xno"; then
@@ -160,7 +160,7 @@ if test "x$AX_USING_CVS" != "xno"; then
AC_MSG_CHECKING([CVSROOT])
if test -e "$srcdir/CVS/Root"; then
CVSROOT=`cat $srcdir/CVS/Root`;
- AC_MSG_RESULT([$CVSROOT])
+ AC_MSG_RESULT([$CVSROOT])
else
AC_MSG_RESULT([not found])
if test "x$AX_USING_CVS" = "x"; then
diff --git a/m4/ax_dist_msi.m4 b/m4/ax_dist_msi.m4
index 1982e12..e149516 100644
--- a/m4/ax_dist_msi.m4
+++ b/m4/ax_dist_msi.m4
@@ -42,10 +42,10 @@ if test "x$MSI_SETUP_FILE" != "x"; then
"yes" or "no". The default is "yes"]),
if test "x$enableval" != "x"; then
if test "x$enableval" = "xyes"; then
- USING_DIST_MSI=true
+ USING_DIST_MSI=true
AC_MSG_NOTICE([dist-msi support enabled])
elif test "x$enableval" = "xno"; then
- USING_DIST_MSI=false
+ USING_DIST_MSI=false
AC_MSG_NOTICE([dist-msi support disabled])
fi
fi,
diff --git a/m4/ax_dist_rpm.m4 b/m4/ax_dist_rpm.m4
index e2a07d2..fb03ef6 100644
--- a/m4/ax_dist_rpm.m4
+++ b/m4/ax_dist_rpm.m4
@@ -79,15 +79,15 @@ if test "x$AX_HAVE_INSTALL_FILES" = "xtrue"; then
AC_CONFIG_FILES([$1])
AC_ARG_VAR(EDITOR, [default text editor])
if test "x$EDITOR" = "x"; then
- AC_CHECK_PROGS(EDITOR,[vim vi emacs])
+ AC_CHECK_PROGS(EDITOR,[vim vi emacs])
fi
AC_ARG_VAR(RPM, [rpm executable to use])
if test "x$RPM" = "x"; then
- AC_CHECK_PROGS(RPM,[rpmbuild rpm echo])
+ AC_CHECK_PROGS(RPM,[rpmbuild rpm echo])
fi
if test "x$RPM" != "x"; then
AC_ARG_VAR(PLATFORM_SUFFIX, [A short name for your platform that
will be added to the name of the binary RPMs you may choose to create (by
running make rpm). e.g. rh71 for RedHat 7.1, lsb1.3 for a LSB 1.3 compliant
system (SuSE 8.2 or RedHat 9), osx103 for OS X 10.3.x, etc])
- AC_MSG_CHECKING([rpm platform suffix])
+ AC_MSG_CHECKING([rpm platform suffix])
if test "x$PLATFORM_SUFFIX" != "x"; then
AC_MSG_RESULT([$PLATFORM_SUFFIX])
AC_SUBST([PLATFORM_SUFFIX])
@@ -97,7 +97,7 @@ if test "x$AX_HAVE_INSTALL_FILES" = "xtrue"; then
AC_MSG_WARN([rpm support disabled... PLATFORM_SUFFIX not set])
fi
else
- AC_MSG_NOTICE([rpm support disabled... neither rpmbuild or rpm was
found])
+ AC_MSG_NOTICE([rpm support disabled... neither rpmbuild or rpm was
found])
fi
else
AC_MSG_RESULT([not found])
@@ -122,7 +122,7 @@ AX_DIST_RPM_CLEANFILES = \$(top_builddir)/RPMChangeLog
\$(AX_INSTALL_FILES_CLEAN
if( stop ) exit; \\
split( \$${AX_DOLLAR}1, date, \"-\" ); \\
\$${AX_DOLLAR}1 = strftime( \"%%a %%b %%d %%Y\", \\
- mktime( date[ 1 ] \" \" date[ 2 ] \" \"
date [ 3 ] \" 00 00 00\" ) ); \\
+ mktime( date[ 1 ] \" \" date[ 2 ] \" \"
date [ 3 ] \" 00 00 00\" ) ); \\
print \"* \" \$${AX_DOLLAR}0; } \\
/Released \$(PACKAGE)-/ { \\
gsub( /\$(PACKAGE)-/, \"\", \$${AX_DOLLAR}2 ); \\
@@ -199,11 +199,11 @@ create-rpmmacros:
echo \"%%_specdir %%{_rpmtopdir}SPECS/\" >> ~/.rpmmacros; \\
echo \"%%_srcrpmdir %%{_rpmtopdir}SRPMS/\" >> ~/.rpmmacros; \\
if test \"x$EDITOR\" = "x"; then \\
- echo \"Error: no editor specified or found.\"; \\
- echo \"Please edit ~/.rpmmacros manually\"; \\
+ echo \"Error: no editor specified or found.\"; \\
+ echo \"Please edit ~/.rpmmacros manually\"; \\
else \\
- $EDITOR ~/.rpmmacros; \\
- exit \$\$?; \\
+ $EDITOR ~/.rpmmacros; \\
+ exit \$\$?; \\
fi \\
fi
diff --git a/m4/ax_gcc_option.m4 b/m4/ax_gcc_option.m4
index 3a337b2..302209a 100644
--- a/m4/ax_gcc_option.m4
+++ b/m4/ax_gcc_option.m4
@@ -116,11 +116,11 @@ EOF
AC_TRY_COMMAND(cat conftest.c 1>&AS_MESSAGE_LOG_FD)
AS_IF([ AC_TRY_COMMAND($CC $2 $1 -c conftest.c 1>&AS_MESSAGE_LOG_FD) ],[
- AC_MSG_RESULT([yes])
- $4
+ AC_MSG_RESULT([yes])
+ $4
],[
- AC_MSG_RESULT([no])
- $5
+ AC_MSG_RESULT([no])
+ $5
])
],[
AC_MSG_RESULT([no gcc available])
diff --git a/m4/ax_lib_gcrypt.m4 b/m4/ax_lib_gcrypt.m4
index 76cf1fb..c1d96ad 100644
--- a/m4/ax_lib_gcrypt.m4
+++ b/m4/ax_lib_gcrypt.m4
@@ -101,7 +101,7 @@ AC_DEFUN([AX_LIB_GCRYPT],[
],[
# complain only if explicitely required
if test "$ac_with_gcrypt" = "yes" ; then
- AC_MSG_ERROR([cannot configure required gcrypt library])
+ AC_MSG_ERROR([cannot configure required gcrypt library])
fi
])
fi
diff --git a/m4/ax_llvm.m4 b/m4/ax_llvm.m4
index 55ccd52..531cb5e 100644
--- a/m4/ax_llvm.m4
+++ b/m4/ax_llvm.m4
@@ -77,7 +77,7 @@ AC_ARG_WITH([llvm],
fi
CPPFLAGS="$CPPFLAGS_SAVED"
- LDFLAGS="$LDFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
else
succeeded=no
fi
diff --git a/m4/ax_prog_cc_char_subscripts.m4 b/m4/ax_prog_cc_char_subscripts.m4
index 40f8dfa..f424830 100644
--- a/m4/ax_prog_cc_char_subscripts.m4
+++ b/m4/ax_prog_cc_char_subscripts.m4
@@ -71,15 +71,15 @@ EOF
dnl GCC
if test "$GCC" = "yes";
then
- if test -z "$hard"; then
- CV="-funsigned-char -Wno-char-subscripts"
- else
- CV="-funsigned-char -Wno-char-subscripts"
- fi
+ if test -z "$hard"; then
+ CV="-funsigned-char -Wno-char-subscripts"
+ else
+ CV="-funsigned-char -Wno-char-subscripts"
+ fi
- if test -n "`${CC-cc} -c $CV conftest.c 2>&1`" ; then
+ if test -n "`${CC-cc} -c $CV conftest.c 2>&1`" ; then
CV="suppressed: did not work"
- fi
+ fi
dnl Solaris C compiler
# Solaris sunpro has no option for unsignedchar but
@@ -96,9 +96,9 @@ EOF
CV="-unsigned"
rm conftest.o
- if test -n "`${CC-cc} -c $CV conftest.c 2>&1`" ; then
+ if test -n "`${CC-cc} -c $CV conftest.c 2>&1`" ; then
CV="suppressed: did not work"
- fi
+ fi
dnl C for AIX Compiler
diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
index c4ed314..5441161 100644
--- a/m4/ax_python_devel.m4
+++ b/m4/ax_python_devel.m4
@@ -119,7 +119,7 @@ to something else than an empty string.
ver = sys.version.split ()[[0]]; \
print (ver $1)"`
if test "$ac_supports_python_ver" = "True"; then
- AC_MSG_RESULT([yes])
+ AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
AC_MSG_ERROR([this package requires Python $1.
@@ -152,9 +152,9 @@ $ac_distutils_result])
AC_MSG_CHECKING([for Python include path])
if test -z "$PYTHON_CPPFLAGS"; then
python_path=`$PYTHON -c "import distutils.sysconfig; \
- print (distutils.sysconfig.get_python_inc ());"`
+ print (distutils.sysconfig.get_python_inc ());"`
if test -n "${python_path}"; then
- python_path="-I$python_path"
+ python_path="-I$python_path"
fi
PYTHON_CPPFLAGS=$python_path
fi
--
1.7.3.234.g7bba3
>From a2b3bb1298eed0406b3b88c3557eb21c0f0b60c8 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 24 Sep 2010 11:39:44 +0200
Subject: [PATCH 4/5] replace TAB SP{8} by TAB TAB, repeatedly
---
m4/ax_boost_filesystem.m4 | 2 +-
m4/ax_boost_program_options.m4 | 2 +-
m4/ax_boost_test_exec_monitor.m4 | 2 +-
m4/ax_boost_thread.m4 | 2 +-
m4/ax_boost_unit_test_framework.m4 | 4 ++--
m4/ax_c_ifdef.m4 | 2 +-
m4/ax_cond_with_level.m4 | 8 ++++----
m4/ax_cvs.m4 | 30 +++++++++++++++---------------
m4/ax_dist_msi.m4 | 4 ++--
m4/ax_dist_rpm.m4 | 20 ++++++++++----------
m4/ax_gcc_option.m4 | 2 +-
m4/ax_install_files.m4 | 6 +++---
m4/ax_llvm.m4 | 8 ++++----
m4/ax_pthread.m4 | 4 ++--
m4/ax_python_devel.m4 | 2 +-
m4/ax_set_default_paths_system.m4 | 8 ++++----
m4/ax_sys_perlsharpbang.m4 | 16 ++++++++--------
17 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/m4/ax_boost_filesystem.m4 b/m4/ax_boost_filesystem.m4
index 8ae04b7..10b509e 100644
--- a/m4/ax_boost_filesystem.m4
+++ b/m4/ax_boost_filesystem.m4
@@ -94,7 +94,7 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
[BOOST_FILESYSTEM_LIB="-l$ax_lib";
AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
[link_filesystem="no"])
done
- fi
+ fi
else
for ax_lib in $ax_boost_user_filesystem_lib
boost_filesystem-$ax_boost_user_filesystem_lib; do
AC_CHECK_LIB($ax_lib, exit,
diff --git a/m4/ax_boost_program_options.m4 b/m4/ax_boost_program_options.m4
index 4432e8b..ddbfae0 100644
--- a/m4/ax_boost_program_options.m4
+++ b/m4/ax_boost_program_options.m4
@@ -63,7 +63,7 @@ AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
AC_CACHE_CHECK([whether the Boost::Program_Options library is
available],
ax_cv_boost_program_options,
[AC_LANG_PUSH(C++)
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/program_options.hpp>
+
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/program_options.hpp>
]],
[[boost::program_options::options_description generic("Generic options");
return 0;]]),
diff --git a/m4/ax_boost_test_exec_monitor.m4 b/m4/ax_boost_test_exec_monitor.m4
index 4a37b29..e0cd9f1 100644
--- a/m4/ax_boost_test_exec_monitor.m4
+++ b/m4/ax_boost_test_exec_monitor.m4
@@ -117,7 +117,7 @@ AC_DEFUN([AX_BOOST_TEST_EXEC_MONITOR],
link_test_exec_monitor="no"
fi
- if test "x$link_test_exec_monitor" = "xyes";
then
+ if test "x$link_test_exec_monitor" = "xyes";
then
BOOST_TEST_EXEC_MONITOR_LIB="-l$ax_lib"
AC_SUBST(BOOST_TEST_EXEC_MONITOR_LIB)
break
diff --git a/m4/ax_boost_thread.m4 b/m4/ax_boost_thread.m4
index d3bf7e1..49f6287 100644
--- a/m4/ax_boost_thread.m4
+++ b/m4/ax_boost_thread.m4
@@ -135,7 +135,7 @@ AC_DEFUN([AX_BOOST_THREAD],
else
case "x$build_os" in
*bsd* )
- BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS"
+ BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS"
break;
;;
esac
diff --git a/m4/ax_boost_unit_test_framework.m4
b/m4/ax_boost_unit_test_framework.m4
index 4ca40cd..fa3e06d 100644
--- a/m4/ax_boost_unit_test_framework.m4
+++ b/m4/ax_boost_unit_test_framework.m4
@@ -66,7 +66,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
[AC_LANG_PUSH([C++])
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/test/unit_test.hpp>]],
[[using boost::unit_test::test_suite;
- test_suite* test=
BOOST_TEST_SUITE( "Unit test example 1" ); return 0;]]),
+ test_suite* test=
BOOST_TEST_SUITE( "Unit test example 1" ); return 0;]]),
ax_cv_boost_unit_test_framework=yes,
ax_cv_boost_unit_test_framework=no)
AC_LANG_POP([C++])
])
@@ -115,7 +115,7 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
link_unit_test_framework="no"
fi
- if test "x$link_unit_test_framework" = "xyes";
then
+ if test "x$link_unit_test_framework" = "xyes";
then
BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
break
diff --git a/m4/ax_c_ifdef.m4 b/m4/ax_c_ifdef.m4
index 7c6233f..9dd5b06 100644
--- a/m4/ax_c_ifdef.m4
+++ b/m4/ax_c_ifdef.m4
@@ -31,7 +31,7 @@ AC_DEFUN([AX_C_IFDEF],
[AC_COMPILE_IFELSE([#ifndef $1
# error "Macro $1 is undefined!"
/* For some compilers (eg. SGI's CC), #error is not
- enough... */
+ enough... */
please, do fail
#endif],
[$2], [$3])])
diff --git a/m4/ax_cond_with_level.m4 b/m4/ax_cond_with_level.m4
index 439fadf..e53d2be 100644
--- a/m4/ax_cond_with_level.m4
+++ b/m4/ax_cond_with_level.m4
@@ -91,11 +91,11 @@ if test "$WITH_VAR" != "no"; then
8|8,*|ultra|ultra,*|experimental) withval=8
VAR_WITHVAL=8 ; VAR_WITHDEF="-D""VAR_WITH=8" ;;
7|7,*|muchmore|somemanymore|somemanymore,*|all) withval=7
- VAR_WITHVAL=7 ; VAR_WITHDEF="-D""VAR_WITH=7" ;;
+ VAR_WITHVAL=7 ; VAR_WITHDEF="-D""VAR_WITH=7" ;;
6|6,*|manymore|manymore,*|most) withval=6
VAR_WITHVAL=6 ; VAR_WITHDEF="-D""VAR_WITH=6" ;;
5|5,*|somemore|somemore,*|almost) withval=5
- VAR_WITHVAL=5 ; VAR_WITHDEF="-D""VAR_WITH=5" ;;
+ VAR_WITHVAL=5 ; VAR_WITHDEF="-D""VAR_WITH=5" ;;
4|4,*|more|more,*) withval=4
VAR_WITHVAL=4 ; VAR_WITHDEF="-D""VAR_WITH=4" ;;
3|3,*|much|somemany,*) withval=3
@@ -145,11 +145,11 @@ if test "$WITH_VAR" != "no"; then
8|8,*|ultra|ultra,*|experimental) withval=8
VAR_WITHVAL=8 ; VAR_WITHDEF="-D""VAR_WITH=8" ;;
7|7,*|muchmore|somemanymore|somemanymore,*|all) withval=7
- VAR_WITHVAL=7 ; VAR_WITHDEF="-D""VAR_WITH=7" ;;
+ VAR_WITHVAL=7 ; VAR_WITHDEF="-D""VAR_WITH=7" ;;
6|6,*|manymore|manymore,*|most) withval=6
VAR_WITHVAL=6 ; VAR_WITHDEF="-D""VAR_WITH=6" ;;
5|5,*|somemore|somemore,*|almost) withval=5
- VAR_WITHVAL=5 ; VAR_WITHDEF="-D""VAR_WITH=5" ;;
+ VAR_WITHVAL=5 ; VAR_WITHDEF="-D""VAR_WITH=5" ;;
4|4,*|more|more,*) withval=4
VAR_WITHVAL=4 ; VAR_WITHDEF="-D""VAR_WITH=4" ;;
3|3,*|much|somemany,*) withval=3
diff --git a/m4/ax_cvs.m4 b/m4/ax_cvs.m4
index f1d662d..feb85c6 100644
--- a/m4/ax_cvs.m4
+++ b/m4/ax_cvs.m4
@@ -276,7 +276,7 @@ ${AX_DOLLAR}(top_builddir)/commitlog: cvsalways
/^cvs diff: .* is a new entry/ { print \"\\\\t* ./\"
${AX_DOLLAR}${AX_DOLLAR}3 \" (added)\"; }\' \\
> \"${AX_DOLLAR}${AX_DOLLAR}CURR/commitlog.tmp\")
@if test -s commitlog.tmp; then \\
- echo \"\" >> commitlog.tmp; \\
+ echo \"\" >> commitlog.tmp; \\
if test -f ${AX_DOLLAR}(top_builddir)/commitlog; then \\
cat ${AX_DOLLAR}(top_builddir)/commitlog >>
commitlog.tmp; \\
fi; \\
@@ -313,17 +313,17 @@ cvs-rm:
NEWFILES=\"\"; \\
for FILE in \$(FILES); do \\
if test -e \"${AX_DOLLAR}${AX_DOLLAR}FILE\"; then \\
- rm -i \"${AX_DOLLAR}${AX_DOLLAR}FILE\"; \\
- fi; \\
- if test ! -e \"${AX_DOLLAR}${AX_DOLLAR}FILE\"; then \\
- if test \"\$(srcdir)\" != \".\"; then \\
- FILE=\`echo \"${AX_DOLLAR}${AX_DOLLAR}FILE\" | \$(SED)
-e \'s|^\$(srcdir)|.|\'\`; \\
- fi; \\
- NEWFILES=\"${AX_DOLLAR}${AX_DOLLAR}NEWFILES
${AX_DOLLAR}${AX_DOLLAR}FILE\"; \\
- fi; \\
+ rm -i \"${AX_DOLLAR}${AX_DOLLAR}FILE\"; \\
+ fi; \\
+ if test ! -e \"${AX_DOLLAR}${AX_DOLLAR}FILE\"; then \\
+ if test \"\$(srcdir)\" != \".\"; then \\
+ FILE=\`echo \"${AX_DOLLAR}${AX_DOLLAR}FILE\" | \$(SED)
-e \'s|^\$(srcdir)|.|\'\`; \\
+ fi; \\
+ NEWFILES=\"${AX_DOLLAR}${AX_DOLLAR}NEWFILES
${AX_DOLLAR}${AX_DOLLAR}FILE\"; \\
+ fi; \\
done; \\
if test \"x${AX_DOLLAR}${AX_DOLLAR}NEWFILES\" != \"x\"; then \\
- (cd \"\$(srddir)\"; \$(CVS) remove
${AX_DOLLAR}${AX_DOLLAR}NEWFILES; ); \\
+ (cd \"\$(srddir)\"; \$(CVS) remove
${AX_DOLLAR}${AX_DOLLAR}NEWFILES; ); \\
fi; \\
else \\
echo \"You must specify the file(s) you want to remove from cvs by
using\"; \\
@@ -339,14 +339,14 @@ cvs-add:
NEWFILES=\"\"; \\
for FILE in ${AX_DOLLAR}(FILES); do \\
if test -e \"${AX_DOLLAR}${AX_DOLLAR}FILE\"; then \\
- if test \"${AX_DOLLAR}(srcdir)\" != \".\"; then \\
- FILE=\`echo \"${AX_DOLLAR}${AX_DOLLAR}FILE\" | sed -e
\'s|^${AX_DOLLAR}(srcdir)|.|\'\`; \\
- fi; \\
+ if test \"${AX_DOLLAR}(srcdir)\" != \".\"; then \\
+ FILE=\`echo \"${AX_DOLLAR}${AX_DOLLAR}FILE\" | sed -e
\'s|^${AX_DOLLAR}(srcdir)|.|\'\`; \\
+ fi; \\
fi; \\
- NEWFILES=\"${AX_DOLLAR}${AX_DOLLAR}NEWFILES
${AX_DOLLAR}${AX_DOLLAR}FILE\"; \\
+ NEWFILES=\"${AX_DOLLAR}${AX_DOLLAR}NEWFILES
${AX_DOLLAR}${AX_DOLLAR}FILE\"; \\
done; \\
if test \"x${AX_DOLLAR}${AX_DOLLAR}NEWFILES\" != \"x\"; then \\
- cd \"${AX_DOLLAR}(srcdir)\"; \$(CVS) add
${AX_DOLLAR}${AX_DOLLAR}NEWFILES; \\
+ cd \"${AX_DOLLAR}(srcdir)\"; \$(CVS) add
${AX_DOLLAR}${AX_DOLLAR}NEWFILES; \\
fi; \\
else \\
echo \"You must specify the file(s) you want to add to cvs by
using\"; \\
diff --git a/m4/ax_dist_msi.m4 b/m4/ax_dist_msi.m4
index e149516..8cfc5bf 100644
--- a/m4/ax_dist_msi.m4
+++ b/m4/ax_dist_msi.m4
@@ -43,10 +43,10 @@ if test "x$MSI_SETUP_FILE" != "x"; then
if test "x$enableval" != "x"; then
if test "x$enableval" = "xyes"; then
USING_DIST_MSI=true
- AC_MSG_NOTICE([dist-msi support enabled])
+ AC_MSG_NOTICE([dist-msi support enabled])
elif test "x$enableval" = "xno"; then
USING_DIST_MSI=false
- AC_MSG_NOTICE([dist-msi support disabled])
+ AC_MSG_NOTICE([dist-msi support disabled])
fi
fi,
USING_DIST_MSI=true
diff --git a/m4/ax_dist_rpm.m4 b/m4/ax_dist_rpm.m4
index fb03ef6..bc2a8d6 100644
--- a/m4/ax_dist_rpm.m4
+++ b/m4/ax_dist_rpm.m4
@@ -89,12 +89,12 @@ if test "x$AX_HAVE_INSTALL_FILES" = "xtrue"; then
AC_ARG_VAR(PLATFORM_SUFFIX, [A short name for your platform that
will be added to the name of the binary RPMs you may choose to create (by
running make rpm). e.g. rh71 for RedHat 7.1, lsb1.3 for a LSB 1.3 compliant
system (SuSE 8.2 or RedHat 9), osx103 for OS X 10.3.x, etc])
AC_MSG_CHECKING([rpm platform suffix])
if test "x$PLATFORM_SUFFIX" != "x"; then
- AC_MSG_RESULT([$PLATFORM_SUFFIX])
- AC_SUBST([PLATFORM_SUFFIX])
+ AC_MSG_RESULT([$PLATFORM_SUFFIX])
+ AC_SUBST([PLATFORM_SUFFIX])
ax_dist_rpm_enabled=true
else
- AC_MSG_RESULT([$PLATFORM_SUFFIX])
- AC_MSG_WARN([rpm support disabled... PLATFORM_SUFFIX not set])
+ AC_MSG_RESULT([$PLATFORM_SUFFIX])
+ AC_MSG_WARN([rpm support disabled... PLATFORM_SUFFIX not set])
fi
else
AC_MSG_NOTICE([rpm support disabled... neither rpmbuild or rpm was
found])
@@ -122,9 +122,9 @@ AX_DIST_RPM_CLEANFILES = \$(top_builddir)/RPMChangeLog
\$(AX_INSTALL_FILES_CLEAN
if( stop ) exit; \\
split( \$${AX_DOLLAR}1, date, \"-\" ); \\
\$${AX_DOLLAR}1 = strftime( \"%%a %%b %%d %%Y\", \\
- mktime( date[ 1 ] \" \" date[ 2 ] \" \"
date [ 3 ] \" 00 00 00\" ) ); \\
+ mktime( date[ 1 ] \" \" date[ 2 ] \" \"
date [ 3 ] \" 00 00 00\" ) ); \\
print \"* \" \$${AX_DOLLAR}0; } \\
- /Released \$(PACKAGE)-/ { \\
+ /Released \$(PACKAGE)-/ { \\
gsub( /\$(PACKAGE)-/, \"\", \$${AX_DOLLAR}2 ); \\
split( \$${AX_DOLLAR}2, ver, \".\" ); \\
split( \"\$(VERSION)\", curr_ver, \".\" ); \\
@@ -239,14 +239,14 @@ srpm: \$(PACKAGE)-\$(VERSION)-0.src.rpm
done; \\
if test -d \"\$\$RPMDIR\"; then \\
for dir in \`ls \"\$\$RPMDIR\"\`; do \\
- ls
\"\$\${RPMDIR}\$\${dir}/\$(PACKAGE)-\$(VERSION)-0.\$\${dir}.rpm\" > /dev/null
2>&1; \\
+ ls
\"\$\${RPMDIR}\$\${dir}/\$(PACKAGE)-\$(VERSION)-0.\$\${dir}.rpm\" > /dev/null
2>&1; \\
if test \"\$${AX_DOLLAR}?\" == \"0\"; then \\
cp
\"\$\${RPMDIR}\$\${dir}/\$(PACKAGE)-\$(VERSION)-0.\$\${dir}.rpm\"
\"\$(top_builddir)/\$(PACKAGE)-\$(VERSION)-0.\$\${dir}.$PLATFORM_SUFFIX.rpm\";
\\
found=true; \\
fi; \\
done; \\
if ! \$\$found; then \\
- echo \"RPM built but not found.\"; \\
+ echo \"RPM built but not found.\"; \\
echo \"Please copy it to \$(top_builddir) manually.\"; \\
exit 1; \\
fi; \\
@@ -269,7 +269,7 @@ srpm: \$(PACKAGE)-\$(VERSION)-0.src.rpm
EXIT=${AX_DOLLAR}${AX_DOLLAR}?; \\
while test \"${AX_DOLLAR}${AX_DOLLAR}EXIT\" == \"0\"; do \\
SRPMDIR=\`echo \"${AX_DOLLAR}${AX_DOLLAR}SRPMDIR\" | \$(GAWK)
'/%%{.*}/ \\
- { match( ${AX_DOLLAR}${AX_DOLLAR}0, /%%{.*}/, macro ); \\
+ { match( ${AX_DOLLAR}${AX_DOLLAR}0, /%%{.*}/, macro ); \\
suffix = substr( ${AX_DOLLAR}${AX_DOLLAR}0, RSTART + RLENGTH
); \\
gsub( /{|}/, \"\", macro[ 0 ] ); \\
while( ( getline < \"rpmmacros\" ) > 0 ) \\
@@ -290,7 +290,7 @@ srpm: \$(PACKAGE)-\$(VERSION)-0.src.rpm
found=true; \\
fi; \\
if ! ${AX_DOLLAR}${AX_DOLLAR}found; then \\
- echo \"SRPM built but not found.\"; \\
+ echo \"SRPM built but not found.\"; \\
echo \"Please copy it to ${AX_DOLLAR}(top_builddir)
manually.\"; \\
exit 1; \\
fi; \\
diff --git a/m4/ax_gcc_option.m4 b/m4/ax_gcc_option.m4
index 302209a..d2936f7 100644
--- a/m4/ax_gcc_option.m4
+++ b/m4/ax_gcc_option.m4
@@ -116,7 +116,7 @@ EOF
AC_TRY_COMMAND(cat conftest.c 1>&AS_MESSAGE_LOG_FD)
AS_IF([ AC_TRY_COMMAND($CC $2 $1 -c conftest.c 1>&AS_MESSAGE_LOG_FD) ],[
- AC_MSG_RESULT([yes])
+ AC_MSG_RESULT([yes])
$4
],[
AC_MSG_RESULT([no])
diff --git a/m4/ax_install_files.m4 b/m4/ax_install_files.m4
index 480be2f..26282b5 100644
--- a/m4/ax_install_files.m4
+++ b/m4/ax_install_files.m4
@@ -54,13 +54,13 @@ AX_INSTALL_FILES_CLEANFILES = \\
cd \"\$\$STAGING\" && find "." ! -type d -print | \\
\$(GAWK) ' \\
/^\\.\\/usr\\/local\\/lib/ { \\
- sub( /\\.\\/usr\\/local\\/lib/, \"%%{_libdir}\" ); } \\
+ sub( /\\.\\/usr\\/local\\/lib/, \"%%{_libdir}\" ); } \\
/^\\.\\/usr\\/local\\/bin/ { \\
- sub( /\\.\\/usr\\/local\\/bin/, \"%%{_bindir}\" ); } \\
+ sub( /\\.\\/usr\\/local\\/bin/, \"%%{_bindir}\" ); } \\
/^\\.\\/usr\\/local\\/include/ { \\
sub( /\\.\\/usr\\/local\\/include/, \"%%{_includedir}\" ); } \\
/^\\.\\/usr\\/local\\/share/ { \\
- sub( /\\.\\/usr\\/local\\/share/, \"%%{_datadir}\" ); } \\
+ sub( /\\.\\/usr\\/local\\/share/, \"%%{_datadir}\" ); } \\
/^\\.\\/usr\\/local/ { \\
sub( /\\.\\/usr\\/local/, \"%%{_prefix}\" ); } \\
/^\\./ { sub( /\\./, \"\" ); } \\
diff --git a/m4/ax_llvm.m4 b/m4/ax_llvm.m4
index 531cb5e..72cd407 100644
--- a/m4/ax_llvm.m4
+++ b/m4/ax_llvm.m4
@@ -64,12 +64,12 @@ AC_ARG_WITH([llvm],
AC_CACHE_CHECK(can compile with and link with
llvm([$1]),
ax_cv_llvm,
- [AC_LANG_PUSH([C++])
+ [AC_LANG_PUSH([C++])
AC_LINK_IFELSE(AC_LANG_PROGRAM(address@hidden:@include <llvm/Module.h>
]],
- [[llvm::Module *M = new
llvm::Module("test"); return 0;]]),
- ax_cv_llvm=yes, ax_cv_llvm=no)
- AC_LANG_POP([C++])
+ [[llvm::Module *M = new
llvm::Module("test"); return 0;]]),
+ ax_cv_llvm=yes, ax_cv_llvm=no)
+ AC_LANG_POP([C++])
])
if test "x$ax_cv_llvm" = "xyes"; then
diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4
index 164391e..3b19a63 100644
--- a/m4/ax_pthread.m4
+++ b/m4/ax_pthread.m4
@@ -199,8 +199,8 @@ for flag in $ax_pthread_flags; do
# functions on Solaris that doesn't have a non-functional libc stub.
# We try pthread_create on general principles.
AC_TRY_LINK([#include <pthread.h>
- static void routine(void* a) {a=0;}
- static void* start_routine(void* a) {return a;}],
+ static void routine(void* a) {a=0;}
+ static void* start_routine(void* a) {return a;}],
[pthread_t th; pthread_attr_t attr;
pthread_create(&th,0,start_routine,0);
pthread_join(th, 0);
diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
index 5441161..b3b0084 100644
--- a/m4/ax_python_devel.m4
+++ b/m4/ax_python_devel.m4
@@ -254,7 +254,7 @@ EOD`
AC_MSG_CHECKING([for Python site-packages path])
if test -z "$PYTHON_SITE_PKG"; then
PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
- print (distutils.sysconfig.get_python_lib(0,0));"`
+ print (distutils.sysconfig.get_python_lib(0,0));"`
fi
AC_MSG_RESULT([$PYTHON_SITE_PKG])
AC_SUBST([PYTHON_SITE_PKG])
diff --git a/m4/ax_set_default_paths_system.m4
b/m4/ax_set_default_paths_system.m4
index 8ae1d4d..529069f 100644
--- a/m4/ax_set_default_paths_system.m4
+++ b/m4/ax_set_default_paths_system.m4
@@ -63,11 +63,11 @@ case "$prefix:$ac_default_prefix" in
else
case "$PATH" in
*:/usr/local/cross-tools/$target_alias/bin:*)
- ac_default_prefix="/usr/local/cross-tools/$target_alias" ;;
+ ac_default_prefix="/usr/local/cross-tools/$target_alias" ;;
*:/usr/local/$target_alias/bin:*)
- ac_default_prefix="/usr/local/$target_alias" ;;
+ ac_default_prefix="/usr/local/$target_alias" ;;
*:/usr/local/$target_cpu-$target_os/bin:*)
- ac_default_prefix="/usr/local/$target_cpu-$target_os" ;;
+ ac_default_prefix="/usr/local/$target_cpu-$target_os" ;;
*)
ac_default_prefix="/programs" ;;
esac
@@ -90,7 +90,7 @@ case ${result} in
# help-files shall be set with --infodir, docprefix is datadir
docprefix="${datadir}"
mandir=`echo $mandir \
- |sed -e 's:^..prefix./man$:${datadir}/info:'`
+ |sed -e 's:^..prefix./man$:${datadir}/info:'`
includedir=`echo $includedir \
|sed -e 's:^..prefix./include$:${datadir}/include:'`
# other state files (but /etc) are moved to datadir
diff --git a/m4/ax_sys_perlsharpbang.m4 b/m4/ax_sys_perlsharpbang.m4
index 80b2367..a646747 100644
--- a/m4/ax_sys_perlsharpbang.m4
+++ b/m4/ax_sys_perlsharpbang.m4
@@ -69,9 +69,9 @@ AC_DEFUN([AX_SYS_PERLSHARPBANG],[dnl
AC_ARG_WITH(perl-shebang,
AS_HELP_STRING([--with-perl-shebang],
[override what perl thinks is the way for the kernel to start it
(seldom needed)]dnl
- ),
+ ),
[opt_perl_shebang="$withval"]dnl
- ,dnl
+ ,dnl
[opt_perl_shebang="not_set"]dnl
)dnl
@@ -79,8 +79,8 @@ AC_DEFUN([AX_SYS_PERLSHARPBANG],[dnl
ax_cv_opt_perl_shebang,
[ case "$opt_perl_shebang" in
not_set ) ax_cv_opt_perl_shebang=''
- ;;
- * )
+ ;;
+ * )
ax_cv_opt_perl_shebang=`echo "$opt_perl_shebang" | sed
-e's|^#!\s*\(.*\)$|\1|'`
esac
]dnl
@@ -100,17 +100,17 @@ AC_DEFUN([AX_SYS_PERLSHARPBANG],[dnl
negclass="[[^']]"; dnl
# must leave this comment: m4 will remove the outer brackets for us, heheh
AC_CACHE_CHECK([for kernel sharpbang invocation to start perl],
- ac_cv_sys_kernshrpbang_perl,
+ ac_cv_sys_kernshrpbang_perl,
[_somian_kspb_perl=`echo "$_somian_shbangperl" | sed
-ne"s|.*='\($negclass*\)';$|\1|p"`
if test "x$_somian_kspb_perl" == x
then _somian_ksbp_warn_empty='durnit'
else
case "A$_somian_kspb_perl" in
- A#!*perl* )
+ A#!*perl* )
ac_cv_sys_kernshrpbang_perl=`echo "$_somian_kspb_perl" | sed
-e's|#!\(.*\)$|\1|'`
;;
- A* ) _somian_ksbp_warn_defau='trouble'
- ac_cv_sys_kernshrpbang_perl="$PERLINTERP"
+ A* ) _somian_ksbp_warn_defau='trouble'
+ ac_cv_sys_kernshrpbang_perl="$PERLINTERP"
esac
fi
])dnl Done with testing sharpbang
--
1.7.3.234.g7bba3
>From d5e64794b3ccaef631a9cffb6c01df42baf4f75b Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 24 Sep 2010 11:35:21 +0200
Subject: [PATCH 5/5] build: m4-quote use of AC_LANG_PROGRAM to avoid warning
from new autoconf
Using autoconf-2.68 would evoke many new warnings like this:
configure.ac:78: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected
in body
../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from...
../../lib/autoconf/general.m4:2591: _AC_COMPILE_IFELSE is expanded from...
../../lib/autoconf/general.m4:2607: AC_COMPILE_IFELSE is expanded from...
../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from...
../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from...
../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from...
ax/ax_boost_thread.m4:35: AX_BOOST_THREAD is expanded from...
configure.ac:78: the top level
Autoconf was unable to detect the existing use of AC_LANG_SOURCE
because it was underquoted. Fix that.
---
m4/ax_boost_asio.m4 | 4 ++--
m4/ax_boost_date_time.m4 | 4 ++--
m4/ax_boost_filesystem.m4 | 4 ++--
m4/ax_boost_iostreams.m4 | 4 ++--
m4/ax_boost_program_options.m4 | 4 ++--
m4/ax_boost_python.m4 | 4 ++--
m4/ax_boost_regex.m4 | 4 ++--
m4/ax_boost_serialization.m4 | 4 ++--
m4/ax_boost_signals.m4 | 4 ++--
m4/ax_boost_system.m4 | 4 ++--
m4/ax_boost_test_exec_monitor.m4 | 4 ++--
m4/ax_boost_thread.m4 | 4 ++--
m4/ax_boost_unit_test_framework.m4 | 4 ++--
m4/ax_boost_wave.m4 | 4 ++--
m4/ax_boost_wserialization.m4 | 4 ++--
m4/ax_llvm.m4 | 4 ++--
16 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/m4/ax_boost_asio.m4 b/m4/ax_boost_asio.m4
index f436e5c..686d892 100644
--- a/m4/ax_boost_asio.m4
+++ b/m4/ax_boost_asio.m4
@@ -65,7 +65,7 @@ AC_DEFUN([AX_BOOST_ASIO],
AC_CACHE_CHECK(whether the Boost::ASIO library is available,
ax_cv_boost_asio,
[AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[ @%:@include
<boost/asio.hpp>
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ @%:@include
<boost/asio.hpp>
]],
[[
@@ -75,7 +75,7 @@ AC_DEFUN([AX_BOOST_ASIO],
t.cancel();
io.run_one();
return
0;
- ]]),
+ ]])],
ax_cv_boost_asio=yes, ax_cv_boost_asio=no)
AC_LANG_POP([C++])
])
diff --git a/m4/ax_boost_date_time.m4 b/m4/ax_boost_date_time.m4
index 2c77d71..04ec274 100644
--- a/m4/ax_boost_date_time.m4
+++ b/m4/ax_boost_date_time.m4
@@ -65,10 +65,10 @@ AC_DEFUN([AX_BOOST_DATE_TIME],
AC_CACHE_CHECK(whether the Boost::Date_Time library is available,
ax_cv_boost_date_time,
[AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/date_time/gregorian/gregorian_types.hpp>]],
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(address@hidden:@include
<boost/date_time/gregorian/gregorian_types.hpp>]],
[[using namespace boost::gregorian; date
d(2002,Jan,10);
return 0;
- ]]),
+ ]])],
ax_cv_boost_date_time=yes, ax_cv_boost_date_time=no)
AC_LANG_POP([C++])
])
diff --git a/m4/ax_boost_filesystem.m4 b/m4/ax_boost_filesystem.m4
index 10b509e..16a080f 100644
--- a/m4/ax_boost_filesystem.m4
+++ b/m4/ax_boost_filesystem.m4
@@ -70,10 +70,10 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
AC_CACHE_CHECK(whether the Boost::Filesystem library is available,
ax_cv_boost_filesystem,
[AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/filesystem/path.hpp>]],
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(address@hidden:@include
<boost/filesystem/path.hpp>]],
[[using namespace boost::filesystem;
path my_path( "foo/bar/data.txt" );
- return 0;]]),
+ return 0;]])],
ax_cv_boost_filesystem=yes,
ax_cv_boost_filesystem=no)
AC_LANG_POP([C++])
])
diff --git a/m4/ax_boost_iostreams.m4 b/m4/ax_boost_iostreams.m4
index 8bad151..f73e796 100644
--- a/m4/ax_boost_iostreams.m4
+++ b/m4/ax_boost_iostreams.m4
@@ -64,14 +64,14 @@ AC_DEFUN([AX_BOOST_IOSTREAMS],
AC_CACHE_CHECK(whether the Boost::IOStreams library is available,
ax_cv_boost_iostreams,
[AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/iostreams/filtering_stream.hpp>
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(address@hidden:@include
<boost/iostreams/filtering_stream.hpp>
@%:@include <boost/range/iterator_range.hpp>
]],
[[std::string input = "Hello World!";
namespace io =
boost::iostreams;
io::filtering_istream in(boost::make_iterator_range(input));
return
0;
- ]]),
+ ]])],
ax_cv_boost_iostreams=yes,
ax_cv_boost_iostreams=no)
AC_LANG_POP([C++])
])
diff --git a/m4/ax_boost_program_options.m4 b/m4/ax_boost_program_options.m4
index ddbfae0..5fd5746 100644
--- a/m4/ax_boost_program_options.m4
+++ b/m4/ax_boost_program_options.m4
@@ -63,10 +63,10 @@ AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS],
AC_CACHE_CHECK([whether the Boost::Program_Options library is
available],
ax_cv_boost_program_options,
[AC_LANG_PUSH(C++)
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/program_options.hpp>
+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(address@hidden:@include
<boost/program_options.hpp>
]],
[[boost::program_options::options_description generic("Generic options");
- return 0;]]),
+ return 0;]])],
ax_cv_boost_program_options=yes,
ax_cv_boost_program_options=no)
AC_LANG_POP([C++])
])
diff --git a/m4/ax_boost_python.m4 b/m4/ax_boost_python.m4
index fa7cc98..a881d0f 100644
--- a/m4/ax_boost_python.m4
+++ b/m4/ax_boost_python.m4
@@ -63,11 +63,11 @@ ac_cv_boost_python,
if test x$PYTHON_INCLUDE_DIR != x; then
CPPFLAGS=-I$PYTHON_INCLUDE_DIR $CPPFLAGS
fi
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <boost/python/module.hpp>
using namespace boost::python;
BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]],
- [[return 0;]]),
+ [[return 0;]])],
ac_cv_boost_python=yes, ac_cv_boost_python=no)
AC_LANG_RESTORE
CPPFLAGS=$CPPFLAGS_SAVE
diff --git a/m4/ax_boost_regex.m4 b/m4/ax_boost_regex.m4
index 2f1170c..f8ea1f8 100644
--- a/m4/ax_boost_regex.m4
+++ b/m4/ax_boost_regex.m4
@@ -65,9 +65,9 @@ AC_DEFUN([AX_BOOST_REGEX],
AC_CACHE_CHECK(whether the Boost::Regex library is available,
ax_cv_boost_regex,
[AC_LANG_PUSH([C++])
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include <boost/regex.hpp>
+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(address@hidden:@include <boost/regex.hpp>
]],
- [[boost::regex r(); return 0;]]),
+ [[boost::regex r(); return 0;]])],
ax_cv_boost_regex=yes, ax_cv_boost_regex=no)
AC_LANG_POP([C++])
])
diff --git a/m4/ax_boost_serialization.m4 b/m4/ax_boost_serialization.m4
index d72089d..4e17138 100644
--- a/m4/ax_boost_serialization.m4
+++ b/m4/ax_boost_serialization.m4
@@ -65,14 +65,14 @@ AC_DEFUN([AX_BOOST_SERIALIZATION],
AC_CACHE_CHECK(whether the Boost::Serialization library is available,
ax_cv_boost_serialization,
[AC_LANG_PUSH([C++])
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include <fstream>
+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(address@hidden:@include <fstream>
@%:@include <boost/archive/text_oarchive.hpp>
@%:@include
<boost/archive/text_iarchive.hpp>
]],
[[std::ofstream ofs("filename");
boost::archive::text_oarchive oa(ofs);
return
0;
- ]]),
+ ]])],
ax_cv_boost_serialization=yes, ax_cv_boost_serialization=no)
AC_LANG_POP([C++])
])
diff --git a/m4/ax_boost_signals.m4 b/m4/ax_boost_signals.m4
index 3c4af73..8f01272 100644
--- a/m4/ax_boost_signals.m4
+++ b/m4/ax_boost_signals.m4
@@ -65,11 +65,11 @@ AC_DEFUN([AX_BOOST_SIGNALS],
AC_CACHE_CHECK(whether the Boost::Signals library is available,
ax_cv_boost_signals,
[AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/signal.hpp>
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(address@hidden:@include
<boost/signal.hpp>
]],
[[boost::signal<void ()> sig;
return 0;
- ]]),
+ ]])],
ax_cv_boost_signals=yes, ax_cv_boost_signals=no)
AC_LANG_POP([C++])
])
diff --git a/m4/ax_boost_system.m4 b/m4/ax_boost_system.m4
index 430881c..e9aecb5 100644
--- a/m4/ax_boost_system.m4
+++ b/m4/ax_boost_system.m4
@@ -69,8 +69,8 @@ AC_DEFUN([AX_BOOST_SYSTEM],
[AC_LANG_PUSH([C++])
CXXFLAGS_SAVE=$CXXFLAGS
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/system/error_code.hpp>]],
- [[boost::system::system_category]]),
+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(address@hidden:@include
<boost/system/error_code.hpp>]],
+ [[boost::system::system_category]])],
ax_cv_boost_system=yes, ax_cv_boost_system=no)
CXXFLAGS=$CXXFLAGS_SAVE
AC_LANG_POP([C++])
diff --git a/m4/ax_boost_test_exec_monitor.m4 b/m4/ax_boost_test_exec_monitor.m4
index e0cd9f1..6efa982 100644
--- a/m4/ax_boost_test_exec_monitor.m4
+++ b/m4/ax_boost_test_exec_monitor.m4
@@ -65,8 +65,8 @@ AC_DEFUN([AX_BOOST_TEST_EXEC_MONITOR],
AC_CACHE_CHECK(whether the Boost::Test_Exec_Monitor library is
available,
ax_cv_boost_test_exec_monitor,
[AC_LANG_PUSH([C++])
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/test/test_tools.hpp>]],
- [[int i=1 ; BOOST_REQUIRE(i==1); ; return
0;]]),
+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(address@hidden:@include
<boost/test/test_tools.hpp>]],
+ [[int i=1 ; BOOST_REQUIRE(i==1); ; return
0;]])],
ax_cv_boost_test_exec_monitor=yes,
ax_cv_boost_test_exec_monitor=no)
AC_LANG_POP([C++])
])
diff --git a/m4/ax_boost_thread.m4 b/m4/ax_boost_thread.m4
index 49f6287..1fcb867 100644
--- a/m4/ax_boost_thread.m4
+++ b/m4/ax_boost_thread.m4
@@ -75,9 +75,9 @@ AC_DEFUN([AX_BOOST_THREAD],
else
CXXFLAGS="-pthread $CXXFLAGS"
fi
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/thread/thread.hpp>]],
+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(address@hidden:@include
<boost/thread/thread.hpp>]],
[[boost::thread_group thrds;
- return 0;]]),
+ return 0;]])],
ax_cv_boost_thread=yes, ax_cv_boost_thread=no)
CXXFLAGS=$CXXFLAGS_SAVE
AC_LANG_POP([C++])
diff --git a/m4/ax_boost_unit_test_framework.m4
b/m4/ax_boost_unit_test_framework.m4
index fa3e06d..8d841ec 100644
--- a/m4/ax_boost_unit_test_framework.m4
+++ b/m4/ax_boost_unit_test_framework.m4
@@ -64,9 +64,9 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
AC_CACHE_CHECK(whether the Boost::Unit_Test_Framework library is
available,
ax_cv_boost_unit_test_framework,
[AC_LANG_PUSH([C++])
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include
<boost/test/unit_test.hpp>]],
+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(address@hidden:@include
<boost/test/unit_test.hpp>]],
[[using boost::unit_test::test_suite;
- test_suite* test=
BOOST_TEST_SUITE( "Unit test example 1" ); return 0;]]),
+ test_suite* test=
BOOST_TEST_SUITE( "Unit test example 1" ); return 0;]])],
ax_cv_boost_unit_test_framework=yes,
ax_cv_boost_unit_test_framework=no)
AC_LANG_POP([C++])
])
diff --git a/m4/ax_boost_wave.m4 b/m4/ax_boost_wave.m4
index 8739e0b..501d3ba 100644
--- a/m4/ax_boost_wave.m4
+++ b/m4/ax_boost_wave.m4
@@ -70,9 +70,9 @@ AC_DEFUN([AX_BOOST_WAVE],
AC_CACHE_CHECK(whether the Boost::Wave library is available,
ax_cv_boost_wave,
[AC_LANG_PUSH([C++])
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include <boost/wave.hpp>
+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(address@hidden:@include <boost/wave.hpp>
]],
- [[boost::wave::token_category r; return
0;]]),
+ [[boost::wave::token_category r; return
0;]])],
ax_cv_boost_wave=yes, ax_cv_boost_wave=no)
AC_LANG_POP([C++])
])
diff --git a/m4/ax_boost_wserialization.m4 b/m4/ax_boost_wserialization.m4
index 6e5dde7..5ca1625 100644
--- a/m4/ax_boost_wserialization.m4
+++ b/m4/ax_boost_wserialization.m4
@@ -64,14 +64,14 @@ AC_DEFUN([AX_BOOST_WSERIALIZATION],
AC_CACHE_CHECK(whether the Boost::WSerialization library is available,
ax_cv_boost_wserialization,
[AC_LANG_PUSH([C++])
-
AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include <fstream>
+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(address@hidden:@include <fstream>
@%:@include <boost/archive/text_oarchive.hpp>
@%:@include
<boost/archive/text_iarchive.hpp>
]],
[[std::ofstream ofs("filename");
boost::archive::text_oarchive oa(ofs);
return
0;
- ]]),
+ ]])],
ax_cv_boost_wserialization=yes,
ax_cv_boost_wserialization=no)
AC_LANG_POP([C++])
])
diff --git a/m4/ax_llvm.m4 b/m4/ax_llvm.m4
index 72cd407..699360d 100644
--- a/m4/ax_llvm.m4
+++ b/m4/ax_llvm.m4
@@ -65,9 +65,9 @@ AC_ARG_WITH([llvm],
AC_CACHE_CHECK(can compile with and link with
llvm([$1]),
ax_cv_llvm,
[AC_LANG_PUSH([C++])
-
AC_LINK_IFELSE(AC_LANG_PROGRAM(address@hidden:@include <llvm/Module.h>
+
AC_LINK_IFELSE([AC_LANG_PROGRAM(address@hidden:@include <llvm/Module.h>
]],
- [[llvm::Module *M = new
llvm::Module("test"); return 0;]]),
+ [[llvm::Module *M = new
llvm::Module("test"); return 0;]])],
ax_cv_llvm=yes, ax_cv_llvm=no)
AC_LANG_POP([C++])
])
--
1.7.3.234.g7bba3
- 5 patches, 4 whitespace clean-up, one for autoconf-2.68,
Jim Meyering <=