--- gpiv-0.6.1.orig/debian/gpiv-mpi.menu +++ gpiv-0.6.1/debian/gpiv-mpi.menu @@ -0,0 +1,7 @@ +?package(gpiv-mpi): \ + needs="X11" \ + section="Applications/Science/Physics" \ + title="Gpiv" \ + longtitle="Image analyzing tool for Particle Image Velocimetry" \ + command="/usr/bin/gpiv" \ + icon="/usr/share/pixmaps/gpiv_logo.xpm" --- gpiv-0.6.1.orig/debian/gpiv.menu +++ gpiv-0.6.1/debian/gpiv.menu @@ -0,0 +1,7 @@ +?package(gpiv): \ + needs="X11" \ + section="Applications/Science/Physics" \ + title="Gpiv" \ + longtitle="Image analyzing tool for Particle Image Velocimetry" \ + command="/usr/bin/gpiv" \ + icon="/usr/share/pixmaps/gpiv_logo.xpm" --- gpiv-0.6.1.orig/debian/gpiv-mpi.README.Debian +++ gpiv-0.6.1/debian/gpiv-mpi.README.Debian @@ -0,0 +1,25 @@ +This is the gpiv ptogram with MPI enabled. It uses gpiv_rr from the +gpivtools-mpi packages for image interrogation. Hence, the progress +in the progress bar is not working, but the interrogation processing +can be monitored when gpiv is launched from the command line. + +The Data Acquisition (DAC) feature, i.e. the triggering of light +sources (mostly Nd-YAGG lasers) with a camara and the recording of the +images has been disabled in the debian package for several reasons: + +- The upstream package gpivtrig containing the triggering module has +not been debianized (yet). + +- The gpivtrig package uses the rtai package which has to be build +in combination with a patched (linux) kernel and installed manually. + + +In order to include this feature do the following: + +- install a (Linux) source package and rtai-source, unpack them, patch +the kernel and build the kernel, together with the rtai and gpivtrig +(from upstream source) modules. + +- download the source of this package (for example with apt-get +source package-name). Add the line --enable-trig in debian/rules, build and +install this package. --- gpiv-0.6.1.orig/debian/gpiv-mpi.lintian-overrides +++ gpiv-0.6.1/debian/gpiv-mpi.lintian-overrides @@ -0,0 +1 @@ +gpiv-mpi binary: arch-dep-package-has-big-usr-share --- gpiv-0.6.1.orig/debian/gpiv.install +++ gpiv-0.6.1/debian/gpiv.install @@ -0,0 +1 @@ +/usr --- gpiv-0.6.1.orig/debian/copyright +++ gpiv-0.6.1/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by Gerber van der Graaf on +Wed, 5 Nov 2008 11:00:00 +0100. + +It was downloaded from + +Copyright Holder: Gerber van der Graaf + +Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Gerber van der Graaf + +License: + + Gpiv is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. + +On Debian systems, the complete text of the GNU General Public License +can be found in /usr/share/common-licenses/GPL file. --- gpiv-0.6.1.orig/debian/gpiv-mpi.doc-base +++ gpiv-0.6.1/debian/gpiv-mpi.doc-base @@ -0,0 +1,9 @@ +Document: gpiv +Title: Gpiv Manual +Author: Gerber van der Graaf +Abstract: This manual describes how Gpiv can be used. +Section: Help + +Format: html +Index: /usr/share/gnome/help/gpiv/C/index.html +Files: /usr/share/gnome/help/gpiv/C/*.html --- gpiv-0.6.1.orig/debian/gpiv.dirs +++ gpiv-0.6.1/debian/gpiv.dirs @@ -0,0 +1 @@ +usr/share/lintian/overrides \ No newline at end of file --- gpiv-0.6.1.orig/debian/changelog +++ gpiv-0.6.1/debian/changelog @@ -0,0 +1,57 @@ +gpiv (0.6.1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * 02-link-libm.dpatch - Link in libm. (Closes: #713539). + + -- Barry deFreese Wed, 10 Jul 2013 12:59:24 -0400 + +gpiv (0.6.1-2) unstable; urgency=low + + * Repaired mpi.h dependency. Closes: #529994 + + -- Gerber van der Graaf Tue, 26 May 2009 01:05:00 +0100 + +gpiv (0.6.1-1) unstable; urgency=low + + * New upstream release + * Added gpiv-mpi + * Repaired loading image. Closes: #523010 + + + + -- Gerber van der Graaf Mon, 18 May 2009 12:25:00 +0100 + +gpiv (0.5.2-3) unstable; urgency=low + + * Improved from 2nd comments provided by Vincent Bernat: + * Added debian/lintian-overrides and debian/patches/01_manpage.dpatch + + -- Gerber van der Graaf Mon, 9 June 2008 14:14:00 +0100 + +gpiv (0.5.2-2) unstable; urgency=low + + * Improved from comments provided by Vincent Bernat + * Repaired debian/watch. Closes: #450061 + * Update to the new menu structure. Closes: #482935 + + -- Gerber van der Graaf Fri, 6 June 2008 12:50:00 +0100 + +gpiv (0.5.2-1) unstable; urgency=low + + * New upstream release + + -- Gerber van der Graaf Wed, 9 April 2008 12:08:26 +0100 + +gpiv (0.3.1-2) unstable; urgency=low + + * Build-Depends libgnutls11-dev, which is obsolete and useless. Removed + libgnutls11-dev dependancy in control. Closes: #370422 + * Updated to Standards-Version: 3.7.2 + + -- Gerber van der Graaf Mon, 5 Jun 2006 13:03:04 +0200 + +gpiv (0.3.1-1) unstable; urgency=low + + * Initial Release. Closes: #354155 + + -- Gerber van der Graaf Sunday, 12 March 2006 13:47:00 +0200 --- gpiv-0.6.1.orig/debian/gpiv.README.Debian +++ gpiv-0.6.1/debian/gpiv.README.Debian @@ -0,0 +1,20 @@ +The Data Acquisition (DAC) feature, i.e. the triggering of light +sources (mostly Nd-YAGG lasers) with a camara and the recording of the +images has been disabled in the debian package for several reasons: + +- The upstream package gpivtrig containing the triggering module has +not been debianized (yet). + +- The gpivtrig package uses the rtai package which has to be build +in combination with a patched (linux) kernel and installed manually. + + +In order to include this feature do the following: + +- install a (Linux) source package and rtai-source, unpack them, patch +the kernel and build the kernel, together with the rtai and gpivtrig +(from upstream source) modules. + +- download the source of this package (for example with apt-get +source package-name). Add the line --enable-trig in debian/rules, build and +install this package. --- gpiv-0.6.1.orig/debian/compat +++ gpiv-0.6.1/debian/compat @@ -0,0 +1 @@ +5 --- gpiv-0.6.1.orig/debian/watch +++ gpiv-0.6.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/gpiv/gpiv-(.*)\.tar\.gz debian uupdate --- gpiv-0.6.1.orig/debian/rules +++ gpiv-0.6.1/debian/rules @@ -0,0 +1,144 @@ +#!/usr/bin/make -f +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +include /usr/share/dpatch/dpatch.make + +CONFIGURE_OPTIONS= --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info + +config-serial.status: patch-stamp + dh_testdir +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + # Add here commands to configure the package. + -mkdir debian/build-serial + cd debian/build-serial && \ + ../../configure $(CONFIGURE_OPTIONS) + + +config-mpi.status: patch-stamp + dh_testdir +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + # Add here commands to configure the package. + -mkdir debian/build-mpi + cd debian/build-mpi && \ + ../../configure $(CONFIGURE_OPTIONS) \ + --enable-mpi + + +build: build-stamp-serial build-stamp-mpi + +build-stamp-serial: config-serial.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) -C debian/build-serial/ + #/usr/bin/docbook-to-man debian/gpiv.sgml > gpiv.1 + + touch $@ + + +build-stamp-mpi: config-mpi.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) -C debian/build-mpi/ + #/usr/bin/docbook-to-man debian/gpiv.sgml > gpiv.1 + + touch $@ + + +clean: unpatch + dh_testdir + dh_testroot + dh_clean build-stamp* install-stamp* + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + -test -r /usr/share/misc/config.sub && \ + rm -f config.sub + -test -r /usr/share/misc/config.guess && \ + rm -f config.guess + -rm -rf debian/build-serial + -rm -rf debian/build-mpi + -rm -rf debian/tmp debian/tmp-mpi + -rm -rf debian/gpiv debian/gpiv-mpi + + dh_clean + + +install: build-stamp-serial build-stamp-mpi +install-serial: install-stamp-serial +install-stamp-serial: build-stamp-serial + dh_testdir + dh_testroot +# dh_clean -k +# dh_installdirs + + # Add here commands to install the package into debian/gpiv. + install -d $(CURDIR)/debian/tmp + $(MAKE) -C $(CURDIR)/debian/build-serial/ install \ + prefix=$(CURDIR)/debian/tmp/usr + #install -m644 debian/lintian-overrides debian/gpiv/usr/share/lintian/overrides/gpiv + dh_install --sourcedir=debian/tmp -pgpiv + dh_lintian + touch $@ + + +install-mpi: install-stamp-mpi +install-stamp-mpi: install-stamp-mpi + dh_testdir + dh_testroot +# dh_clean -k +# dh_installdirs + + # Add here commands to install the package into debian/gpiv-mpi. + install -d $(CURDIR)/debian/tmp-mpi + $(MAKE) -C $(CURDIR)/debian/build-mpi/ install \ + prefix=$(CURDIR)/debian/tmp-mpi/usr + #install -m644 debian/lintian-overrides debian/gpiv/usr/share/lintian/overrides/gpiv-mpi + dh_install --sourcedir=debian/tmp-mpi -pgpiv-mpi + dh_lintian + touch $@ + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install-serial install-mpi + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installmenu + dh_installcron + dh_installman + dh_installinfo + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb -v + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- gpiv-0.6.1.orig/debian/control +++ gpiv-0.6.1/debian/control @@ -0,0 +1,66 @@ +Source: gpiv +Section: science +Priority: optional +Maintainer: Gerber van der Graaf +Homepage: http://gpiv.sourceforge.net/ +Build-Depends: debhelper (>= 6.0.7~), dpatch, autotools-dev, libfftw3-dev, libgsl0-dev, + libhdf5-serial-dev, libglib2.0-dev, zlib1g-dev, libxml2-dev, libgnomevfs2-dev, + libgnome2-dev, libgnomeui-dev, libxml-parser-perl, + intltool, libfontconfig1-dev, libpng-dev, libgpiv3-dev, + mpi-default-dev, mpi-default-bin +Standards-Version: 3.8.1 + +Package: gpiv +Architecture: any +Depends: ${shlibs:Depends} +Replaces: gpiv-mpi +Conflicts: gpiv-mpi +Description: GUI program for Particle Image Velocimetry + Gpiv is a Graphic User Interface program using the GTK/GNOME libraries for + Particle Image Velocimetry (PIV). The program gives a quick overview + of the parameter settings of the processes and allows to change them + easy, running the processes, individually or in a chain, + visualizes and displays the results. The processes that may be + invoked by Gpiv are: + . + Image processing: typical image manipulations that might be needed for PIV + interrogation. + . + Image interrogation, resulting into estimators of particle image + displacements. + . + Data validation to test on outliers, peak-locking effect and + velocity gradients over the interrogation area's. + . + Data post-processing: data manipulation, spatial and time scaling to + obtain a velocity field from the PIV data, calculation of spatial + averages, vorticity and strain. + +Package: gpiv-mpi +Architecture: any +Depends: ${shlibs:Depends}, gpivtools-mpi +Replaces: gpiv +Conflicts: gpiv +Description: GUI program for Particle Image Velocimetry - MPI version + Gpiv is a Graphic User Interface program using the GTK/GNOME libraries for + Particle Image Velocimetry (PIV). The program gives a quick overview + of the parameter settings of the processes and allows to change them + easy, running the processes, individually or in a chain, + visualizes and displays the results. The processes that may be + invoked by Gpiv are: + . + Image processing: typical image manipulations that might be needed for PIV + interrogation. + . + Image interrogation, resulting into estimators of particle image + displacements. + . + Data validation to test on outliers, peak-locking effect and + velocity gradients over the interrogation area's. + . + Data post-processing: data manipulation, spatial and time scaling to + obtain a velocity field from the PIV data, calculation of spatial + averages, vorticity and strain. + . + This is the parallelized version using Message Passing Interface to + be used on a (Beowulf) cluster. --- gpiv-0.6.1.orig/debian/gpiv.doc-base +++ gpiv-0.6.1/debian/gpiv.doc-base @@ -0,0 +1,9 @@ +Document: gpiv +Title: Gpiv Manual +Author: Gerber van der Graaf +Abstract: This manual describes how Gpiv can be used. +Section: Help + +Format: html +Index: /usr/share/gnome/help/gpiv/C/index.html +Files: /usr/share/gnome/help/gpiv/C/*.html --- gpiv-0.6.1.orig/debian/gpiv-mpi.dirs +++ gpiv-0.6.1/debian/gpiv-mpi.dirs @@ -0,0 +1 @@ +usr/share/lintian/overrides \ No newline at end of file --- gpiv-0.6.1.orig/debian/gpiv-mpi.docs +++ gpiv-0.6.1/debian/gpiv-mpi.docs @@ -0,0 +1 @@ +README --- gpiv-0.6.1.orig/debian/gpiv.docs +++ gpiv-0.6.1/debian/gpiv.docs @@ -0,0 +1 @@ +README --- gpiv-0.6.1.orig/debian/gpiv.lintian-overrides +++ gpiv-0.6.1/debian/gpiv.lintian-overrides @@ -0,0 +1 @@ +gpiv binary: arch-dep-package-has-big-usr-share --- gpiv-0.6.1.orig/debian/gpiv-mpi.install +++ gpiv-0.6.1/debian/gpiv-mpi.install @@ -0,0 +1 @@ +/usr --- gpiv-0.6.1.orig/debian/patches/02-link-libm.dpatch +++ gpiv-0.6.1/debian/patches/02-link-libm.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02-link-libm.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gpiv-0.6.1~/src/Makefile.am gpiv-0.6.1/src/Makefile.am +--- gpiv-0.6.1~/src/Makefile.am 2008-10-17 05:04:18.000000000 -0400 ++++ gpiv-0.6.1/src/Makefile.am 2013-07-10 12:59:10.000000000 -0400 +@@ -75,6 +75,6 @@ + + ## $(prefix) \ + +-gpiv_LDADD = $(GPIV_LIBS) ++gpiv_LDADD = $(GPIV_LIBS) -lm + + EXTRA_DIST = Makefile.in +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gpiv-0.6.1~/src/Makefile.in gpiv-0.6.1/src/Makefile.in +--- gpiv-0.6.1~/src/Makefile.in 2013-07-10 12:58:32.000000000 -0400 ++++ gpiv-0.6.1/src/Makefile.in 2013-07-10 12:58:55.000000000 -0400 +@@ -265,7 +265,7 @@ + @ENABLE_MPI@ \ + @CANVAS_AA@ + +-gpiv_LDADD = $(GPIV_LIBS) ++gpiv_LDADD = $(GPIV_LIBS) -lm + EXTRA_DIST = Makefile.in + all: all-am + --- gpiv-0.6.1.orig/debian/patches/01-mpi-header.dpatch +++ gpiv-0.6.1/debian/patches/01-mpi-header.dpatch @@ -0,0 +1,906 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-mpi-header.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Locates mpi.h while configure. No specific path to include/mpi/mpi.h +## DP: seems to be needed. This will also work on different architectures, +## DP: like mips. + + +@DPATCH@ +diff -urNad gpiv-0.6.1~/Makefile.in gpiv-0.6.1/Makefile.in +--- gpiv-0.6.1~/Makefile.in 2009-05-18 12:29:16.000000000 +0200 ++++ gpiv-0.6.1/Makefile.in 2009-05-26 13:11:59.000000000 +0200 +@@ -32,10 +32,11 @@ + subdir = . + DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(top_srcdir)/configure ABOUT-NLS \ +- AUTHORS COPYING ChangeLog INSTALL NEWS acconfig.h config.sub \ +- depcomp install-sh missing mkinstalldirs ++ AUTHORS COPYING ChangeLog INSTALL NEWS acconfig.h depcomp \ ++ install-sh missing mkinstalldirs + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/config/acx_mpi.m4 \ ++ $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +@@ -126,6 +127,8 @@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ ++MPICC = @MPICC@ ++MPILIBS = @MPILIBS@ + MPIRUN = @MPIRUN@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +diff -urNad gpiv-0.6.1~/aclocal.m4 gpiv-0.6.1/aclocal.m4 +--- gpiv-0.6.1~/aclocal.m4 2009-05-18 12:29:14.000000000 +0200 ++++ gpiv-0.6.1/aclocal.m4 2009-05-26 13:11:54.000000000 +0200 +@@ -1744,3 +1744,4 @@ + AC_SUBST([am__untar]) + ]) # _AM_PROG_TAR + ++m4_include([config/acx_mpi.m4]) +diff -urNad gpiv-0.6.1~/autogen.sh gpiv-0.6.1/autogen.sh +--- gpiv-0.6.1~/autogen.sh 2008-10-17 11:04:18.000000000 +0200 ++++ gpiv-0.6.1/autogen.sh 2009-05-26 13:09:41.000000000 +0200 +@@ -6,6 +6,7 @@ + + DIE=0 + ++ACLOCAL_FLAGS="-I config" + if [ -n "$GNOME2_DIR" ]; then + ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS" + LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH" +diff -urNad gpiv-0.6.1~/config/acx_mpi.m4 gpiv-0.6.1/config/acx_mpi.m4 +--- gpiv-0.6.1~/config/acx_mpi.m4 1970-01-01 01:00:00.000000000 +0100 ++++ gpiv-0.6.1/config/acx_mpi.m4 2009-05-26 13:11:27.000000000 +0200 +@@ -0,0 +1,107 @@ ++dnl @synopsis ACX_MPI([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) ++dnl ++dnl @summary figure out how to compile/link code with MPI ++dnl ++dnl This macro tries to find out how to compile programs that use MPI ++dnl (Message Passing Interface), a standard API for parallel process ++dnl communication (see http://www-unix.mcs.anl.gov/mpi/) ++dnl ++dnl On success, it sets the MPICC, MPICXX, or MPIF77 output variable to ++dnl the name of the MPI compiler, depending upon the current language. ++dnl (This may just be $CC/$CXX/$F77, but is more often something like ++dnl mpicc/mpiCC/mpif77.) It also sets MPILIBS to any libraries that are ++dnl needed for linking MPI (e.g. -lmpi, if a special ++dnl MPICC/MPICXX/MPIF77 was not found). ++dnl ++dnl If you want to compile everything with MPI, you should set: ++dnl ++dnl CC="$MPICC" #OR# CXX="$MPICXX" #OR# F77="$MPIF77" ++dnl LIBS="$MPILIBS $LIBS" ++dnl ++dnl NOTE: The above assumes that you will use $CC (or whatever) for ++dnl linking as well as for compiling. (This is the default for automake ++dnl and most Makefiles.) ++dnl ++dnl The user can force a particular library/compiler by setting the ++dnl MPICC/MPICXX/MPIF77 and/or MPILIBS environment variables. ++dnl ++dnl ACTION-IF-FOUND is a list of shell commands to run if an MPI ++dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to ++dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the ++dnl default action will define HAVE_MPI. ++dnl ++dnl @category InstalledPackages ++dnl @author Steven G. Johnson ++dnl @version 2005-09-02 ++dnl @license GPLWithACException ++ ++AC_DEFUN([ACX_MPI], [ ++AC_PREREQ(2.50) dnl for AC_LANG_CASE ++ ++AC_LANG_CASE([C], [ ++ AC_REQUIRE([AC_PROG_CC]) ++ AC_ARG_VAR(MPICC,[MPI C compiler command]) ++ AC_CHECK_PROGS(MPICC, mpicc hcc mpcc mpcc_r mpxlc cmpicc, $CC) ++ acx_mpi_save_CC="$CC" ++ CC="$MPICC" ++ AC_SUBST(MPICC) ++], ++[C++], [ ++ AC_REQUIRE([AC_PROG_CXX]) ++ AC_ARG_VAR(MPICXX,[MPI C++ compiler command]) ++ AC_CHECK_PROGS(MPICXX, mpic++ mpiCC mpicxx mpCC hcp mpxlC mpxlC_r cmpic++, $CXX) ++ acx_mpi_save_CXX="$CXX" ++ CXX="$MPICXX" ++ AC_SUBST(MPICXX) ++], ++[Fortran 77], [ ++ AC_REQUIRE([AC_PROG_F77]) ++ AC_ARG_VAR(MPIF77,[MPI Fortran compiler command]) ++ AC_CHECK_PROGS(MPIF77, mpif77 hf77 mpxlf mpf77 mpif90 mpf90 mpxlf90 mpxlf95 mpxlf_r cmpifc cmpif90c, $F77) ++ acx_mpi_save_F77="$F77" ++ F77="$MPIF77" ++ AC_SUBST(MPIF77) ++]) ++ ++if test x = x"$MPILIBS"; then ++ AC_LANG_CASE([C], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])], ++ [C++], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])], ++ [Fortran 77], [AC_MSG_CHECKING([for MPI_Init]) ++ AC_TRY_LINK([],[ call MPI_Init], [MPILIBS=" " ++ AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])]) ++fi ++if test x = x"$MPILIBS"; then ++ AC_CHECK_LIB(mpi, MPI_Init, [MPILIBS="-lmpi"]) ++fi ++if test x = x"$MPILIBS"; then ++ AC_CHECK_LIB(mpich, MPI_Init, [MPILIBS="-lmpich"]) ++fi ++ ++dnl We have to use AC_TRY_COMPILE and not AC_CHECK_HEADER because the ++dnl latter uses $CPP, not $CC (which may be mpicc). ++AC_LANG_CASE([C], [if test x != x"$MPILIBS"; then ++ AC_MSG_CHECKING([for mpi.h]) ++ AC_TRY_COMPILE([#include ],[],[AC_MSG_RESULT(yes)], [MPILIBS="" ++ AC_MSG_RESULT(no)]) ++fi], ++[C++], [if test x != x"$MPILIBS"; then ++ AC_MSG_CHECKING([for mpi.h]) ++ AC_TRY_COMPILE([#include ],[],[AC_MSG_RESULT(yes)], [MPILIBS="" ++ AC_MSG_RESULT(no)]) ++fi]) ++ ++AC_LANG_CASE([C], [CC="$acx_mpi_save_CC"], ++ [C++], [CXX="$acx_mpi_save_CXX"], ++ [Fortran 77], [F77="$acx_mpi_save_F77"]) ++ ++AC_SUBST(MPILIBS) ++ ++# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: ++if test x = x"$MPILIBS"; then ++ $2 ++ : ++else ++ ifelse([$1],,[AC_DEFINE(HAVE_MPI,1,[Define if you have the MPI library.])],[$1]) ++ : ++fi ++])dnl ACX_MPI +diff -urNad gpiv-0.6.1~/configure gpiv-0.6.1/configure +--- gpiv-0.6.1~/configure 2009-05-18 12:29:16.000000000 +0200 ++++ gpiv-0.6.1/configure 2009-05-26 13:12:01.000000000 +0200 +@@ -652,6 +652,8 @@ + ENABLE_CAM + RR + MPIRUN ++MPILIBS ++MPICC + ENABLE_MPI_RR + ENABLE_MPI + ALL_LINGUAS +@@ -813,7 +815,8 @@ + GPIV_UI_CFLAGS + GPIV_UI_LIBS + GPIV_CFLAGS +-GPIV_LIBS' ++GPIV_LIBS ++MPICC' + + + # Initialize some variables set by options. +@@ -1476,6 +1479,7 @@ + linker flags for GPIV_UI, overriding pkg-config + GPIV_CFLAGS C compiler flags for GPIV, overriding pkg-config + GPIV_LIBS linker flags for GPIV, overriding pkg-config ++ MPICC MPI C compiler command + + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. +@@ -8816,18 +8820,448 @@ + + if test "${ENABLE_MPI}" == '-DENABLE_MPI'; then + +- if test "${ac_cv_header_mpi_mpi_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for mpi/mpi.h" >&5 +-$as_echo_n "checking for mpi/mpi.h... " >&6; } +-if test "${ac_cv_header_mpi_mpi_h+set}" = set; then ++ ++ ++ ++ ++ for ac_prog in mpicc hcc mpcc mpcc_r mpxlc cmpicc ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_MPICC+set}" = set; then + $as_echo_n "(cached) " >&6 ++else ++ if test -n "$MPICC"; then ++ ac_cv_prog_MPICC="$MPICC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_MPICC="$ac_prog" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mpi_mpi_h" >&5 +-$as_echo "$ac_cv_header_mpi_mpi_h" >&6; } ++fi ++MPICC=$ac_cv_prog_MPICC ++if test -n "$MPICC"; then ++ { $as_echo "$as_me:$LINENO: result: $MPICC" >&5 ++$as_echo "$MPICC" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++ test -n "$MPICC" && break ++done ++test -n "$MPICC" || MPICC="$CC" ++ ++ acx_mpi_save_CC="$CC" ++ CC="$MPICC" ++ ++ ++ ++if test x = x"$MPILIBS"; then ++ { $as_echo "$as_me:$LINENO: checking for MPI_Init" >&5 ++$as_echo_n "checking for MPI_Init... " >&6; } ++if test "${ac_cv_func_MPI_Init+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define MPI_Init to an innocuous variant, in case declares MPI_Init. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define MPI_Init innocuous_MPI_Init ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char MPI_Init (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef MPI_Init ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char MPI_Init (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_MPI_Init || defined __stub___MPI_Init ++choke me ++#endif ++ ++int ++main () ++{ ++return MPI_Init (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ ac_cv_func_MPI_Init=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_MPI_Init=no ++fi ++ ++rm -rf conftest.dSYM ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_MPI_Init" >&5 ++$as_echo "$ac_cv_func_MPI_Init" >&6; } ++if test "x$ac_cv_func_MPI_Init" = x""yes; then ++ MPILIBS=" " ++fi ++ ++fi ++if test x = x"$MPILIBS"; then ++ { $as_echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5 ++$as_echo_n "checking for MPI_Init in -lmpi... " >&6; } ++if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lmpi $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char MPI_Init (); ++int ++main () ++{ ++return MPI_Init (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ ac_cv_lib_mpi_MPI_Init=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_mpi_MPI_Init=no ++fi ++ ++rm -rf conftest.dSYM ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5 ++$as_echo "$ac_cv_lib_mpi_MPI_Init" >&6; } ++if test "x$ac_cv_lib_mpi_MPI_Init" = x""yes; then ++ MPILIBS="-lmpi" ++fi ++ ++fi ++if test x = x"$MPILIBS"; then ++ { $as_echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5 ++$as_echo_n "checking for MPI_Init in -lmpich... " >&6; } ++if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lmpich $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char MPI_Init (); ++int ++main () ++{ ++return MPI_Init (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ ac_cv_lib_mpich_MPI_Init=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_mpich_MPI_Init=no ++fi ++ ++rm -rf conftest.dSYM ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5 ++$as_echo "$ac_cv_lib_mpich_MPI_Init" >&6; } ++if test "x$ac_cv_lib_mpich_MPI_Init" = x""yes; then ++ MPILIBS="-lmpich" ++fi ++ ++fi ++ ++if test x != x"$MPILIBS"; then ++ { $as_echo "$as_me:$LINENO: checking for mpi.h" >&5 ++$as_echo_n "checking for mpi.h... " >&6; } ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest.$ac_objext; then ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ MPILIBS="" ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++CC="$acx_mpi_save_CC" ++ ++ ++ ++# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: ++if test x = x"$MPILIBS"; then ++ { { $as_echo "$as_me:$LINENO: error: \"libmpi IS NOT installed\"" >&5 ++$as_echo "$as_me: error: \"libmpi IS NOT installed\"" >&2;} ++ { (exit 1); exit 1; }; } ++ : ++else ++ { $as_echo "$as_me:$LINENO: WARNING: \"libmpi HAS BEEN installed\"" >&5 ++$as_echo "$as_me: WARNING: \"libmpi HAS BEEN installed\"" >&2;} ++ : ++fi ++ ++ ++ ++ CC="$MPICC" ++ LIBS="$MPILIBS $LIBS" ++ ++ ++{ $as_echo "$as_me:$LINENO: checking for main in -lmpi" >&5 ++$as_echo_n "checking for main in -lmpi... " >&6; } ++if test "${ac_cv_lib_mpi_main+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lmpi $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++ ++int ++main () ++{ ++return main (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ++$as_echo "$ac_try_echo") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && { ++ test "$cross_compiling" = yes || ++ $as_test_x conftest$ac_exeext ++ }; then ++ ac_cv_lib_mpi_main=yes ++else ++ $as_echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_mpi_main=no ++fi ++ ++rm -rf conftest.dSYM ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_main" >&5 ++$as_echo "$ac_cv_lib_mpi_main" >&6; } ++if test "x$ac_cv_lib_mpi_main" = x""yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBMPI 1 ++_ACEOF ++ ++ LIBS="-lmpi $LIBS" ++ ++else ++ { { $as_echo "$as_me:$LINENO: error: \"libmpi not installed\"" >&5 ++$as_echo "$as_me: error: \"libmpi not installed\"" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ if test "${ac_cv_header_mpi_h+set}" = set; then ++ { $as_echo "$as_me:$LINENO: checking for mpi.h" >&5 ++$as_echo_n "checking for mpi.h... " >&6; } ++if test "${ac_cv_header_mpi_h+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++fi ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mpi_h" >&5 ++$as_echo "$ac_cv_header_mpi_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking mpi/mpi.h usability" >&5 +-$as_echo_n "checking mpi/mpi.h usability... " >&6; } ++{ $as_echo "$as_me:$LINENO: checking mpi.h usability" >&5 ++$as_echo_n "checking mpi.h usability... " >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -8835,7 +9269,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default +-#include ++#include + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -8868,15 +9302,15 @@ + $as_echo "$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking mpi/mpi.h presence" >&5 +-$as_echo_n "checking mpi/mpi.h presence... " >&6; } ++{ $as_echo "$as_me:$LINENO: checking mpi.h presence" >&5 ++$as_echo_n "checking mpi.h presence... " >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include ++#include + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in +@@ -8910,25 +9344,25 @@ + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: mpi/mpi.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: mpi/mpi.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: mpi/mpi.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: mpi/mpi.h: proceeding with the compiler's result" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: mpi.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: mpi.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: mpi.h: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: mpi.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: mpi/mpi.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: mpi/mpi.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: mpi/mpi.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: mpi/mpi.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: mpi/mpi.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: mpi/mpi.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: mpi/mpi.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: mpi/mpi.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: mpi/mpi.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: mpi/mpi.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: mpi/mpi.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: mpi/mpi.h: in the future, the compiler will take precedence" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: mpi.h: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: mpi.h: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: mpi.h: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: mpi.h: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: mpi.h: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: mpi.h: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: mpi.h: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: mpi.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: mpi.h: proceeding with the preprocessor's result" >&5 ++$as_echo "$as_me: WARNING: mpi.h: proceeding with the preprocessor's result" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: mpi.h: in the future, the compiler will take precedence" >&5 ++$as_echo "$as_me: WARNING: mpi.h: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX + ## ------------------------------------------------------------------- ## + ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gpiv ## +@@ -8937,18 +9371,18 @@ + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for mpi/mpi.h" >&5 +-$as_echo_n "checking for mpi/mpi.h... " >&6; } +-if test "${ac_cv_header_mpi_mpi_h+set}" = set; then ++{ $as_echo "$as_me:$LINENO: checking for mpi.h" >&5 ++$as_echo_n "checking for mpi.h... " >&6; } ++if test "${ac_cv_header_mpi_h+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- ac_cv_header_mpi_mpi_h=$ac_header_preproc ++ ac_cv_header_mpi_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mpi_mpi_h" >&5 +-$as_echo "$ac_cv_header_mpi_mpi_h" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mpi_h" >&5 ++$as_echo "$ac_cv_header_mpi_h" >&6; } + + fi +-if test "x$ac_cv_header_mpi_mpi_h" = x""yes; then ++if test "x$ac_cv_header_mpi_h" = x""yes; then + : + else + { { $as_echo "$as_me:$LINENO: error: \"mpi.h is not installed\"" >&5 +diff -urNad gpiv-0.6.1~/configure.in gpiv-0.6.1/configure.in +--- gpiv-0.6.1~/configure.in 2009-05-18 12:28:58.000000000 +0200 ++++ gpiv-0.6.1/configure.in 2009-05-26 13:10:53.000000000 +0200 +@@ -78,10 +78,17 @@ + AC_SUBST(ENABLE_MPI_RR) + + if test "${ENABLE_MPI}" == '-DENABLE_MPI'; then +-dnl ACX_MPI(AC_MSG_WARN("libmpi HAS BEEN installed"), +-dnl AC_MSG_ERROR("libmpi IS NOT installed")) ++ ACX_MPI(AC_MSG_WARN("libmpi HAS BEEN installed"), ++ AC_MSG_ERROR("libmpi IS NOT installed")) + +- AC_CHECK_HEADER(mpi/mpi.h, ,AC_MSG_ERROR("mpi.h is not installed")) ++ ++ CC="$MPICC" ++ LIBS="$MPILIBS $LIBS" ++ ++ AC_CHECK_LIB(mpi, main, , ++ AC_MSG_ERROR("libmpi not installed")) ++ AC_CHECK_HEADER(mpi.h, , ++ AC_MSG_ERROR("mpi.h is not installed")) + + AC_CHECK_PROG(MPIRUN, mpirun, true, false) + if test x$MPIRUN = xfalse ; then +diff -urNad gpiv-0.6.1~/doc/C/Makefile.in gpiv-0.6.1/doc/C/Makefile.in +--- gpiv-0.6.1~/doc/C/Makefile.in 2009-05-18 12:29:15.000000000 +0200 ++++ gpiv-0.6.1/doc/C/Makefile.in 2009-05-26 13:11:58.000000000 +0200 +@@ -33,7 +33,8 @@ + subdir = doc/C + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/config/acx_mpi.m4 \ ++ $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -121,6 +122,8 @@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ ++MPICC = @MPICC@ ++MPILIBS = @MPILIBS@ + MPIRUN = @MPIRUN@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +diff -urNad gpiv-0.6.1~/doc/C/figures/Makefile.in gpiv-0.6.1/doc/C/figures/Makefile.in +--- gpiv-0.6.1~/doc/C/figures/Makefile.in 2009-05-18 12:29:15.000000000 +0200 ++++ gpiv-0.6.1/doc/C/figures/Makefile.in 2009-05-26 13:11:58.000000000 +0200 +@@ -33,7 +33,8 @@ + subdir = doc/C/figures + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/config/acx_mpi.m4 \ ++ $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -109,6 +110,8 @@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ ++MPICC = @MPICC@ ++MPILIBS = @MPILIBS@ + MPIRUN = @MPIRUN@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +diff -urNad gpiv-0.6.1~/doc/Makefile.in gpiv-0.6.1/doc/Makefile.in +--- gpiv-0.6.1~/doc/Makefile.in 2009-05-18 12:29:15.000000000 +0200 ++++ gpiv-0.6.1/doc/Makefile.in 2009-05-26 13:11:58.000000000 +0200 +@@ -32,7 +32,8 @@ + subdir = doc + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/config/acx_mpi.m4 \ ++ $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -111,6 +112,8 @@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ ++MPICC = @MPICC@ ++MPILIBS = @MPILIBS@ + MPIRUN = @MPIRUN@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +diff -urNad gpiv-0.6.1~/man/Makefile.in gpiv-0.6.1/man/Makefile.in +--- gpiv-0.6.1~/man/Makefile.in 2009-05-18 12:29:15.000000000 +0200 ++++ gpiv-0.6.1/man/Makefile.in 2009-05-26 13:11:59.000000000 +0200 +@@ -32,7 +32,8 @@ + subdir = man + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/config/acx_mpi.m4 \ ++ $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -103,6 +104,8 @@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ ++MPICC = @MPICC@ ++MPILIBS = @MPILIBS@ + MPIRUN = @MPIRUN@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +diff -urNad gpiv-0.6.1~/pixmaps/Makefile.in gpiv-0.6.1/pixmaps/Makefile.in +--- gpiv-0.6.1~/pixmaps/Makefile.in 2009-05-18 12:29:15.000000000 +0200 ++++ gpiv-0.6.1/pixmaps/Makefile.in 2009-05-26 13:11:59.000000000 +0200 +@@ -33,7 +33,8 @@ + subdir = pixmaps + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/config/acx_mpi.m4 \ ++ $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -109,6 +110,8 @@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ ++MPICC = @MPICC@ ++MPILIBS = @MPILIBS@ + MPIRUN = @MPIRUN@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ +diff -urNad gpiv-0.6.1~/src/Makefile.in gpiv-0.6.1/src/Makefile.in +--- gpiv-0.6.1~/src/Makefile.in 2009-05-18 12:29:16.000000000 +0200 ++++ gpiv-0.6.1/src/Makefile.in 2009-05-26 13:11:59.000000000 +0200 +@@ -34,7 +34,8 @@ + subdir = src + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/configure.in ++am__aclocal_m4_deps = $(top_srcdir)/config/acx_mpi.m4 \ ++ $(top_srcdir)/configure.in + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -132,6 +133,8 @@ + MAKEINFO = @MAKEINFO@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ ++MPICC = @MPICC@ ++MPILIBS = @MPILIBS@ + MPIRUN = @MPIRUN@ + MSGFMT = @MSGFMT@ + MSGFMT_OPTS = @MSGFMT_OPTS@ --- gpiv-0.6.1.orig/debian/patches/00list +++ gpiv-0.6.1/debian/patches/00list @@ -0,0 +1,3 @@ +01-mpi-header +02-link-libm.dpatch +