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