From 0b6cf0d9c9620de4101f7fb32df9b65fc9d95ab8 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 10 Mar 2008 13:29:16 +0000 Subject: [PATCH] psblas2-dev autogen.sh configure configure.ac Fixed stderr from ifort -qversion polluting screen logs. --- autogen.sh | 26 +++++ configure | 292 +++++++++++++++++++++++++++++---------------------- configure.ac | 6 +- 3 files changed, 194 insertions(+), 130 deletions(-) create mode 100644 autogen.sh diff --git a/autogen.sh b/autogen.sh new file mode 100644 index 00000000..81beee06 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# $Id$ + +# This file is still not complete. + +# this should create configure from configure.ac.. + +#touch NEWS AUTHORS ChangeLog COPYING INSTALL missing install-sh + +#libtoolize + +aclocal -I config || { echo "no aclocal ?" ; exit 1 ; } + +# we produce a configure script +autoconf || { echo "no autoconf ?" ; exit 1 ; } + +# we produce a brand new Makefile +#automake -i --add-missing || { echo "no automake ?" ; exit 1 ; } +#automake -i || { echo "no automake ?" ; exit 1 ; } + +# The automake required for autogen.sh'in this package is 1.10#. +# So users who want to build from the svn repository are required to use this version. +# +# Users building from the tarball shouldn't bother, of course, +# because they get the configure script generated from the tarball maintainer. + diff --git a/configure b/configure index 75622aa2..b25cd0b4 100755 --- a/configure +++ b/configure @@ -652,6 +652,9 @@ LIBS build_alias host_alias target_alias +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA FC FCFLAGS LDFLAGS @@ -670,9 +673,6 @@ MPILIBS MPIF77 MPIFC RANLIB -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA am__isrc CYGPATH_W PACKAGE @@ -723,6 +723,10 @@ FLINK F90LINK AR MPIFCC +INSTALL +INSTALL_DIR +INSTALL_LIBDIR +INSTALL_INCLUDEDIR BLACS_LIBS METIS_LIBS CINCLUDES @@ -1829,7 +1833,7 @@ psblas_cv_version="`cat VERSION`" FC=mpif90 F77=$FC CC=mpicc ./configure <- will force FC,CC,F77 FLINK=gcc FLINK=gcc ./configure <- will force FLINK,F90LINK - See /configure --help=short fore more info. + See ./configure --help=short fore more info. -------------------------------------------------------------------------------- " >&5 echo "$as_me: @@ -1846,12 +1850,144 @@ echo "$as_me: FC=mpif90 F77=$FC CC=mpicc ./configure <- will force FC,CC,F77 FLINK=gcc FLINK=gcc ./configure <- will force FLINK,F90LINK - See /configure --help=short fore more info. + See ./configure --help=short fore more info. -------------------------------------------------------------------------------- " >&6;} ############################################################################### # Compilers detection: FC,F77,CC should be set, if found. ############################################################################### +# +# Installation. +# +# +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { (exit 1); exit 1; }; } +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + done + done + ;; +esac +done +IFS=$as_save_IFS + + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + +{ echo "$as_me:$LINENO: checking where to install" >&5 +echo $ECHO_N "checking where to install... $ECHO_C" >&6; } +case $prefix in + \/* ) eval "INSTALL_DIR=$prefix";; + * ) eval "INSTALL_DIR=/usr/local/psblas";; +esac +case $libdir in + \/* ) eval "INSTALL_LIBDIR=$libdir";; + * ) eval "INSTALL_LIBDIR=$INSTALL_DIR/lib";; +esac +case $includedir in + \/* ) eval "INSTALL_INCLUDEDIR=$includedir";; + * ) eval "INSTALL_INCLUDEDIR=$INSTALL_DIR/include";; +esac +{ echo "$as_me:$LINENO: result: $INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR" >&5 +echo "${ECHO_T}$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR" >&6; } # Note that the following line won't save from troubles. # AC_PROG_FC([mpxlf95 mpxlf90 mpxlf pgf95 pgf90 mpif95 mpif90 gfortran f95 f90 ifc]) @@ -4609,117 +4745,6 @@ fi am__api_version='1.10' -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done -IFS=$as_save_IFS - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - { echo "$as_me:$LINENO: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } # Just in case @@ -5371,16 +5396,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (exit $ac_status); } && test -s conftest${ac_exeext}; then { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - : + + { echo "$as_me:$LINENO: result: yes." >&5 +echo "${ECHO_T}yes." >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - { { echo "$as_me:$LINENO: error: Sorry, cannot build PSBLAS without support for TR15581. + { { echo "$as_me:$LINENO: error: no. + Sorry, cannot build PSBLAS without support for TR15581. Please get a Fortran compiler that supports it, e.g. GNU Fortran 4.2." >&5 -echo "$as_me: error: Sorry, cannot build PSBLAS without support for TR15581. +echo "$as_me: error: no. + Sorry, cannot build PSBLAS without support for TR15581. Please get a Fortran compiler that supports it, e.g. GNU Fortran 4.2." >&2;} { (exit 1); exit 1; }; } @@ -5388,9 +5417,8 @@ fi cd .. rm -fr tmpdir_$i - if test x"$psblas_cv_fc" == "x" ; then - if eval "$MPIFC -qversion | grep XL 2>/dev/null" ; then + if eval "$MPIFC -qversion 2>&1 | grep XL 2>/dev/null" ; then psblas_cv_fc="xlf" # Some configurations of the XLF want "-WF," prepended to -D.. flags. # TODO : discover the exact conditions when the usage of -WF is needed. @@ -5400,11 +5428,11 @@ if test x"$psblas_cv_fc" == "x" ; then # More problems could be undocumented yet. else # Sun compiler detection - if eval "$MPIFC -V | grep Sun 2>/dev/null" ; then + if eval "$MPIFC -V 2>&1 | grep Sun 2>/dev/null" ; then psblas_cv_fc="sun" else # Portland group compiler detection - if eval "$MPIFC -V | grep Portland 2>/dev/null" ; then + if eval "$MPIFC -V 2>&1 | grep Portland 2>/dev/null" ; then psblas_cv_fc="pg" else # Intel compiler identification @@ -10238,6 +10266,12 @@ UTILLIBNAME=libpsb_util.a + + + + + + @@ -11003,6 +11037,9 @@ LIBS!$LIBS$ac_delim build_alias!$build_alias$ac_delim host_alias!$host_alias$ac_delim target_alias!$target_alias$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim FC!$FC$ac_delim FCFLAGS!$FCFLAGS$ac_delim LDFLAGS!$LDFLAGS$ac_delim @@ -11021,9 +11058,6 @@ MPILIBS!$MPILIBS$ac_delim MPIF77!$MPIF77$ac_delim MPIFC!$MPIFC$ac_delim RANLIB!$RANLIB$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim am__isrc!$am__isrc$ac_delim CYGPATH_W!$CYGPATH_W$ac_delim PACKAGE!$PACKAGE$ac_delim @@ -11115,6 +11149,10 @@ FLINK!$FLINK$ac_delim F90LINK!$F90LINK$ac_delim AR!$AR$ac_delim MPIFCC!$MPIFCC$ac_delim +INSTALL!$INSTALL$ac_delim +INSTALL_DIR!$INSTALL_DIR$ac_delim +INSTALL_LIBDIR!$INSTALL_LIBDIR$ac_delim +INSTALL_INCLUDEDIR!$INSTALL_INCLUDEDIR$ac_delim BLACS_LIBS!$BLACS_LIBS$ac_delim METIS_LIBS!$METIS_LIBS$ac_delim CINCLUDES!$CINCLUDES$ac_delim @@ -11128,7 +11166,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 22; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 26; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 30a854d2..d75aa13d 100755 --- a/configure.ac +++ b/configure.ac @@ -216,7 +216,7 @@ PAC_FORTRAN_TEST_TR15581( ) if test x"$psblas_cv_fc" == "x" ; then - if eval "$MPIFC -qversion | grep XL 2>/dev/null" ; then + if eval "$MPIFC -qversion 2>&1 | grep XL 2>/dev/null" ; then psblas_cv_fc="xlf" # Some configurations of the XLF want "-WF," prepended to -D.. flags. # TODO : discover the exact conditions when the usage of -WF is needed. @@ -226,11 +226,11 @@ if test x"$psblas_cv_fc" == "x" ; then # More problems could be undocumented yet. else # Sun compiler detection - if eval "$MPIFC -V | grep Sun 2>/dev/null" ; then + if eval "$MPIFC -V 2>&1 | grep Sun 2>/dev/null" ; then psblas_cv_fc="sun" else # Portland group compiler detection - if eval "$MPIFC -V | grep Portland 2>/dev/null" ; then + if eval "$MPIFC -V 2>&1 | grep Portland 2>/dev/null" ; then psblas_cv_fc="pg" else # Intel compiler identification