# HG changeset patch # User vimboss # Date 1216912850 0 # Node ID 81059e8b657d911c9876f557975f34624988624f # Parent fe4ebbec775a55ba5d9bec6070d8d87dc28138f9 updated for version 7.2b-015 diff --git a/src/auto/configure b/src/auto/configure --- a/src/auto/configure +++ b/src/auto/configure @@ -3946,7 +3946,7 @@ rm -f core conftest.err conftest.$ac_obj if test "$enable_darwin" = "yes"; then MACOSX=yes - OS_EXTRA_SCR="os_macosx.c os_mac_conv.c"; + OS_EXTRA_SRC="os_macosx.c os_mac_conv.c"; OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o" CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp" if test "x$MACARCH" = "xboth"; then diff --git a/src/configure.in b/src/configure.in --- a/src/configure.in +++ b/src/configure.in @@ -152,7 +152,7 @@ if test "`(uname) 2>/dev/null`" = Darwin if test "$enable_darwin" = "yes"; then MACOSX=yes - OS_EXTRA_SCR="os_macosx.c os_mac_conv.c"; + OS_EXTRA_SRC="os_macosx.c os_mac_conv.c"; OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o" dnl TODO: use -arch i386 on Intel machines CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -no-cpp-precomp" diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 15, +/**/ 14, /**/ 13,