From ce4ff0aacfffa91ac92687d41da648071a1416c8 Mon Sep 17 00:00:00 2001 From: wolf Date: Mon, 13 Mar 2000 14:25:06 +0000 Subject: [PATCH] Revert patch for IRIX, since I have found the problem at another place. git-svn-id: https://svn.dealii.org/trunk@2579 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/configure | 9 +++++---- deal.II/configure.in | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/deal.II/configure b/deal.II/configure index 7e6467c5a2..46eeb1a203 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1079,12 +1079,13 @@ fi + # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" enableshared=$enableval else - if test $OS = AIX -o $OS = IRIX64 ; then + if test $OS = AIX ; then enableshared=no ; else enableshared=yes ; @@ -1131,7 +1132,7 @@ else fi echo $ac_n "checking for kdoc""... $ac_c" 1>&6 -echo "configure:1135: checking for kdoc" >&5 +echo "configure:1136: checking for kdoc" >&5 if test -r $kdocdir/kdoc ; then echo "$ac_t""found" 1>&6 else @@ -1160,7 +1161,7 @@ if test "$docxx" = to-be-determined ; then # Extract the first word of ""doc++"", so it can be a program name with args. set dummy "doc++"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1164: checking for $ac_word" >&5 +echo "configure:1165: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_docxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1194,7 +1195,7 @@ fi else echo $ac_n "checking for doc++""... $ac_c" 1>&6 -echo "configure:1198: checking for doc++" >&5 +echo "configure:1199: checking for doc++" >&5 if test -x "$docxx" ; then echo "$ac_t""yes" 1>&6 else diff --git a/deal.II/configure.in b/deal.II/configure.in index 7019336a54..5a39ddba3b 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -110,12 +110,13 @@ fi AC_SUBST(withmultithreading) + dnl Test whether shared libraries support is requested. Note: -dnl default is 'yes', if not on AIX or IRIX64 +dnl default is 'yes', if not on AIX AC_ARG_ENABLE(shared, [ --enable-shared Set compiler flags to generate shared libraries], enableshared=$enableval, - if test $OS = AIX -o $OS = IRIX64 ; then + if test $OS = AIX ; then enableshared=no ; else enableshared=yes ; -- 2.39.5