*** ./src/htscore.c.ORIG	Fri Oct  6 16:15:34 2017
--- ./src/htscore.c	Fri Oct  6 16:16:08 2017
***************
*** 2616,2622 ****
    file[i + 1] = '\0';
  
    /* Check the final dir */
!   if (STAT(file, &st) == 0 && S_ISDIR(st.st_mode)) {
      return 1;                   /* EXISTS */
    }
    errno = err;
--- 2616,2622 ----
    file[i + 1] = '\0';
  
    /* Check the final dir */
!   if (stat(file, &st) == 0 && S_ISDIR(st.st_mode)) {
      return 1;                   /* EXISTS */
    }
    errno = err;
***************
*** 2763,2769 ****
    file[i + 1] = '\0';
  
    /* First check the final dir */
!   if (STAT(file, &st) == 0 && S_ISDIR(st.st_mode)) {
      return 0;                   /* OK */
    }
  
--- 2763,2769 ----
    file[i + 1] = '\0';
  
    /* First check the final dir */
!   if (stat(file, &st) == 0 && S_ISDIR(st.st_mode)) {
      return 0;                   /* OK */
    }
  
***************
*** 2809,2815 ****
      if (end_char != 0) {
        file[i] = '\0';
      }
!     if (STAT(file, &st) == 0) { /* Something exists */
        if (!S_ISDIR(st.st_mode)) {
  #if HTS_REMOVE_ANNOYING_INDEX
          if (S_ISREG(st.st_mode)) {      /* Regular file in place ; move it and create directory */
--- 2809,2815 ----
      if (end_char != 0) {
        file[i] = '\0';
      }
!     if (stat(file, &st) == 0) { /* Something exists */
        if (!S_ISDIR(st.st_mode)) {
  #if HTS_REMOVE_ANNOYING_INDEX
          if (S_ISREG(st.st_mode)) {      /* Regular file in place ; move it and create directory */
*** ./src/htslib.c.ORIG	Fri Oct  6 16:16:42 2017
--- ./src/htslib.c	Fri Oct  6 16:17:22 2017
***************
*** 2793,2799 ****
    STRUCT_STAT buf;
  
    date[0] = '\0';
!   if (STAT(file, &buf) == 0) {
      struct tm *A;
      time_t tt = buf.st_mtime;
  
--- 2793,2799 ----
    STRUCT_STAT buf;
  
    date[0] = '\0';
!   if (stat(file, &buf) == 0) {
      struct tm *A;
      time_t tt = buf.st_mtime;
  
***************
*** 4297,4303 ****
    STRUCT_STAT st;
  
    memset(&st, 0, sizeof(st));
!   if (STAT(fconv(catbuff, sizeof(catbuff), s), &st) == 0) {
      if (S_ISREG(st.st_mode)) {
        return 1;
      } else {
--- 4297,4303 ----
    STRUCT_STAT st;
  
    memset(&st, 0, sizeof(st));
!   if (stat(fconv(catbuff, sizeof(catbuff), s), &st) == 0) {
      if (S_ISREG(st.st_mode)) {
        return 1;
      } else {
***************
*** 4329,4335 ****
  
    if (!strnotempty(s))          // nom vide: erreur
      return -1;
!   if (STAT(s, &st) == 0 && S_ISREG(st.st_mode)) {
      return st.st_size;
    } else {
      return -1;
--- 4329,4335 ----
  
    if (!strnotempty(s))          // nom vide: erreur
      return -1;
!   if (stat(s, &st) == 0 && S_ISREG(st.st_mode)) {
      return st.st_size;
    } else {
      return -1;
*** ./src/htstools.c.ORIG	Fri Oct  6 16:17:43 2017
--- ./src/htstools.c	Fri Oct  6 16:18:06 2017
***************
*** 1222,1228 ****
      memset(&(find->filestat), 0, sizeof(find->filestat));
      if ((find->dirp = readdir(find->hdir)))
        if (find->dirp->d_name)
!         if (!STAT
              (concat(catbuff, sizeof(catbuff), find->path, find->dirp->d_name), &find->filestat))
            return 1;
  #endif
--- 1222,1228 ----
      memset(&(find->filestat), 0, sizeof(find->filestat));
      if ((find->dirp = readdir(find->hdir)))
        if (find->dirp->d_name)
!         if (!stat
              (concat(catbuff, sizeof(catbuff), find->path, find->dirp->d_name), &find->filestat))
            return 1;
  #endif
*** ./configure.ORIG	Fri Oct  6 16:22:02 2017
--- ./configure	Fri Oct  6 16:22:22 2017
***************
*** 13204,13210 ****
  else
  
    ax_check_save_flags=$CFLAGS
!   CFLAGS="$CFLAGS  -rdynamic"
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
--- 13204,13210 ----
  else
  
    ax_check_save_flags=$CFLAGS
!   CFLAGS="$CFLAGS"
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */