Ignore:
Timestamp:
Jan 4, 2013, 7:38:38 AM (9 years ago)
Author:
Peter
Message:

merge release 0.10 into trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/m4/yat_check_libbam.m4

    r2919 r2943  
    2121#   along with yat. If not, see <http://www.gnu.org/licenses/>.
    2222
     23# YAT_CHECK_HEADER_BAM([action-if-found], [action-if-not-found])
     24# ==============================================================
     25#
     26AC_DEFUN([YAT_CHECK_HEADER_BAM],
     27[
     28yat_bam_header=no
     29# check how to #include <bam.h>
     30AC_CHECK_HEADERS([bam/bam.h bam.h samtools/bam.h bam.h],
     31                 [yat_bam_header=yes; break])
     32AS_IF([test x$yat_bam_header = xyes], [$1], [$2])
     33]) # YAT_CHECK_HEADER_BAM
     34
    2335
    2436# YAT_CHECK_LIBBAM([action-if-found], [action-if-not-found])
     
    2739AC_DEFUN([YAT_CHECK_LIBBAM],
    2840[
     41AC_REQUIRE([YAT_CHECK_HEADER_BAM])
    2942BAM_LIBS=no
    3043AC_MSG_CHECKING([for library containing bam_header_destroy])
     
    3952  AC_MSG_RESULT([$BAM_LIBS])
    4053])
    41 AS_IF([test x"$BAM_LIBS" = false], [$2], [$1])
     54AS_IF([test x"$BAM_LIBS" = xno], [$2], [$1])
    4255]) # YAT_CHECK_LIBBAM
    4356
     
    5164save_LIBS=$LIBS
    5265LIBS="$1 $LIBS"
    53 AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@include <bam.h>],
    54                                 [bam_header_t* hdr = bam_header_init();
     66AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@if HAVE_BAM_H
     67                                 @%:@ include <bam.h>
     68                                 @%:@elif HAVE_BAM_BAM_H
     69                                 @%:@ include <bam/bam.h>
     70                                 @%:@elif HAVE_SAMTOOLS_BAM_H
     71                                 @%:@ include <samtools/bam.h>
     72                                 @%:@endif
     73                                ],[
     74                                 bam_header_t* hdr = bam_header_init();
    5575                                 bam_header_destroy(hdr);
    5676                                ])],
Note: See TracChangeset for help on using the changeset viewer.