*** configure	2002/12/16 00:09:48	1.1
--- configure	2002/12/19 18:08:24
***************
*** 1,6 ****
  #! /bin/sh
  
! # $Id: configure,v 1.1 2002/12/16 00:09:48 BernsteH Exp $
  
  # This builds a configuration for CCP4 installation based on the value
  # of an argument which is meant to describe a supported system.  On
--- 1,11 ----
  #! /bin/sh
  
! # configure script revised for sunos_gcc, Solaris 2.5.2 (SunOS 5.5.1)
! # with gcc instead of standard sun compilers
! # Herbert J. Bernstein, ARCiB Project, Dowling College, yaya@dowling.edu
! # Rev 19 Dec 02
! #
! # $Id: configure,v 1.2 2002/12/16 15:27:51 BernsteH Exp BernsteH $
  
  # This builds a configuration for CCP4 installation based on the value
  # of an argument which is meant to describe a supported system.  On
***************
*** 163,169 ****
         [--disable-lapack] [--with-netlib-lapack] [--with-warnings] 
         [--disable-mapslicer] [--non_shared] SYSTEM";
    echo "where SYSTEM is one of:";
!   echo "  irix irix64 convex sunos stardent titan aix hpux concentrix";
    echo "  ultrix esv osf1 linux freebsd linux_compaq_compilers generic";
    echo "  Darwin";
    echo "Use uname -a to determine system type if you are unsure which to use.";
--- 168,174 ----
         [--disable-lapack] [--with-netlib-lapack] [--with-warnings] 
         [--disable-mapslicer] [--non_shared] SYSTEM";
    echo "where SYSTEM is one of:";
!   echo "  irix irix64 convex sunos sunos_gcc stardent titan aix hpux concentrix";
    echo "  ultrix esv osf1 linux freebsd linux_compaq_compilers generic";
    echo "  Darwin";
    echo "Use uname -a to determine system type if you are unsure which to use.";
***************
*** 311,317 ****
  
  case $system in
    convex | concentrix | hpux | irix | irix64 | aix | stardent | sunos | \
!     titan | ultrix | esv | osf1 | linux | freebsd | gnu_win32 | \
      linux_compaq_compilers | generic | Darwin)
      echo "OK, setting up for a system type of \`$system'..."
      echo    ;;
--- 316,322 ----
  
  case $system in
    convex | concentrix | hpux | irix | irix64 | aix | stardent | sunos | \
!     sunos_gcc | titan | ultrix | esv | osf1 | linux | freebsd | gnu_win32 | \
      linux_compaq_compilers | generic | Darwin)
      echo "OK, setting up for a system type of \`$system'..."
      echo    ;;
***************
*** 322,328 ****
      echo "you'll have to modify \`configure' and the library files mentioned"
      echo "in the installation guide.  Please let ccp4@dl.ac.uk know of any"
      echo "changes you have to make:"
!     echo "  irix irix64 convex sunos stardent titan aix hpux concentrix"
      echo "  ultrix esv osf1 linux linux_compaq_compilers freebsd generic"
      echo "  Darwin"
      exit 1    ;;
--- 327,333 ----
      echo "you'll have to modify \`configure' and the library files mentioned"
      echo "in the installation guide.  Please let ccp4@dl.ac.uk know of any"
      echo "changes you have to make:"
!     echo "  irix irix64 convex sunos sunos_gcc stardent titan aix hpux concentrix"
      echo "  ultrix esv osf1 linux linux_compaq_compilers freebsd generic"
      echo "  Darwin"
      exit 1    ;;
***************
*** 1140,1145 ****
--- 1145,1195 ----
          # problems removed)
    SETFLAGS=${SETFLAGS:-"amore_FLAGS='$XCFLAGS\ $LDFLAGS\ -O1'"}
    ;;
+ sunos_gcc)
+   case `uname -sr` in
+     SunOS*)
+ 
+        ;;
+     *)
+        echo "! This doesn't appear to be a SunOs system. You should run"
+        echo "! configure on a machine of the correct type."
+        exit 1 ;;
+   esac
+   test "$with_f2c" && M4=${M4:-"m4 -D_f2c=1"}
+   test "$with_f2c" && XCFLAGS=${XCFLAGS:-"-DPROTOTYPE -D__EXTENSIONS__"}
+   test ! "$with_f2c" && M4=${M4:-"m4 -D_g77=1"}
+   test ! "$with_f2c" && XCFLAGS=${XCFLAGS:-"-DG77 -DPROTOTYPE -D__EXTENSIONS__ -DHAVE_G2C_H"}
+   FC=${FC:-g77}
+   CC=${CC:-gcc}
+   XFFLAGS=${XFFLAGS:-"-fno-second-underscore -fno-globals"}
+ # Test to see if warnings should not be suppressed
+   if test ! "$warnings" = yes; then
+       XFFLAGS="-w $XFFLAGS"
+       XCFLAGS="-w $XCFLAGS"
+   fi
+   FOPTIM=${FOPTIM:-"-O"}
+   COPTIM=${COPTIM:-"-O"}
+   INSTALL_PROGRAM=${INSTALL_PROGRAM:-"/usr/ucb/install -c"}
+   INSTALL_DATA=${INSTALL_DATA:-"/usr/ucb/install -m 644 -c"}
+   XTYPE=${XTYPE:-"SUNOS_GCC"}
+   SETFLAGS=${SETFLAGS:-"sftools_FLAGS='$XFFLAGS $FOPTIM' \
+                       refmac_FLAGS='$XFFLAGS -O0' \
+                       arp_waters_FLAGS='$XFFLAGS $FOPTIM -fforce-mem'"}
+   XDL_LIB=${XDL_LIB:-"-L${CCP4_LIB} -lxdl_view"}
+   XWIN_LIB=${XWIN_LIB:-"-L/usr/openwin/lib -lXt -lX11"}
+   if test "$shared_lib" = yes; then
+     SHARE_LIB=${SHARE_LIB:-'ld -shared -soname libccp4.so --whole-archive -o libccp4.so libccp4.a'}
+     SHARE_INST='$(INSTALL_DATA) `pwd`/libccp4.so $(libdir)/libccp4.so'
+     XLDFLAGS=${XLDFLAGS:-"-Wl,-rpath,$CLIB"}
+   fi
+   # Set Mapslicer command library flags
+   # For g77 Fortran run-time library is gc2
+   MAPSLICER_LIBS=${MAPSLICER_LIBS:-"-lg2c -ldl"}
+   # Cannot figure out the options for building shared at the moment so
+   # don't bother
+   ##MAPSLICER_SHARE=${MAPSLICER_SHARE:-"ld -shared -soname libccp4map.so --whole-archive -o libccp4map.so libccp4map.a"}
+   MAPSLICER_SHARE=${MAPSLICER_SHARE:-""}
+   ;;
  hpux)
    if test -n "$with_x"; then
      echo "! Xwindows installation has not been tested    !"