view src/configure.ac @ 915:8c8ed7c4ab83 default tip

* bwlabeln.cc (bwlabel_nd): Fix small bug in comment
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Tue, 18 Nov 2014 11:30:57 -0500 (2014-11-18)
parents 23e93653e1e5
children
line wrap: on
line source
AC_PREREQ([2.67])
AC_INIT([Octave-Forge image package], [2.3.0+])

AH_BOTTOM([#include "undef_unordered_map.h"])
AC_CONFIG_HEADERS([config.h])

CXXFLAGS="-std=c++0x"
CPPFLAGS="-std=c++0x"

AC_PROG_CXX
AC_LANG(C++)

dnl
dnl Check for unordered map headers and whether tr1 namespace is
dnl required. This is copied from m4/acinclude.m4 from core Octave
dnl
AC_DEFUN([OCTAVE_UNORDERED_MAP_HEADERS], [
  AC_CHECK_HEADERS([unordered_map], [],
    [AC_CHECK_HEADERS([tr1/unordered_map])])
  AC_CACHE_CHECK([whether unordered_map requires tr1 namespace], 
    [octave_cv_header_require_tr1_namespace],
    [AC_LANG_PUSH(C++)
    octave_cv_header_require_tr1_namespace=no
    if test $ac_cv_header_unordered_map = yes; then
      ## Have <unordered_map>, but still have to check whether
      ## tr1 namespace is required (like MSVC, for instance).
      AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM([[
          #include <unordered_map>
          ]], [[
          std::unordered_map<int,int> m;
        ]])],
        octave_cv_header_require_tr1_namespace=no, 
        octave_cv_header_require_tr1_namespace=yes)
    elif test $ac_cv_header_tr1_unordered_map = yes; then
      octave_cv_header_require_tr1_namespace=yes
    fi
    AC_LANG_POP(C++)
  ])
  if test $octave_cv_header_require_tr1_namespace = yes; then
    AC_DEFINE(USE_UNORDERED_MAP_WITH_TR1, 1, 
      [Define to 1 if unordered_map requires the use of tr1 namespace.])
  fi
])

OCTAVE_UNORDERED_MAP_HEADERS

AC_OUTPUT