Changeset 3111

Timestamp:

Nov 10, 2013, 2:22:53 AM (10 years ago)

Author:

Peter

Message:

refs #737

configure.ac: Define new variables YAT_LIBS, YAT_STATIC_LIBS, yat_libyat_la_LIBADD, YAT_PRIMARY_LIBS, and YAT_PC_LIBS (see code for definitions).

build_support/yat.pc.in: reflect new variables
build_support/yat-config.in: reflect new variables
build_support/gen_yat_pc.sh.in: reflect new variables
build_support/Makefile.am: reflect new variables
yat/Makefile.am: use AC_SUBSTed yat_libyat_la_LIBADD
test/static_test.sh: avoid redeclaring variable in generated Makefile.am

Location:

trunk

Files:

• build_support/Makefile.am (modified) (1 diff)
• build_support/gen_yat_pc.sh.in (modified) (1 diff)
• build_support/yat-config.in (modified) (3 diffs)
• build_support/yat.pc.in (modified) (1 diff)
• configure.ac (modified) (1 diff)
• test/static_test.sh (modified) (1 diff)
• yat/Makefile.am (modified) (1 diff)

trunk/build_support/Makefile.am

@@ -46 +46 @@
   -e 's|@YAT_CXXFLAGS[@]|$(YAT_CXXFLAGS)|g' \
   -e 's|@YAT_LDFLAGS[@]|$(YAT_LDFLAGS)|g' \
+  -e 's|@YAT_PC_LIBS[@]|$(YAT_PC_LIBS)|g' \
   -e 's|@YAT_PRIMARY_LIBS[@]|$(YAT_PRIMARY_LIBS)|g' \
-  -e 's|@BAM_LIBS[@]|$(BAM_LIBS)|g' \
+  -e 's|@YAT_STATIC_LIBS[@]|$(YAT_STATIC_LIBS)|g' \
   -e 's|@LIBM[@]|$(LIBM)|g' \
   -e 's|@PACKAGE[@]|$(PACKAGE)|g' \

trunk/build_support/gen_yat_pc.sh.in

@@ -84 +84 @@
 -e 's|@LDFLAGS[@]|@LDFLAGS@|g' \
 -e 's|@YAT_LDFLAGS[@]|@YAT_LDFLAGS@|g' \
--e 's|@BOOST_THREAD_LIB[@]|@BOOST_THREAD_LIB@|g' \
--e 's|@BOOST_SYSTEM_LIB[@]|@BOOST_SYSTEM_LIB@|g' \
--e 's|@BAM_LIBS[@]|@BAM_LIBS@|g' \
+-e 's|@YAT_PC_LIBS[@]|@YAT_PC_LIBS@|g' \
 -e 's|@LIBS[@]|@LIBS@|g' \
 < $input

trunk/build_support/yat-config.in

@@ -40 +40 @@
 YAT_LDFLAGS="@YAT_LDFLAGS@"
 YAT_PRIMARY_LIBS="@YAT_PRIMARY_LIBS@"
-BAM_LIBS="@BAM_LIBS@"
+YAT_STATIC_LIBS="@YAT_STATIC_LIBS@"
 LIBM="@LIBM@"
 
-if test "x$YAT_CBLAS_LIB" = "x"; then
-  YAT_CBLAS_LIB="@YAT_CBLAS_LIB@"
-fi
+# user is always right
+test -z "$YAT_CBLAS_LIB" && YAT_CBLAS_LIB="@YAT_CBLAS_LIB@"
 
 LA_FILE="$libdir/libyat.la"
@@ -143 +142 @@
     ;;
     --libs)
-    flags="$flags -lyat $BAM_LIBS $YAT_PRIMARY_LIBS $YAT_CBLAS_LIB $LIBM $LIBS"
+    flags="$flags -lyat $YAT_STATIC_LIBS $YAT_PRIMARY_LIBS $YAT_CBLAS_LIB $LIBM $LIBS"
     ;;
     --libs-without-cblas)
