[adios] 171/207: Update pkg-config

[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 11cfb72e5556a13d0a8333d92623144460a96989
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jun 16 17:21:15 2014 +0100

    Update pkg-config
---
 debian/adios_config            | 24 ++++++++++++------------
 debian/patches/pkgconfig.patch |  5 +----
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/debian/adios_config b/debian/adios_config
index 1f89932..689d719 100755
--- a/debian/adios_config
+++ b/debian/adios_config
@@ -3,7 +3,7 @@
 # Print compiler/linker flags to use ADIOS
 # Version based on pkg-config, works with Multiarch.
 #  - Alastair McKinstry, <mckinstry at debian.org>
-#  Last Updated: 2014-06-11. FIXME CHECK
+#  Last Updated: 2014-06-16
 
 
 function Usage () {
@@ -72,15 +72,15 @@ fi
 if [ "$PRINT_CFLAGS" == "yes" ]; then
     if [ "$OPT_READ" == "yes" ]; then
         if [ "$OPT_SEQ" == "yes" ]; then
-            CFLAGS="$ADIOSREAD_SEQ_INC"
+            CFLAGS=`pkgconfig adios --variable ADIOSREAD_SEQ_INC`
         else
-            CFLAGS="$ADIOSREAD_INC"
+            CFLAGS=`pkgconfig adios --variable ADIOSREAD_INC`
         fi 
     else
         if [ "$OPT_SEQ" == "yes" ]; then
-            CFLAGS="$ADIOS_SEQ_INC"
+            CFLAGS=`pkgconfig adiso --variable ADIOS_SEQ_INC`
         else
-            CFLAGS="$ADIOS_INC"
+            CFLAGS=`pkgconfig adios --variable ADIOS_INC`
         fi 
     fi
     if [ $NFLAGS_ASKED -gt 1 ]; then
@@ -94,31 +94,31 @@ if [ "$PRINT_LDFLAGS" == "yes" ]; then
         if [ "$OPT_READ" == "yes" ]; then
             # ADIOSREAD + SEQ
             if [ "$OPT_FORTRAN" == "yes" ]; then
-                LDFLAGS="$ADIOSREAD_SEQ_FLIB"
+                LDFLAGS=`pkgconfig adios --variable ADIOSREAD_SEQ_FLIB`
             else
-                LDFLAGS="$ADIOSREAD_SEQ_CLIB"
+                LDFLAGS=`pkgconfig adios --variable ADIOSREAD_SEQ_CLIB`
             fi
         else  # ADIOS + SEQ
             if [ "$OPT_FORTRAN" == "yes" ]; then
                 #LDFLAGS="$ADIOS_SEQ_FLIB"
                 LDFLAGS="There is no Fortran library of ADIOS for sequential codes"
             else
-                LDFLAGS="$ADIOS_SEQ_CLIB"
+                LDFLAGS=`pkgconfig adios --variable ADIOS_SEQ_CLIB`
             fi
         fi
     elif [ "$OPT_READ" == "yes" ]; then
         # ADIOSREAD + parallel code
         if [ "$OPT_FORTRAN" == "yes" ]; then
-            LDFLAGS="$ADIOSREAD_FLIB"
+            LDFLAGS=`pkgconfig adios --variable ADIOSREAD_FLIB`
         else
-            LDFLAGS="$ADIOSREAD_CLIB"
+            LDFLAGS=`pkgconfig adios --variable ADIOSREAD_CLIB`
         fi
     else 
         # ADIOS + parallel code
         if [ "$OPT_FORTRAN" == "yes" ]; then
-            LDFLAGS="$ADIOS_FLIB"
+            LDFLAGS=`pkgconfig adios --variable ADIOS_FLIB`
         else
-            LDFLAGS="$ADIOS_CLIB"
+            LDFLAGS=`pkgconfig adios --variable ADIOS_CLIB`
         fi
     fi 
     if [ $NFLAGS_ASKED -gt 1 ]; then
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index 5c2a299..541924b 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -7,7 +7,7 @@ Index: adios-1.7.0/adios.pc.in
 ===================================================================
 --- /dev/null
 +++ adios-1.7.0/adios.pc.in
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,53 @@
 +# Standard defines for pkg-config
 +prefix=@prefix@
 +exec_prefix=${prefix}
@@ -61,9 +61,6 @@ Index: adios-1.7.0/adios.pc.in
 +Cflags: -I${prefix}/include @ADIOSLIB_CPPFLAGS@ @ADIOSLIB_CFLAGS@
 +Libs: ${ADIOS_CLIB}
 +Libs.private: -ldl
-+Cflags: -pthread
-+
-+
 Index: adios-1.7.0/configure.ac
 ===================================================================
 --- adios-1.7.0.orig/configure.ac

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