Changeset 1897

Timestamp:

Apr 16, 2009, 12:06:15 AM (14 years ago)

Author:

Peter

Message:

fixes #522. Introduced a variable YAT_PRIMARY_LIBS that is YAT_LIBS
minus cblas and mathlib. The variable made it easier to create needed
variables in yat-config (string addition is easier than subtraction,
whatever that means). Removed variable YAT_LIBS_WITHOUT_CBLAS because
it can easily be achied via "YAT_PRIMARY_LIBS LIBM".

Location:

trunk

Files:

• build_support/Makefile.am (modified) (1 diff)
• build_support/yat-config.in (modified) (2 diffs)
• configure.ac (modified) (2 diffs)
• test/Makefile.am (modified) (1 diff)
• test/yat_config_cblas_test.sh (added)
• yat/Makefile.am (modified) (1 diff)

trunk/build_support/Makefile.am

@@ -48 +48 @@
   -e 's|@YAT_CXXFLAGS[@]|$(YAT_CXXFLAGS)|g' \
   -e 's|@YAT_LDFLAGS[@]|$(YAT_LDFLAGS)|g' \
-  -e 's|@YAT_LIBS[@]|$(YAT_LIBS)|g' \
+  -e 's|@YAT_PRIMARY_LIBS[@]|$(YAT_PRIMARY_LIBS)|g' \
+  -e 's|@LIBM[@]|$(LIBM)|g' \
   -e 's|@PACKAGE[@]|$(PACKAGE)|g' \
   -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \

trunk/build_support/yat-config.in

@@ -36 +36 @@
 YAT_CXXFLAGS="@YAT_CXXFLAGS@"
 YAT_LDFLAGS="@YAT_LDFLAGS@"
-YAT_LIBS="@YAT_LIBS@"
-
-# FIXME, this should honor environment variable
-YAT_CBLAS_LIB=@YAT_CBLAS_LIB@
+YAT_PRIMARY_LIBS="@YAT_PRIMARY_LIBS@"
+LIBM="@LIBM@"
+
+if test "x$YAT_CBLAS_LIB" = "x"; then
+  YAT_CBLAS_LIB=@YAT_CBLAS_LIB@
+fi
 
 LA_FILE="$libdir/lib@YAT_LIBNAME@.la"
@@ -131 +133 @@
     ;;
     --libs)
-    flags="$flags -l@YAT_LIBNAME@ $YAT_LIBS $LIBS"
+    flags="$flags -l@YAT_LIBNAME@ $YAT_PRIMARY_LIBS $YAT_CBLAS_LIB $LIBM $LIBS"
     ;;
     --ldflags)

trunk/configure.ac

@@ -408 +408 @@
 APR_RESTORE_THE_ENVIRONMENT(CXXFLAGS, YAT_)
 APR_RESTORE_THE_ENVIRONMENT(LDFLAGS, YAT_)
-APR_RESTORE_THE_ENVIRONMENT(LIBS, YAT_)
+APR_RESTORE_THE_ENVIRONMENT(LIBS, YAT_PRIMARY_)
+
+# remove cblas and m
+APR_REMOVEFROM([YAT_PRIMARY_LIBS], [$YAT_CBLAS_LIB])
+APR_REMOVEFROM([YAT_PRIMARY_LIBS], [$LIBM])
+
+YAT_LIBS="$YAT_PRIMARY_LIBS $YAT_CBLAS_LIB $LIBM"
+AC_SUBST(YAT_LIBS)
 
 # set and AC_SUBST variables that are interpreted by Automake
@@ -419 +426 @@
 AC_SUBST(AM_LDFLAGS)
 
-
-YAT_LIBS_WITHOUT_CBLAS=$YAT_LIBS
-APR_REMOVEFROM([YAT_LIBS_WITHOUT_CBLAS], [$YAT_CBLAS_LIB])
-AC_SUBST(YAT_LIBS_WITHOUT_CBLAS)
 
 # Create output.

trunk/test/Makefile.am

@@ -73 +73 @@
 TESTS += documentation_test.sh
 
-DISTRIBUTED_TESTS = yat_cpp_add_flag_test.sh \
+DISTRIBUTED_TESTS = \
+yat_config_cblas_test.sh \
+yat_cpp_add_flag_test.sh \
 yat_cxx_add_flag_test.sh \
 yat_ld_add_flag_test.sh \

trunk/yat/Makefile.am

@@ -40 +40 @@
   statistics/libstatistics.la \
   utility/libutility.la \
-  $(YAT_LIBS_WITHOUT_CBLAS)
+  $(YAT_PRIMARY_LIBS) $(LIBM)