[Debian-astro-commits] [gyoto] 89/221: Put MPICXX in gyoto.pc, only if HAVE_MPI. Also update autoconf-generated stuff.

[Thibaut Jean-Claude Paumard]

This is an automated email from the git hooks/post-receive script.

thibaut pushed a commit to branch master
in repository gyoto.

commit 6946b14a1c645ec324efd2276c8df1769e72feb5
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Tue Nov 18 16:25:15 2014 +0100

    Put MPICXX in gyoto.pc, only if HAVE_MPI. Also update autoconf-generated stuff.
---
 configure                   |  1 +
 configure.ac                |  3 ++-
 lib/Makefile.in             | 17 +++++++++--------
 lib/gyoto-uninstalled.pc.in |  2 ++
 lib/gyoto.pc.in             |  2 ++
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index f386dde..b876f8b 100755
--- a/configure
+++ b/configure
@@ -15990,6 +15990,7 @@ else
 
 else
   FEATURES+="-nompi"
+   MPICXX=""
 fi
 
 fi
diff --git a/configure.ac b/configure.ac
index 2e982a6..84880cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,8 @@ AS_IF([test "x$have_mpi" == xyes],
 [ AS_IF([test "x$with_mpi" == xyes],
   [ AC_ERROR([MPI requested but not found])
   ],
-  [FEATURES+="-nompi"])
+  [FEATURES+="-nompi"
+   MPICXX=""])
 ])
 
 AM_CONDITIONAL(HAVE_MPI, [test "x$have_mpi" == xyes])
diff --git a/lib/Makefile.in b/lib/Makefile.in
index c396c07..1aedf1d 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -155,10 +155,10 @@ am__objects_1 = PatternDisk.lo PatternDiskBB.lo DynamicalDisk.lo \
 	Disk3D.lo DynamicalDisk3D.lo DirectionalDisk.lo
 am_libgyoto_stdplug_la_OBJECTS = KerrBL.lo KerrKS.lo Minkowski.lo \
 	Star.lo StarTrace.lo FixedStar.lo Torus.lo PowerLawSpectrum.lo \
-	BlackBodySpectrum.lo ComplexAstrobj.lo UniformSphere.lo \
-	StandardAstrobj.lo PageThorneDisk.lo ThinDiskPL.lo \
-	PolishDoughnut.lo ThinDiskIronLine.lo StdPlug.lo \
-	$(am__objects_1)
+	BlackBodySpectrum.lo ThermalBremsstrahlungSpectrum.lo \
+	ComplexAstrobj.lo UniformSphere.lo StandardAstrobj.lo \
+	PageThorneDisk.lo ThinDiskPL.lo PolishDoughnut.lo \
+	ThinDiskIronLine.lo StdPlug.lo $(am__objects_1)
 libgyoto_stdplug_la_OBJECTS = $(am_libgyoto_stdplug_la_OBJECTS)
 libgyoto_stdplug_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
@@ -439,10 +439,10 @@ soverdir = $(pkglibdir)/@sovers@
 sover_LTLIBRARIES = libgyoto-stdplug.la $(am__append_2)
 libgyoto_stdplug_la_SOURCES = KerrBL.C KerrKS.C Minkowski.C Star.C \
 	StarTrace.C FixedStar.C Torus.C PowerLawSpectrum.C \
-	BlackBodySpectrum.C ComplexAstrobj.C UniformSphere.C \
-	StandardAstrobj.C PageThorneDisk.C ThinDiskPL.C \
-	PolishDoughnut.C ThinDiskIronLine.C StdPlug.C \
-	$(cfitsio_stdplug_sources)
+	BlackBodySpectrum.C ThermalBremsstrahlungSpectrum.C \
+	ComplexAstrobj.C UniformSphere.C StandardAstrobj.C \
+	PageThorneDisk.C ThinDiskPL.C PolishDoughnut.C \
+	ThinDiskIronLine.C StdPlug.C $(cfitsio_stdplug_sources)
 
 # those files need cfitsio for some functionality
 cfitsio_stdplug_sources = PatternDisk.C PatternDiskBB.C DynamicalDisk.C \
@@ -617,6 +617,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Star.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/StarTrace.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/StdPlug.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ThermalBremsstrahlungSpectrum.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ThinDisk.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ThinDiskIronLine.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ThinDiskPL.Plo at am__quote@
diff --git a/lib/gyoto-uninstalled.pc.in b/lib/gyoto-uninstalled.pc.in
index f11a7dd..715d6dd 100644
--- a/lib/gyoto-uninstalled.pc.in
+++ b/lib/gyoto-uninstalled.pc.in
@@ -16,6 +16,8 @@ HOME_LORENE=@HOME_LORENE@
 LORENECPPFLAGS=@LORENECPPFLAGS@
 LORENELDFLAGS=@LORENELDFLAGS@
 
+MPICXX=@MPICXX@
+
 Name: Gyoto
 Description: Relativistic geodesic integration and ray-tracing
 Version: @VERSION@
diff --git a/lib/gyoto.pc.in b/lib/gyoto.pc.in
index 0981afe..096f389 100644
--- a/lib/gyoto.pc.in
+++ b/lib/gyoto.pc.in
@@ -15,6 +15,8 @@ HOME_LORENE=@HOME_LORENE@
 LORENECPPFLAGS=@LORENECPPFLAGS@
 LORENELDFLAGS=@LORENELDFLAGS@
 
+MPICXX=@MPICXX@
+
 Name: Gyoto
 Description: Relativistic geodesic integration and ray-tracing
 Version: @VERSION@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git