To: vim-dev@vim.org Subject: Patch 7.2b.015 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.2b.015 Problem: Build fails on Mac when using Aap. Solution: Fix typo in configure script. Files: src/auto/configure, src/configure.in *** ../vim-7.2b.014/src/auto/configure Thu Jul 24 16:23:47 2008 --- src/auto/configure Thu Jul 24 14:40:36 2008 *************** *** 3946,3952 **** if test "$enable_darwin" = "yes"; then MACOSX=yes ! OS_EXTRA_SCR="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 --- 3946,3952 ---- if test "$enable_darwin" = "yes"; then MACOSX=yes ! 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 *** ../vim-7.2b.014/src/configure.in Thu Jul 24 16:23:47 2008 --- src/configure.in Thu Jul 24 14:40:26 2008 *************** *** 152,158 **** if test "$enable_darwin" = "yes"; then MACOSX=yes ! OS_EXTRA_SCR="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" --- 152,158 ---- if test "$enable_darwin" = "yes"; then MACOSX=yes ! 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" *** ../vim-7.2b.014/src/version.c Thu Jul 24 16:23:47 2008 --- src/version.c Thu Jul 24 17:19:08 2008 *************** *** 678,679 **** --- 678,681 ---- { /* Add new patch number below this line */ + /**/ + 15, /**/ -- Veni, Vidi, Video -- I came, I saw, I taped what I saw. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///