[adios] 200/207: Enable glib

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository adios.

commit ffeb75797347597c8965834469e8c40a387805a6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat May 9 20:55:36 2015 +0100

    Enable glib
---
 debian/rules | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index ea7c55e..a6b7937 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,13 +4,13 @@ export DH_VERBOSE=1
 
 # Cope with lam not providing mpicc.
 include /usr/share/mpi-default-dev/debian_defaults
-ifeq ($(ARCH_DEFAULT_MPI_IMPL),lam)
-  CC:=mpicc.lam
-  CXX:=mpicc.lam
-else
-  CC:=mpicc
-  CXX:=mpic++
-endif
+#ifeq ($(ARCH_DEFAULT_MPI_IMPL),lam)
+#  CC:=mpicc.lam
+#  CXX:=mpicc.lam
+#else
+#  CC:=mpicc
+#  CXX:=mpic++
+#endif
 
 ARCH:=$(shell dpkg --print-architecture)
 WITH_LUSTRE :=
@@ -77,7 +77,7 @@ override_dh_auto_configure:
 		--with-hdf5-incdir=/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL) \
 		--with-hdf5-libdir=$(LIBDIR)/hdf5/$(ARCH_DEFAULT_MPI_IMPL) \
 		--with-bzip2=/usr  --with-zlib=/usr --with-glib=/usr \
-		--prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC) # CFLAGS='-fPIC'
+		--prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC) CFLAGS=-I$(LIBDIR)/glib-2.0/include
 
 override_dh_auto_build:
 	# First do a build shared, with -fPIC, for the python lib.

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