Changeset 2954 for branches/0.10-stable


Ignore:
Timestamp:
Jan 16, 2013, 9:33:07 AM (9 years ago)
Author:
Peter
Message:

fixes #733 and #736. Do not link -lbam into libyat.la, but do mention it in yat-config and yat.pc. Also mention -lz in yat.pc (#736)

Location:
branches/0.10-stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/0.10-stable/build_support/Makefile.am

    r2787 r2954  
    4949  -e 's|@YAT_LDFLAGS[@]|$(YAT_LDFLAGS)|g' \
    5050  -e 's|@YAT_PRIMARY_LIBS[@]|$(YAT_PRIMARY_LIBS)|g' \
     51  -e 's|@BAM_LIBS[@]|$(BAM_LIBS)|g' \
    5152  -e 's|@LIBM[@]|$(LIBM)|g' \
    5253  -e 's|@PACKAGE[@]|$(PACKAGE)|g' \
  • branches/0.10-stable/build_support/yat-config.in

    r2842 r2954  
    4040YAT_LDFLAGS="@YAT_LDFLAGS@"
    4141YAT_PRIMARY_LIBS="@YAT_PRIMARY_LIBS@"
     42BAM_LIBS="@BAM_LIBS@"
    4243LIBM="@LIBM@"
    4344
     
    142143    ;;
    143144    --libs)
    144     flags="$flags -lyat $YAT_PRIMARY_LIBS $YAT_CBLAS_LIB $LIBM $LIBS"
     145    flags="$flags -lyat $BAM_LIBS $YAT_PRIMARY_LIBS $YAT_CBLAS_LIB $LIBM $LIBS"
    145146    ;;
    146147    --libs-without-cblas)
    147     flags="$flags -lyat $YAT_PRIMARY_LIBS $LIBM $LIBS"
     148    flags="$flags -lyat $BAM_LIBS $YAT_PRIMARY_LIBS $LIBM $LIBS"
    148149    ;;
    149150    --ldflags)
     
    159160    ;;
    160161    --link-libtool)
    161     flags="$flags $LA_FILE $YAT_CBLAS_LIB"
     162    flags="$flags $LA_FILE $BAM_LIBS $YAT_CBLAS_LIB"
    162163    ;;
    163164    --yat-la-file)
  • branches/0.10-stable/build_support/yat.pc.in

    r2853 r2954  
    2929Version: @VERSION@
    3030Requires: gsl >= @gsl_version@
    31 Libs: -L${libdir} -lyat @YAT_LDFLAGS@ @LDFLAGS@
    32 Libs.private: @BOOST_THREAD_LIB@ @BOOST_SYSTEM_LIB@
     31Libs: -L${libdir} -lyat $BAM_LIBS @YAT_LDFLAGS@ @LDFLAGS@
     32Libs.private: -lz @BOOST_THREAD_LIB@ @BOOST_SYSTEM_LIB@
    3333Cflags: @YAT_CPPFLAGS@ @YAT_CXXFLAGS@ @CPPFLAGS@ @CXXFLAGS@ -I${includedir}
  • branches/0.10-stable/configure.ac

    r2928 r2954  
    425425          [YAT_PRIMARY_LIBS="$YAT_PRIMARY_LIBS $lib"])
    426426done
     427# workaround for ticket #736
     428for lib in $BAM_LIBS; do
     429  APR_REMOVEFROM([YAT_PRIMARY_LIBS], [$lib])
     430done
     431AC_SUBST(BAM_LIBS)
    427432AC_SUBST(YAT_PRIMARY_LIBS)
    428433AC_SUBST(YAT_LIBS)
Note: See TracChangeset for help on using the changeset viewer.