Index: /trunk/FACT++/Makefile.in
===================================================================
--- /trunk/FACT++/Makefile.in	(revision 12767)
+++ /trunk/FACT++/Makefile.in	(revision 12768)
@@ -88,4 +88,5 @@
 	$(top_srcdir)/.macro_dir/ac_check_readline.m4 \
 	$(top_srcdir)/.macro_dir/ac_find_motif.m4 \
+	$(top_srcdir)/.macro_dir/ax_cxx_compile_stdcxx_0x.m4 \
 	$(top_srcdir)/.macro_dir/libtool.m4 \
 	$(top_srcdir)/.macro_dir/ltoptions.m4 \
Index: /trunk/FACT++/aclocal.m4
===================================================================
--- /trunk/FACT++/aclocal.m4	(revision 12767)
+++ /trunk/FACT++/aclocal.m4	(revision 12768)
@@ -19,108 +19,4 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-# ===========================================================================
-#        http://autoconf-archive.cryp.to/ac_cxx_compile_stdcxx_0x.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AC_CXX_COMPILE_STDCXX_0X
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the C++0x
-#   standard.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-AC_DEFUN([AC_CXX_COMPILE_STDCXX_0X], [
-  AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
-  ac_cv_cxx_compile_cxx0x_native,
-  [AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_COMPILE([
-  template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-    typedef check<check<bool>> right_angle_brackets;
-
-    int a;
-    decltype(a) b;
-
-    typedef check<int> check_type;
-    check_type c;
-    check_type&& cr = c;],,
-  ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no)
-  AC_LANG_RESTORE
-  ])
-
-  AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,
-  ac_cv_cxx_compile_cxx0x_cxx,
-  [AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  ac_save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -std=c++0x"
-  AC_TRY_COMPILE([
-  template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-    typedef check<check<bool>> right_angle_brackets;
-
-    int a;
-    decltype(a) b;
-
-    typedef check<int> check_type;
-    check_type c;
-    check_type&& cr = c;],,
-  ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no)
-  CXXFLAGS="$ac_save_CXXFLAGS"
-  AC_LANG_RESTORE
-  ])
-
-  AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,
-  ac_cv_cxx_compile_cxx0x_gxx,
-  [AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  ac_save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -std=gnu++0x"
-  AC_TRY_COMPILE([
-  template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-    typedef check<check<bool>> right_angle_brackets;
-
-    int a;
-    decltype(a) b;
-
-    typedef check<int> check_type;
-    check_type c;
-    check_type&& cr = c;],,
-  ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no)
-  CXXFLAGS="$ac_save_CXXFLAGS"
-  AC_LANG_RESTORE
-  ])
-
-  if test "$ac_cv_cxx_compile_cxx0x_native" = yes ||
-     test "$ac_cv_cxx_compile_cxx0x_cxx" = yes ||
-     test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then
-    AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])
-  fi
-])
 
 # ===========================================================================
@@ -3128,4 +3024,5 @@
 m4_include([.macro_dir/ac_check_readline.m4])
 m4_include([.macro_dir/ac_find_motif.m4])
+m4_include([.macro_dir/ax_cxx_compile_stdcxx_0x.m4])
 m4_include([.macro_dir/libtool.m4])
 m4_include([.macro_dir/ltoptions.m4])
Index: /trunk/FACT++/configure
===================================================================
--- /trunk/FACT++/configure	(revision 12767)
+++ /trunk/FACT++/configure	(revision 12768)
@@ -4622,5 +4622,5 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if g++ supports C++0x features without additional flags" >&5
 $as_echo_n "checking if g++ supports C++0x features without additional flags... " >&6; }
-if test "${ac_cv_cxx_compile_cxx0x_native+set}" = set; then :
+if test "${ax_cv_cxx_compile_cxx0x_native+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4648,5 +4648,5 @@
     typedef check<int> check_type;
     check_type c;
-    check_type&& cr = c;
+    check_type&& cr = static_cast<check_type&&>(c);
 int
 main ()
