3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.062
3ef2ca
Fcc: outbox
3ef2ca
From: Bram Moolenaar <Bram@moolenaar.net>
3ef2ca
Mime-Version: 1.0
3ef2ca
Content-Type: text/plain; charset=UTF-8
3ef2ca
Content-Transfer-Encoding: 8bit
3ef2ca
------------
3ef2ca
3ef2ca
Patch 7.4.062 (after 7.4.061)
3ef2ca
Problem:    Configure check for AvailabilityMacros.h is wrong.
3ef2ca
Solution:   Use AC_CHECK_HEADERS().
3ef2ca
Files:      src/configure.in, src/auto/configure
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.061/src/configure.in	2013-11-03 00:40:54.000000000 +0100
3ef2ca
--- src/configure.in	2013-11-03 20:19:42.000000000 +0100
3ef2ca
***************
3ef2ca
*** 230,236 ****
3ef2ca
  
3ef2ca
  dnl Mac OS X 10.9+ no longer include AvailabilityMacros.h in Carbon
3ef2ca
  dnl so we need to include it to have access to version macros.
3ef2ca
! AC_CHECK_HEADER(AvailabilityMacros.h, HAVE_AVAILABILITYMACROS_H=1)
3ef2ca
  
3ef2ca
  AC_SUBST(OS_EXTRA_SRC)
3ef2ca
  AC_SUBST(OS_EXTRA_OBJ)
3ef2ca
--- 230,236 ----
3ef2ca
  
3ef2ca
  dnl Mac OS X 10.9+ no longer include AvailabilityMacros.h in Carbon
3ef2ca
  dnl so we need to include it to have access to version macros.
3ef2ca
! AC_CHECK_HEADERS(AvailabilityMacros.h)
3ef2ca
  
3ef2ca
  AC_SUBST(OS_EXTRA_SRC)
3ef2ca
  AC_SUBST(OS_EXTRA_OBJ)
3ef2ca
*** ../vim-7.4.061/src/auto/configure	2013-11-03 00:40:54.000000000 +0100
3ef2ca
--- src/auto/configure	2013-11-03 20:22:56.000000000 +0100
3ef2ca
***************
3ef2ca
*** 4263,4273 ****
3ef2ca
  $as_echo "no" >&6; }
3ef2ca
  fi
3ef2ca
  
3ef2ca
! ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default"
3ef2ca
  if test "x$ac_cv_header_AvailabilityMacros_h" = x""yes; then :
3ef2ca
!   HAVE_AVAILABILITYMACROS_H=1
3ef2ca
  fi
3ef2ca
  
3ef2ca
  
3ef2ca
  
3ef2ca
  
3ef2ca
--- 4263,4279 ----
3ef2ca
  $as_echo "no" >&6; }
3ef2ca
  fi
3ef2ca
  
3ef2ca
! for ac_header in AvailabilityMacros.h
3ef2ca
! do :
3ef2ca
!   ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default"
3ef2ca
  if test "x$ac_cv_header_AvailabilityMacros_h" = x""yes; then :
3ef2ca
!   cat >>confdefs.h <<_ACEOF
3ef2ca
! #define HAVE_AVAILABILITYMACROS_H 1
3ef2ca
! _ACEOF
3ef2ca
! 
3ef2ca
  fi
3ef2ca
  
3ef2ca
+ done
3ef2ca
  
3ef2ca
  
3ef2ca
  
3ef2ca
*** ../vim-7.4.061/src/version.c	2013-11-03 00:40:54.000000000 +0100
3ef2ca
--- src/version.c	2013-11-03 20:25:31.000000000 +0100
3ef2ca
***************
3ef2ca
*** 740,741 ****
3ef2ca
--- 740,743 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     62,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
Yesterday, all my deadlines seemed so far away
3ef2ca
now it looks as though it's freeze in four days
3ef2ca
oh I believe in cvs..
3ef2ca
    [ CVS log "Beatles style" for FreeBSD ports/INDEX, Satoshi Asami ]
3ef2ca
3ef2ca
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3ef2ca
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3ef2ca
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
3ef2ca
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///