psblas2-dev

Make.inc.in
 Makefile.am
 Makefile
 configure.ac

Merged configure fixes.

Make.inc.in

@@ -43,6 +43,11 @@ RANLIB=@RANLIB@
 CFLAGS=@CFLAGS@
 FFLAGS=@FFLAGS@
 
+INSTALL=@INSTALL@
+INSTALL_DATA=@INSTALL_DATA@
+INSTALL_DIR=@INSTALL_DIR@
+INSTALL_LIBDIR=@INSTALL_LIBDIR@
+INSTALL_INCLUDEDIR=@INSTALL_INCLUDEDIR@
 
 LIBDIR=@LIBDIR@
 BASELIBNAME=@BASELIBNAME@

Makefile

@@ -1,5 +1,7 @@
 include Make.inc
 
+all: library 
+
 library:
 	(if test ! -d lib ; then mkdir lib; fi)
 	(cd base; make lib)
@@ -9,6 +11,11 @@ library:
 	@echo "====================================="
 	@echo "PSBLAS libraries Compilation Successful."
 
+install:
+	($(INSTALL) -d $(INSTALL_DIR)/lib &&\
+	   $(INSTALL_DATA) lib/*.a  $(INSTALL_DIR)/lib)
+	($(INSTALL) -d $(INSTALL_DIR)/include && \
+	   $(INSTALL_DATA) lib/*$(.mod) $(INSTALL_DIR)/include)
 clean: 
 	(cd base; make clean)
 	(cd prec; make clean )

Makefile.am

@@ -1,5 +1,7 @@
 include Make.inc
 
+all: library 
+
 library:
 	(cd base; make lib)
 	(cd prec; make lib )
@@ -8,6 +10,12 @@ library:
 	@echo "====================================="
 	@echo "PSBLAS libraries Compilation Successful."
 
+
+install: 
+	($(INSTALL) -d $(INSTALL_DIR)/lib &&\
+	   $(INSTALL_DATA) lib/*.a  $(INSTALL_DIR)/lib)
+	($(INSTALL) -d $(INSTALL_DIR)/include && \
+	   $(INSTALL_DATA) lib/*$(.mod) $(INSTALL_DIR)/include)
 clean: 
 	(cd base; make clean)
 	(cd prec; make clean )

configure.ac

@@ -64,12 +64,32 @@ AC_MSG_NOTICE([
         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.
 --------------------------------------------------------------------------------
 		])
 ###############################################################################
 # Compilers detection: FC,F77,CC should be set, if found.
 ###############################################################################
+#
+# Installation. 
+#
+#
+AC_PROG_INSTALL
+
+AC_MSG_CHECKING([where to install])
+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
+AC_MSG_RESULT([$INSTALL_DIR $INSTALL_INCLUDEDIR $INSTALL_LIBDIR])
 
 # Note that the following line won't save from troubles.
 # AC_PROG_FC([mpxlf95 mpxlf90 mpxlf pgf95 pgf90 mpif95 mpif90 gfortran f95 f90 ifc])
@@ -189,12 +209,12 @@ PAC_CHECK_HAVE_GFORTRAN(
 # Test for TR 15581, aka allocatables extensions.
 #
 PAC_FORTRAN_TEST_TR15581( 
-	[],
-        [AC_MSG_ERROR([Sorry, cannot build PSBLAS without support for TR15581. 
+	[AC_MSG_RESULT([yes.])],
+        [AC_MSG_ERROR([no.
+ Sorry, cannot build PSBLAS without support for TR15581. 
  Please get a Fortran compiler that supports it, e.g. GNU Fortran 4.2.])]
 )
 
-
 if test x"$psblas_cv_fc" == "x" ; then
  if eval "$MPIFC -qversion | grep XL 2>/dev/null" ; then
 	psblas_cv_fc="xlf"
@@ -615,6 +635,12 @@ AC_SUBST(RANLIB)
 AC_SUBST(MPIFC)
 AC_SUBST(MPIFCC)
 
+AC_SUBST(INSTALL)
+AC_SUBST(INSTALL_DATA)
+AC_SUBST(INSTALL_DIR)
+AC_SUBST(INSTALL_LIBDIR)
+AC_SUBST(INSTALL_INCLUDEDIR)
+
 AC_SUBST(BLAS_LIBS)
 AC_SUBST(BLACS_LIBS)
 AC_SUBST(METIS_LIBS)