jkunstle / rpms / vim

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