[svn-r11637] Purpose:

Bug fix

Description:
Absoft needs to be built with --disable-shared only on Macintosh.

Solution:
Moved check for --disable-shared from fortran/configure.in to
config/powerpc-apple.

Platforms tested:
mir, heping, pommier

3 files changed, 11 insertions, 18 deletions

diff --git a/fortran/config/powerpc-apple b/fortran/config/powerpc-apple
index 8f6c0f6..2124a6e 100644
--- a/fortran/config/powerpc-apple
+++ b/fortran/config/powerpc-apple
@@ -34,7 +34,6 @@ if test "X-" = "X-$F9X"; then
     F9X_BASENAME=xlf
   else
     F9X_BASENAME=f95
-    
 fi
 
 #
@@ -83,3 +82,14 @@ case $F9X_BASENAME in
         ;;
 
 esac
+
+# ----------------------------------------------------------------------
+# Absoft compiler must be used with --disable-shared.
+# 
+if test "X$F9X_BASENAME" = "Xf95"; then
+  if test "X$enable_shared" != "Xno"; then
+    echo "error: --disable-shared must be used when building with Absoft Fortran compiler"
+    exit 1
+  fi
+fi
+    
diff --git a/fortran/configure b/fortran/configure
index 37c89c0..a795a11 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -9623,14 +9623,6 @@ _ACEOF
 
 fi
 
-if test "X$F9X_BASENAME" = "Xf95"; then
-  if test "X$enable_shared" != "Xno"; then
-    { { echo "$as_me:$LINENO: error: must use --disable-shared when building with Absoft Fortran compiler" >&5
-echo "$as_me: error: must use --disable-shared when building with Absoft Fortran compiler" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
 echo "$as_me:$LINENO: checking for Stream Virtual File Driver support" >&5
 echo $ECHO_N "checking for Stream Virtual File Driver support... $ECHO_C" >&6
 # Check whether --enable-stream-vfd or --disable-stream-vfd was given.
diff --git a/fortran/configure.in b/fortran/configure.in
index f9c3f1f..d57722c 100644
--- a/fortran/configure.in
+++ b/fortran/configure.in
@@ -596,15 +596,6 @@ if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
 fi
 
 dnl ----------------------------------------------------------------------
-dnl Absoft compiler must be used with --disable-shared.
-dnl
-if test "X$F9X_BASENAME" = "Xf95"; then
-  if test "X$enable_shared" != "Xno"; then
-    AC_MSG_ERROR([must use --disable-shared when building with Absoft Fortran compiler])
-  fi
-fi
-
-dnl ----------------------------------------------------------------------
 dnl Should the Stream Virtual File Driver be compiled in ?
 dnl
 AC_MSG_CHECKING([for Stream Virtual File Driver support])