Changeset 3366 for trunk/configure.ac

Timestamp:

Dec 3, 2014, 12:23:07 PM (8 years ago)

Author:

Peter

Message:

prefer private variables in yat.pc. closes #808

File:

• trunk/configure.ac (modified) (1 diff)

trunk/configure.ac

@@ -581 +581 @@
 
 # Assign LIBS variables for yat.pc
-YAT_PC_LIBS=$YAT_LIBS
+YAT_PC_LIBS_PRIVATE=$YAT_LIBS
+
 # Dependency to GSL is noted via 'Requires' field
-YAT_VAR_REMOVE([YAT_PC_LIBS], [-lgsl $YAT_CBLAS_LIB $LIBM])
-YAT_PC_REQUIRES="gsl > $gsl_version"
+YAT_VAR_REMOVE([YAT_PC_LIBS_PRIVATE], [-lgsl $YAT_CBLAS_LIB $LIBM])
+YAT_SET_CONTAINS([$yat_libyat_la_LIBADD], [-lgsl], [
+  YAT_PC_REQUIRES_PRIVATE="gsl > $gsl_version"
+], [
+  YAT_PC_REQUIRES="gsl > $gsl_version"
+])
+
 # ignore this whole bam thing if --without-samtools
 AS_IF([test x$with_samtools != x"no"], [
   # htslib comes with a pc file, so we can require htslib in yat.pc
   AS_IF([test x$with_hts = x"yes"], [
-    YAT_VAR_REMOVE([YAT_PC_LIBS], [$BAM_LIBS -lz])
-    YAT_PC_REQUIRES="$YAT_PC_REQUIRES htslib"
+    YAT_VAR_REMOVE([YAT_PC_LIBS_PRIVATE], [$BAM_LIBS -lz])
+    YAT_SET_CONTAINS([$yat_libyat_la_LIBADD], [-lhts], [
+      YAT_PC_REQUIRES_PRIVATE="$YAT_PC_REQUIRES_PRIVATE htslib"
+    ], [
+      YAT_PC_REQUIRES="$YAT_PC_REQUIRES htslib"
+    ])
   ],[
     # libbam has no pc file, so has to remain in LIBS and instead we
     # require zlib
-    YAT_VAR_REMOVE([YAT_PC_LIBS], [-lz])
+    YAT_VAR_REMOVE([YAT_PC_LIBS_PRIVATE], [-lz])
     YAT_PC_REQUIRES="$YAT_PC_REQUIRES zlib"
-  ])
-])
+    YAT_SET_CONTAINS([$yat_libyat_la_LIBADD], [-lz], [
+      YAT_PC_REQUIRES_PRIVATE="$YAT_PC_REQUIRES_PRIVATE zlib"
+    ], [
+      YAT_PC_REQUIRES="$YAT_PC_REQUIRES zlib"
+    ])
+  ])
+])
+
+# Having libs declared as LIBS.private in yat.pc assumes that libs
+# have been linked into libyat. Therefore for each lib check if it is
+# mentioned in $yat_libyat_la_LIBADD, and if it's not move
+# lib to LIBS variable.
+for lib in $YAT_PC_LIBS_PRIVATE; do
+  YAT_SET_CONTAINS([$yat_libyat_la_LIBADD], [$lib], [
+  ], [
+    # move lib from $YAT_PC_LIBS_PRIVATE to $YAT_PC_LIBS
+    YAT_VAR_REMOVE([$YAT_PC_LIBS_PRIVATE], [$lib])
+    YAT_PC_LIBS="$YAT_PC_LIBS $lib"
+  ])
+done
+
 AC_SUBST([YAT_PC_LIBS])
 AC_SUBST([YAT_PC_REQUIRES])
+AC_SUBST([YAT_PC_LIBS_PRIVATE])
+AC_SUBST([YAT_PC_REQUIRES_PRIVATE])
 
 AC_SUBST(YAT_LIBS)