~jaypipes/drizzle/bugs

« back to all changes in this revision

Viewing changes to m4/pandora_check_cxx_standard.m4

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
8
8
  AS_IF([test "$GCC" = "yes"],
9
9
        [AS_IF([test "$ac_cv_cxx_compile_cxx0x_native" = "yes"],[],
10
10
               [AS_IF([test "$ac_cv_cxx_compile_cxx0x_gxx" = "yes"],
11
 
                      [CXXFLAGS="-std=gnu++0x ${CXXFLAGS}"],
12
 
                      [CXXFLAGS="-std=gnu++98"])
 
11
                      [CXX_STANDARD="-std=gnu++0x"],
 
12
                      [CXX_STANDARD="-std=gnu++98"])
13
13
               ])
14
14
        ])
 
15
  AM_CXXFLAGS="${CXX_STANDARD} ${AM_CXXFLAGS}"
 
16
  
 
17
  save_CXXFLAGS="${CXXFLAGS}"
 
18
  CXXFLAGS="${CXXFLAGS} ${CXX_STANDARD}"
15
19
  AC_CXX_HEADER_STDCXX_98
 
20
  CXXFLAGS="${save_CXXFLAGS}"
 
21
 
 
22
  AC_SUBST([CXX_STANDARD])
16
23
])