From: bangerth Date: Fri, 26 Jan 2007 04:10:34 +0000 (+0000) Subject: Fix the order of branches in a test for sunCC. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a716b318d1fe417f95af3962901f6eafac944bda;p=dealii-svn.git Fix the order of branches in a test for sunCC. git-svn-id: https://svn.dealii.org/trunk@14376 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 30f247c933..cd16f80f13 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -710,18 +710,17 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl AC_MSG_CHECKING(whether -library=stlport4 works) AC_TRY_COMPILE( [ -# include ], [ - std::cout << std::endl; - ], - [ - AC_MSG_RESULT(no) + ; ], [ AC_MSG_RESULT(yes) CXXFLAGSG="$CXXFLAGSG -library=stlport4" CXXFLAGSO="$CXXFLAGSO -library=stlport4" + ], + [ + AC_MSG_RESULT(no) ]) ;; diff --git a/deal.II/configure b/deal.II/configure index 8b868cbc02..8b04ea886a 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -3586,13 +3586,12 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -# include int main () { - std::cout << std::endl; + ; ; return 0; @@ -3621,18 +3620,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + CXXFLAGSG="$CXXFLAGSG -library=stlport4" + CXXFLAGSO="$CXXFLAGSO -library=stlport4" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - CXXFLAGSG="$CXXFLAGSG -library=stlport4" - CXXFLAGSO="$CXXFLAGSO -library=stlport4" + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext