Changeset 3366

Timestamp:

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

Author:

Peter

Message:

prefer private variables in yat.pc. closes #808

Location:

trunk

Files:

• build_support/gen_yat_pc.sh.in (modified) (1 diff)
• build_support/yat.pc.in (modified) (1 diff)
• configure.ac (modified) (1 diff)
• m4/yat_common.m4 (modified) (1 diff)

trunk/build_support/gen_yat_pc.sh.in

@@ -85 +85 @@
 -e 's|@YAT_LDFLAGS[@]|@YAT_LDFLAGS@|g' \
 -e 's|@YAT_PC_LIBS[@]|@YAT_PC_LIBS@|g' \
+-e 's|@YAT_PC_LIBS_PRIVATE[@]|@YAT_PC_LIBS_PRIVATE@|g' \
 -e 's|@YAT_PC_REQUIRES[@]|@YAT_PC_REQUIRES@|g' \
+-e 's|@YAT_PC_REQUIRES_PRIVATE[@]|@YAT_PC_REQUIRES_PRIVATE@|g' \
 -e 's|@LIBS[@]|@LIBS@|g' \
 < $input

trunk/build_support/yat.pc.in

@@ -29 +29 @@
 Version: @VERSION@
 Requires: @YAT_PC_REQUIRES@
+Requires.private: @YAT_PC_REQUIRES_PRIVATE@
 Libs: -L${libdir} -lyat @YAT_PC_LIBS@ @YAT_LDFLAGS@ @LDFLAGS@ @LIBS@
-Libs.private:
+Libs.private: @YAT_PC_LIBS_PRIVATE@
 Cflags: @YAT_CPPFLAGS@ @YAT_CXXFLAGS@ @CPPFLAGS@ @CXXFLAGS@ -I${includedir}

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)

trunk/m4/yat_common.m4

@@ -55 +55 @@
 
 
+# YAT_SET_CONTAINS(set, value, [if-present], [if-not-present])
+# ============================================================
+# Loop over set (space-separated) and if value exists, execute
+# if-present. otherwise execute if-not-present
+AC_DEFUN([YAT_SET_CONTAINS],
+[
+AS_IF([AS_ECHO([$1]) | tr ' ' '\n' | grep '^$2$' > /dev/null], [$3], [$4])
+]) #YAT_SET_CONTAINS
+
+
 # YAT_VAR_REMOVE(VAR, LIST)
 # ==========================