-    flags="$flags -lyat $BAM_LIBS $YAT_PRIMARY_LIBS $LIBM $LIBS"
+    flags="$flags -lyat $YAT_STATIC_LIBS $YAT_PRIMARY_LIBS $LIBM $LIBS"
     ;;
     --ldflags)
@@ -160 +159 @@
     ;;
     --link-libtool)
-    flags="$flags $LA_FILE $BAM_LIBS $YAT_CBLAS_LIB"
+    flags="$flags $LA_FILE $YAT_STATIC_LIBS $YAT_CBLAS_LIB"
     ;;
     --yat-la-file)

trunk/build_support/yat.pc.in

@@ -29 +29 @@
 Version: @VERSION@
 Requires: gsl >= @gsl_version@
-Libs: -L${libdir} -lyat @BAM_LIBS@ @YAT_LDFLAGS@ @LDFLAGS@ @LIBS@
-Libs.private: -lz @BOOST_THREAD_LIB@ @BOOST_SYSTEM_LIB@
+Libs: -L${libdir} -lyat @YAT_PC_LIBS@ @YAT_LDFLAGS@ @LDFLAGS@ @LIBS@
+Libs.private:
 Cflags: @YAT_CPPFLAGS@ @YAT_CXXFLAGS@ @CPPFLAGS@ @CXXFLAGS@ -I${includedir}

trunk/configure.ac

@@ -473 +473 @@
 APR_RESTORE_THE_ENVIRONMENT(LIBS, YAT_)
 
-# YAT_LIBS minus cblas and math libraries
-YAT_PRIMARY_LIBS=$YAT_LIBS
+# Set some variables useful when linking
+AC_SUBST([YAT_STATIC_LIBS])
+
+# libs used in libyat.la
+yat_libyat_la_LIBADD="$YAT_LIBS"
+# We avoid linking in cblas in libyat.la, to let users choose
+# favourite cblas library at link time.
+YAT_VAR_REMOVE([yat_libyat_la_LIBADD], [$YAT_CBLAS_LIB])
+# we avoid linking in YAT_STATIC_LIBS as they have been detected to
+# not be suitable libtool archive.
+YAT_VAR_REMOVE([yat_libyat_la_LIBADD], [$YAT_STATIC_LIBS])
+AC_SUBST([yat_libyat_la_LIBADD])
+
+# Primary LIBS are same as linked into libyat.la excluding LIBM
+YAT_PRIMARY_LIBS=$yat_libyat_la_LIBADD
 YAT_VAR_REMOVE([YAT_PRIMARY_LIBS], [$LIBM])
-YAT_VAR_REMOVE([YAT_PRIMARY_LIBS], [$YAT_CBLAS_LIB])
-# workaround for ticket #736
-YAT_VAR_REMOVE([YAT_PRIMARY_LIBS], [$BAM_LIBS])
-AC_SUBST(BAM_LIBS)
 AC_SUBST(YAT_PRIMARY_LIBS)
+
+# Assign LIBS variables for yat.pc
+YAT_PC_LIBS=$YAT_LIBS
+# Dependency to GSL is noted via 'Requires' field
+YAT_VAR_REMOVE([YAT_PRIMARY_LIBS], [-lgsl $YAT_CBLAS_LIB $LIBM])
+AC_SUBST([YAT_PC_LIBS])
+
 AC_SUBST(YAT_LIBS)
 AC_SUBST(YAT_CBLAS_LIB)

trunk/test/static_test.sh

@@ -40 +40 @@
 EOF
 
-echo "AM_LDFLAGS = -all-static" >> Makefile.am
+sed -i 's,^AM_LDFLAGS =,AM_LDFLAGS = -all-static,' Makefile.am
+grep '^AM_LDFLAGS' Makefile.am || exit_fail
 
 bootstrap

trunk/yat/Makefile.am

@@ -27 +27 @@
 yat_libyat_la_LDFLAGS = -version-info $(YAT_LT_VERSION) $(AM_LDFLAGS)
 
-yat_libyat_la_LIBADD = \
-  $(YAT_PRIMARY_LIBS) $(LIBM)
-
 noinst_LTLIBRARIES =
 nobase_include_HEADERS =