Changeset 12768 for trunk


Ignore:
Timestamp:
01/25/12 16:07:23 (13 years ago)
Author:
tbretz
Message:
Adapted to local version of c++0x check
Location:
trunk/FACT++
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/FACT++/Makefile.in

    r12756 r12768  
    8888        $(top_srcdir)/.macro_dir/ac_check_readline.m4 \
    8989        $(top_srcdir)/.macro_dir/ac_find_motif.m4 \
     90        $(top_srcdir)/.macro_dir/ax_cxx_compile_stdcxx_0x.m4 \
    9091        $(top_srcdir)/.macro_dir/libtool.m4 \
    9192        $(top_srcdir)/.macro_dir/ltoptions.m4 \

  • trunk/FACT++/aclocal.m4

    r12756 r12768  
    1919If you have problems, you may need to regenerate the build system entirely.
    2020To do so, use the procedure documented by the package, typically `autoreconf'.])])
    21 
    22 # ===========================================================================
    23 #        http://autoconf-archive.cryp.to/ac_cxx_compile_stdcxx_0x.html
    24 # ===========================================================================
    25 #
    26 # SYNOPSIS
    27 #
    28 #   AC_CXX_COMPILE_STDCXX_0X
    29 #
    30 # DESCRIPTION
    31 #
    32 #   Check for baseline language coverage in the compiler for the C++0x
    33 #   standard.
    34 #
    35 # LICENSE
    36 #
    37 #   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
    38 #
    39 #   Copying and distribution of this file, with or without modification, are
    40 #   permitted in any medium without royalty provided the copyright notice
    41 #   and this notice are preserved.
    42 
    43 AC_DEFUN([AC_CXX_COMPILE_STDCXX_0X], [
    44   AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
    45   ac_cv_cxx_compile_cxx0x_native,
    46   [AC_LANG_SAVE
    47   AC_LANG_CPLUSPLUS
    48   AC_TRY_COMPILE([
    49   template <typename T>
    50     struct check
    51     {
    52       static_assert(sizeof(int) <= sizeof(T), "not big enough");
    53     };
    54 
    55     typedef check<check<bool>> right_angle_brackets;
    56 
    57     int a;
    58     decltype(a) b;
    59 
    60     typedef check<int> check_type;
    61     check_type c;
    62     check_type&& cr = c;],,
    63   ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no)
    64   AC_LANG_RESTORE
    65   ])
    66 
    67   AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,
    68   ac_cv_cxx_compile_cxx0x_cxx,
    69   [AC_LANG_SAVE
    70   AC_LANG_CPLUSPLUS
    71   ac_save_CXXFLAGS="$CXXFLAGS"
    72   CXXFLAGS="$CXXFLAGS -std=c++0x"
    73   AC_TRY_COMPILE([
    74   template <typename T>
    75     struct check
    76     {
    77       static_assert(sizeof(int) <= sizeof(T), "not big enough");
    78     };
    79 
    80     typedef check<check<bool>> right_angle_brackets;
    81 
    82     int a;
    83     decltype(a) b;
    84 
    85     typedef check<int> check_type;
    86     check_type c;
    87     check_type&& cr = c;],,
    88   ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no)
    89   CXXFLAGS="$ac_save_CXXFLAGS"
    90   AC_LANG_RESTORE
    91   ])
    92 
    93   AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,
    94   ac_cv_cxx_compile_cxx0x_gxx,
    95   [AC_LANG_SAVE
    96   AC_LANG_CPLUSPLUS
    97   ac_save_CXXFLAGS="$CXXFLAGS"
    98   CXXFLAGS="$CXXFLAGS -std=gnu++0x"
    99   AC_TRY_COMPILE([
    100   template <typename T>
    101     struct check
    102     {
    103       static_assert(sizeof(int) <= sizeof(T), "not big enough");
    104     };
    105 
    106     typedef check<check<bool>> right_angle_brackets;
    107 
    108     int a;
    109     decltype(a) b;
    110 
    111     typedef check<int> check_type;
    112     check_type c;
    113     check_type&& cr = c;],,
    114   ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no)
    115   CXXFLAGS="$ac_save_CXXFLAGS"
    116   AC_LANG_RESTORE
    117   ])
    118 
    119   if test "$ac_cv_cxx_compile_cxx0x_native" = yes ||
    120      test "$ac_cv_cxx_compile_cxx0x_cxx" = yes ||
    121      test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then
    122     AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])
    123   fi
    124 ])
    12521
    12622# ===========================================================================
    … …  
    31283024m4_include([.macro_dir/ac_check_readline.m4])
    31293025m4_include([.macro_dir/ac_find_motif.m4])
     3026m4_include([.macro_dir/ax_cxx_compile_stdcxx_0x.m4])
    31303027m4_include([.macro_dir/libtool.m4])
    31313028m4_include([.macro_dir/ltoptions.m4])

  • trunk/FACT++/configure

    r12756 r12768  
    46224622  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if g++ supports C++0x features without additional flags" >&5
    46234623$as_echo_n "checking if g++ supports C++0x features without additional flags... " >&6; }
    4624 if test "${ac_cv_cxx_compile_cxx0x_native+set}" = set; then :
     4624if test "${ax_cv_cxx_compile_cxx0x_native+set}" = set; then :
    46254625  $as_echo_n "(cached) " >&6
    46264626else
    … …  
    46484648    typedef check<int> check_type;
    46494649    check_type c;
    4650     check_type&& cr = c;
     4650    check_type&& cr = static_cast<check_type&&>(c);
    46514651int
    46524652main ()
    … …  
    46584658_ACEOF
    46594659if ac_fn_cxx_try_compile "$LINENO"; then :
    4660   ac_cv_cxx_compile_cxx0x_native=yes
    4661 else
    4662   ac_cv_cxx_compile_cxx0x_native=no
     4660  ax_cv_cxx_compile_cxx0x_native=yes
     4661else
     4662  ax_cv_cxx_compile_cxx0x_native=no
    46634663fi
    46644664rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    … …  
    46714671
    46724672fi
    4673 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compile_cxx0x_native" >&5
    4674 $as_echo "$ac_cv_cxx_compile_cxx0x_native" >&6; }
     4673{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx0x_native" >&5
     4674$as_echo "$ax_cv_cxx_compile_cxx0x_native" >&6; }
    46754675
    46764676  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if g++ supports C++0x features with -std=c++0x" >&5
    46774677$as_echo_n "checking if g++ supports C++0x features with -std=c++0x... " >&6; }
    4678 if test "${ac_cv_cxx_compile_cxx0x_cxx+set}" = set; then :
     4678if test "${ax_cv_cxx_compile_cxx0x_cxx+set}" = set; then :
    46794679  $as_echo_n "(cached) " >&6
    46804680else
    … …  
    47044704    typedef check<int> check_type;
    47054705    check_type c;
    4706     check_type&& cr = c;
     4706    check_type&& cr = static_cast<check_type&&>(c);
    47074707int
    47084708main ()
    … …  
    47144714_ACEOF
    47154715if ac_fn_cxx_try_compile "$LINENO"; then :
    4716   ac_cv_cxx_compile_cxx0x_cxx=yes
    4717 else
    4718   ac_cv_cxx_compile_cxx0x_cxx=no
     4716  ax_cv_cxx_compile_cxx0x_cxx=yes
     4717else
     4718  ax_cv_cxx_compile_cxx0x_cxx=no
    47194719fi
    47204720rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    … …  
    47284728
    47294729fi
    4730 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compile_cxx0x_cxx" >&5
    4731 $as_echo "$ac_cv_cxx_compile_cxx0x_cxx" >&6; }
     4730{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx0x_cxx" >&5
     4731$as_echo "$ax_cv_cxx_compile_cxx0x_cxx" >&6; }
    47324732
    47334733  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if g++ supports C++0x features with -std=gnu++0x" >&5
    47344734$as_echo_n "checking if g++ supports C++0x features with -std=gnu++0x... " >&6; }
    4735 if test "${ac_cv_cxx_compile_cxx0x_gxx+set}" = set; then :
     4735if test "${ax_cv_cxx_compile_cxx0x_gxx+set}" = set; then :
    47364736  $as_echo_n "(cached) " >&6
    47374737else
    … …  
    47614761    typedef check<int> check_type;
    47624762    check_type c;
    4763     check_type&& cr = c;
     4763    check_type&& cr = static_cast<check_type&&>(c);
    47644764int
    47654765main ()
    … …  
    47714771_ACEOF
    47724772if ac_fn_cxx_try_compile "$LINENO"; then :
    4773   ac_cv_cxx_compile_cxx0x_gxx=yes
    4774 else
    4775   ac_cv_cxx_compile_cxx0x_gxx=no
     4773  ax_cv_cxx_compile_cxx0x_gxx=yes
     4774else
     4775  ax_cv_cxx_compile_cxx0x_gxx=no
    47764776fi
    47774777rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    … …  
    47854785
    47864786fi
    4787 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compile_cxx0x_gxx" >&5
    4788 $as_echo "$ac_cv_cxx_compile_cxx0x_gxx" >&6; }
    4789 
    4790   if test "$ac_cv_cxx_compile_cxx0x_native" = yes ||
    4791      test "$ac_cv_cxx_compile_cxx0x_cxx" = yes ||
    4792      test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then
     4787{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_cxx_compile_cxx0x_gxx" >&5
     4788$as_echo "$ax_cv_cxx_compile_cxx0x_gxx" >&6; }
     4789
     4790  if test "$ax_cv_cxx_compile_cxx0x_native" = yes ||
     4791     test "$ax_cv_cxx_compile_cxx0x_cxx" = yes ||
     4792     test "$ax_cv_cxx_compile_cxx0x_gxx" = yes; then
    47934793
    47944794$as_echo "#define HAVE_STDCXX_0X /**/" >>confdefs.h
    … …  
    47964796  fi
    47974797
    4798 if test "$ac_cv_cxx_compile_cxx0x_cxx" != yes; then
     4798if test "$ax_cv_cxx_compile_cxx0x_cxx" != yes; then
    47994799   as_fn_error $? "C++0x standard (-std=c++0x) not supported by compiler." "$LINENO" 5
    48004800fi

  • trunk/FACT++/configure.ac

    r12756 r12768  
    4747#AC_CXX_HEADER_STDCXX_0X
    4848AC_CXX_COMPILE_STDCXX_0X
    49 if test "$ac_cv_cxx_compile_cxx0x_cxx" != yes; then
     49if test "$ax_cv_cxx_compile_cxx0x_cxx" != yes; then
    5050   AC_MSG_ERROR([C++0x standard (-std=c++0x) not supported by compiler.])
    5151fi
Note: See TracChangeset for help on using the changeset viewer.