Fixed threads flags in pc files for autotools

The problem is mainly that -pthread, which is saved in PTHREAD_CFLAGS, is
also needed by the linker and for that reason it has to appear in the libs
line of the pc files as well. For cmake this is not a problem, because
PTHREAD_LIBS is not empty.

diff --git a/src/gmxlib/libgmx.pc.in b/src/gmxlib/libgmx.pc.in
index e3490a1c7f86ba5e7855c452f862ee7e35c24044..e954f89c066efc7233b24e4331c3e262ab522c57 100644 (file)
--- a/src/gmxlib/libgmx.pc.in
+++ b/src/gmxlib/libgmx.pc.in
@@ -8,7 +8,6 @@ Description: Gromacs default lib
 URL: http://www.gromacs.org
 Version: @VERSION@
 Requires:
-Libs.private: -lm @PTHREAD_LIBS@
-Libs: -L${libdir} -lgmx@LIBSUFFIX@
+Libs: -L${libdir} -lgmx@LIBSUFFIX@ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -lm
 Cflags: -I${includedir} @PTHREAD_CFLAGS@ @PKG_CFLAGS@ 
 

diff --git a/src/kernel/libgmxpreprocess.pc.in b/src/kernel/libgmxpreprocess.pc.in
index 5d595c152cf2d83591b4e572788ef245350755f2..00fa1f75d760977bbc20ca5bac76748d507fd34a 100644 (file)
--- a/src/kernel/libgmxpreprocess.pc.in
+++ b/src/kernel/libgmxpreprocess.pc.in
@@ -8,7 +8,6 @@ Description: Gromacs preprocess lib
 URL: http://www.gromacs.org
 Version: @VERSION@
 Requires: libgmx@LIBSUFFIX@ libmd@LIBSUFFIX@ 
-Libs.private: -lm @PTHREAD_LIBS@
-Libs: -L${libdir} -lgmxpreprocess@LIBSUFFIX@
+Libs: -L${libdir} -lgmxpreprocess@LIBSUFFIX@ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -lm
 Cflags: -I${includedir} @PTHREAD_CFLAGS@ @PKG_CFLAGS@
 

diff --git a/src/mdlib/libmd.pc.in b/src/mdlib/libmd.pc.in
index b85acc60561862af45bc4dc70b6265e7aa3b9a76..64eced3151d294f16a2ade1ae88453a141fdf02c 100644 (file)
--- a/src/mdlib/libmd.pc.in
+++ b/src/mdlib/libmd.pc.in
@@ -8,7 +8,6 @@ Description: Gromacs md lib
 URL: http://www.gromacs.org
 Version: @VERSION@
 Requires: libgmx@LIBSUFFIX@ @PKG_FFT@ @PKG_XML@
-Libs.private: -lm @PTHREAD_LIBS@
-Libs: -L${libdir} -lmd@LIBSUFFIX@ @PKG_FFT_LIBS@
+Libs: -L${libdir} -lmd@LIBSUFFIX@ @PKG_FFT_LIBS@ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -lm
 Cflags: -I${includedir} @PTHREAD_CFLAGS@ @PKG_CFLAGS@
 

diff --git a/src/tools/libgmxana.pc.in b/src/tools/libgmxana.pc.in
index 77af492e76b23eaff0b16a3c9a87fe54689ac0cb..9ae9b33e04cd593e05b68c27769d14a4afa2d602 100644 (file)
--- a/src/tools/libgmxana.pc.in
+++ b/src/tools/libgmxana.pc.in
@@ -8,7 +8,6 @@ Description: Gromacs analysis lib
 URL: http://www.gromacs.org
 Version: @VERSION@
 Requires: @PKG_GSL@ libgmx@LIBSUFFIX@ libmd@LIBSUFFIX@
-Libs.private: -lm @PTHREAD_LIBS@
-Libs: -L${libdir} -lgmxana@LIBSUFFIX@
+Libs: -L${libdir} -lgmxana@LIBSUFFIX@ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -lm
 Cflags: -I${includedir} @PTHREAD_CFLAGS@ @PKG_CFLAGS@