Changeset 3111 for trunk/configure.ac


Ignore:
Timestamp:
Nov 10, 2013, 2:22:53 AM (8 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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r3110 r3111  
    473473APR_RESTORE_THE_ENVIRONMENT(LIBS, YAT_)
    474474
    475 # YAT_LIBS minus cblas and math libraries
    476 YAT_PRIMARY_LIBS=$YAT_LIBS
     475# Set some variables useful when linking
     476AC_SUBST([YAT_STATIC_LIBS])
     477
     478# libs used in libyat.la
     479yat_libyat_la_LIBADD="$YAT_LIBS"
     480# We avoid linking in cblas in libyat.la, to let users choose
     481# favourite cblas library at link time.
     482YAT_VAR_REMOVE([yat_libyat_la_LIBADD], [$YAT_CBLAS_LIB])
     483# we avoid linking in YAT_STATIC_LIBS as they have been detected to
     484# not be suitable libtool archive.
     485YAT_VAR_REMOVE([yat_libyat_la_LIBADD], [$YAT_STATIC_LIBS])
     486AC_SUBST([yat_libyat_la_LIBADD])
     487
     488# Primary LIBS are same as linked into libyat.la excluding LIBM
     489YAT_PRIMARY_LIBS=$yat_libyat_la_LIBADD
    477490YAT_VAR_REMOVE([YAT_PRIMARY_LIBS], [$LIBM])
    478 YAT_VAR_REMOVE([YAT_PRIMARY_LIBS], [$YAT_CBLAS_LIB])
    479 # workaround for ticket #736
    480 YAT_VAR_REMOVE([YAT_PRIMARY_LIBS], [$BAM_LIBS])
    481 AC_SUBST(BAM_LIBS)
    482491AC_SUBST(YAT_PRIMARY_LIBS)
     492
     493# Assign LIBS variables for yat.pc
     494YAT_PC_LIBS=$YAT_LIBS
     495# Dependency to GSL is noted via 'Requires' field
     496YAT_VAR_REMOVE([YAT_PRIMARY_LIBS], [-lgsl $YAT_CBLAS_LIB $LIBM])
     497AC_SUBST([YAT_PC_LIBS])
     498
    483499AC_SUBST(YAT_LIBS)
    484500AC_SUBST(YAT_CBLAS_LIB)
Note: See TracChangeset for help on using the changeset viewer.