always accpet --enable-clpbn-bp

This commit is contained in:
Vitor Santos Costa 2012-11-26 16:20:36 +00:00
parent 095cd68cac
commit 46cec46fa8
2 changed files with 19 additions and 15 deletions

16
configure vendored
View File

@ -5059,17 +5059,18 @@ else
INSTALL_MATLAB="" INSTALL_MATLAB=""
fi fi
ac_ext=cpp if test "$yap_cv_clpbn_bp"="yes"; then
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS' ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
my_save_cxxflags="$CXXFLAGS" my_save_cxxflags="$CXXFLAGS"
CXXFLAGS=-std=c++0x CXXFLAGS=-std=c++0x
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CXX supports -std-c++0x" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CXX supports -std-c++0x" >&5
$as_echo_n "checking whether CXX supports -std-c++0x... " >&6; } $as_echo_n "checking whether CXX supports -std-c++0x... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
int int
@ -5090,13 +5091,14 @@ $as_echo "no" >&6; }
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CXXFLAGS="$my_save_cxxflags" CXXFLAGS="$my_save_cxxflags"
ac_ext=c ac_ext=c
ac_cpp='$CPP $CPPFLAGS' ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
if test "$yap_cv_clpbn_bp" = no if test "$yap_cv_clpbn_bp" = no
then then

View File

@ -516,17 +516,19 @@ else
INSTALL_MATLAB="" INSTALL_MATLAB=""
fi fi
AC_LANG_PUSH([C++]) if test "$yap_cv_clpbn_bp"="yes"; then
my_save_cxxflags="$CXXFLAGS" AC_LANG_PUSH([C++])
CXXFLAGS=-std=c++0x my_save_cxxflags="$CXXFLAGS"
AC_MSG_CHECKING([whether CXX supports -std-c++0x]) CXXFLAGS=-std=c++0x
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], AC_MSG_CHECKING([whether CXX supports -std-c++0x])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
[AC_MSG_RESULT([yes])] [AC_MSG_RESULT([yes])]
[yap_cv_clpbn_bp=yes], [yap_cv_clpbn_bp=yes],
[AC_MSG_RESULT([no])] [AC_MSG_RESULT([no])]
) )
CXXFLAGS="$my_save_cxxflags" CXXFLAGS="$my_save_cxxflags"
AC_LANG_POP() AC_LANG_POP()
fi
if test "$yap_cv_clpbn_bp" = no if test "$yap_cv_clpbn_bp" = no
then then