@@ -4658,7 +4658,7 @@
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_cxx_compile_cxx0x_native=yes
-else
-  ac_cv_cxx_compile_cxx0x_native=no
+  ax_cv_cxx_compile_cxx0x_native=yes
+else
+  ax_cv_cxx_compile_cxx0x_native=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -4671,10 +4671,10 @@
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compile_cxx0x_native" >&5
-$as_echo "$ac_cv_cxx_compile_cxx0x_native" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx0x_native" >&5
+$as_echo "$ax_cv_cxx_compile_cxx0x_native" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if g++ supports C++0x features with -std=c++0x" >&5
 $as_echo_n "checking if g++ supports C++0x features with -std=c++0x... " >&6; }
-if test "${ac_cv_cxx_compile_cxx0x_cxx+set}" = set; then :
+if test "${ax_cv_cxx_compile_cxx0x_cxx+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4704,5 +4704,5 @@
     typedef check<int> check_type;
     check_type c;
-    check_type&& cr = c;
+    check_type&& cr = static_cast<check_type&&>(c);
 int
 main ()
@@ -4714,7 +4714,7 @@
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_cxx_compile_cxx0x_cxx=yes
-else
-  ac_cv_cxx_compile_cxx0x_cxx=no
+  ax_cv_cxx_compile_cxx0x_cxx=yes
+else
+  ax_cv_cxx_compile_cxx0x_cxx=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -4728,10 +4728,10 @@
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compile_cxx0x_cxx" >&5
-$as_echo "$ac_cv_cxx_compile_cxx0x_cxx" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx0x_cxx" >&5
+$as_echo "$ax_cv_cxx_compile_cxx0x_cxx" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if g++ supports C++0x features with -std=gnu++0x" >&5
 $as_echo_n "checking if g++ supports C++0x features with -std=gnu++0x... " >&6; }
-if test "${ac_cv_cxx_compile_cxx0x_gxx+set}" = set; then :
+if test "${ax_cv_cxx_compile_cxx0x_gxx+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
@@ -4761,5 +4761,5 @@
     typedef check<int> check_type;
     check_type c;
-    check_type&& cr = c;
+    check_type&& cr = static_cast<check_type&&>(c);
 int
 main ()
@@ -4771,7 +4771,7 @@
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_cxx_compile_cxx0x_gxx=yes
-else
-  ac_cv_cxx_compile_cxx0x_gxx=no
+  ax_cv_cxx_compile_cxx0x_gxx=yes
+else
+  ax_cv_cxx_compile_cxx0x_gxx=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -4785,10 +4785,10 @@
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compile_cxx0x_gxx" >&5
-$as_echo "$ac_cv_cxx_compile_cxx0x_gxx" >&6; }
-
-  if test "$ac_cv_cxx_compile_cxx0x_native" = yes ||
-     test "$ac_cv_cxx_compile_cxx0x_cxx" = yes ||
-     test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx0x_gxx" >&5
+$as_echo "$ax_cv_cxx_compile_cxx0x_gxx" >&6; }
+
+  if test "$ax_cv_cxx_compile_cxx0x_native" = yes ||
+     test "$ax_cv_cxx_compile_cxx0x_cxx" = yes ||
+     test "$ax_cv_cxx_compile_cxx0x_gxx" = yes; then
 
 $as_echo "#define HAVE_STDCXX_0X /**/" >>confdefs.h
@@ -4796,5 +4796,5 @@
   fi
 
-if test "$ac_cv_cxx_compile_cxx0x_cxx" != yes; then
+if test "$ax_cv_cxx_compile_cxx0x_cxx" != yes; then
    as_fn_error $? "C++0x standard (-std=c++0x) not supported by compiler." "$LINENO" 5
 fi
Index: /trunk/FACT++/configure.ac
===================================================================
--- /trunk/FACT++/configure.ac	(revision 12767)
+++ /trunk/FACT++/configure.ac	(revision 12768)
@@ -47,5 +47,5 @@
 #AC_CXX_HEADER_STDCXX_0X
 AC_CXX_COMPILE_STDCXX_0X
-if test "$ac_cv_cxx_compile_cxx0x_cxx" != yes; then
+if test "$ax_cv_cxx_compile_cxx0x_cxx" != yes; then
    AC_MSG_ERROR([C++0x standard (-std=c++0x) not supported by compiler.])
 fi
