make GMXRC.{bash,csh,zsh} export PKG_CONFIG_PATH

diff --git a/scripts/GMXRC.bash.in b/scripts/GMXRC.bash.in
index a68a771c5b51fdb324328a2a5c80ab25cb5761a1..fcad8c712410164a6fcbc82669004735d899f778 100644 (file)
--- a/scripts/GMXRC.bash.in
+++ b/scripts/GMXRC.bash.in
@@ -13,6 +13,15 @@ for i in `echo $LD_LIBRARY_PATH | sed "s/:/ /g"`; do
 done
 LD_LIBRARY_PATH=$tmppath
 
+# remove gromacs part of PKG_CONFIG_PATH
+tmppath=""
+for i in `echo $PKG_CONFIG_PATH | sed "s/:/ /g"`; do
+  if test "$i" != "$GMXLDLIB/pkgconfig"; then
+    tmppath=${tmppath}:$i
+  fi
+done
+PKG_CONFIG_PATH=$tmppath
+
 # remove gromacs part of path
 tmppath=""
 for i in `echo $PATH | sed "s/:/ /g"`; do
@@ -43,11 +52,12 @@ GMXDATA=@datadir@
        
 # NB: The variables already begin with ':' now, or are empty
 LD_LIBRARY_PATH=${GMXLDLIB}${LD_LIBRARY_PATH}
+PKG_CONFIG_PATH=${GMXLDLIB}/pkgconfig${PKG_CONFIG_PATH}
 PATH=${GMXBIN}${PATH}
 MANPATH=${GMXMAN}${MANPATH}
 
 # export should be separate, so /bin/sh understands it
-export GMXBIN GMXLDLIB GMXMAN GMXDATA LD_LIBRARY_PATH PATH MANPATH
+export GMXBIN GMXLDLIB GMXMAN GMXDATA LD_LIBRARY_PATH PATH MANPATH PKG_CONFIG_PATH
 
 # read bash completions if understand how to use them
 # and this shell supports extended globbing

diff --git a/scripts/GMXRC.csh.in b/scripts/GMXRC.csh.in
index df11b3ee60d27837258630568fee065160617d3e..f4dc0df8046c7abc36ea7489aa41c94b94dce486 100755 (executable)
--- a/scripts/GMXRC.csh.in
+++ b/scripts/GMXRC.csh.in
@@ -6,6 +6,7 @@
 
 # zero possibly unset vars to avoid warnings
 if (! $?LD_LIBRARY_PATH) setenv LD_LIBRARY_PATH ""
+if (! $?PKG_CONFIG_PATH) setenv PKG_CONFIG_PATH ""
 if (! $?PATH) setenv PATH ""
 if (! $?MANPATH) setenv MANPATH ""
 if (! $?GMXLDLIB) setenv GMXLDLIB ""
@@ -19,6 +20,13 @@ foreach i ( `echo $LD_LIBRARY_PATH | sed "s/:/ /g"` )
 end
 setenv LD_LIBRARY_PATH $tmppath
 
+# remove previous gromacs part from PKG_CONFIG_PATH
+set tmppath = ""
+foreach i ( `echo $PKG_CONFIG_PATH | sed "s/:/ /g"` )
+  if ( "$i" != "$GMXLDLIB/pkgconfig" ) set tmppath = "${tmppath}:$i"
+end
+setenv PKG_CONFIG_PATH $tmppath
+
 # remove gromacs stuff from binary path
 set tmppath = ""
 foreach i ( `echo $PATH | sed "s/:/ /g"` )
@@ -46,6 +54,7 @@ setenv GMXDATA @datadir@
 # old variables begin with ':' now, or are empty.
 setenv PATH ${GMXBIN}${PATH}
 setenv LD_LIBRARY_PATH ${GMXLDLIB}${LD_LIBRARY_PATH}
+setenv PKG_CONFIG_PATH ${GMXLDLIB}/pkgconfig${PKG_CONFIG_PATH}
 setenv MANPATH ${GMXMAN}${MANPATH}
 
 setenv GMXFONT 10x20

diff --git a/scripts/GMXRC.zsh.in b/scripts/GMXRC.zsh.in
index dbd3e037ca77c87bcec8287483de826acef900c8..079c29bb35d4b3f5168b686cf221322df8826212 100755 (executable)
--- a/scripts/GMXRC.zsh.in
+++ b/scripts/GMXRC.zsh.in
@@ -13,6 +13,15 @@ for i in `echo $LD_LIBRARY_PATH | sed "s/:/ /g"`; do
 done
 LD_LIBRARY_PATH=$tmppath
 
+# First remove gromacs part of PKG_CONFIG_PATH
+tmppath=""
+for i in `echo $PKG_CONFIG_PATH | sed "s/:/ /g"`; do
+  if test "$i" != "$GMXLDLIB/pkgconfig"; then
+    tmppath=${tmppath}:$i
+  fi
+done
+PKG_CONFIG_PATH=$tmppath
+
 # remove gromacs part of path
 tmppath=""
 for i in `echo $PATH | sed "s/:/ /g"`; do
@@ -43,6 +52,7 @@ export GMXDATA=@datadir@
        
 # NB: The variables already begin with ':' now, or are empty
 export LD_LIBRARY_PATH=${GMXLDLIB}${LD_LIBRARY_PATH}
+export PKG_CONFIG_PATH=${GMXLDLIB}/pkgconfig${PKG_CONFIG_PATH}
 export PATH=${GMXBIN}${PATH}
 export MANPATH=${GMXMAN}${MANPATH}