updated for version 7.3.1300

Problem:    Mac: tiny and small build fails.
Solution:   Don't include os_macosx.m in tiny build. Include mouse support in
            small build. (Kazunobu Kuriyama)

diff --git a/src/auto/configure b/src/auto/configure
index e93173fe1e006368376eb9ed9a32b03184b16a63..4e29d0b53558505ca3d681c54c0c520c2a6336e4 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -12673,6 +12673,10 @@ $as_echo "yes" >&6; }
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+  fi
+        if test "x$features" = "xtiny"; then
+    OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'`
+    OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'`
   fi
 fi
 if test "x$MACARCH" = "xboth" && test "x$GUITYPE" = "xCARBONGUI"; then

diff --git a/src/configure.in b/src/configure.in
index f1720ced56322b12cd0f4785b331eb4274b326a5..2fe5a9d8e20942c74c96cb50c26915cb4441f85b 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -3698,6 +3698,13 @@ if test "x$MACOSX" = "xyes"; then
   else
     AC_MSG_RESULT(no)
   fi
+  dnl As mentioned above, tiny build implies os_macosx.m isn't needed.  
+  dnl Exclude it from OS_EXTRA_SRC so that linker won't complain about
+  dnl missing Objective-C symbols.
+  if test "x$features" = "xtiny"; then
+    OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'`
+    OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'`
+  fi
 fi
 if test "x$MACARCH" = "xboth" && test "x$GUITYPE" = "xCARBONGUI"; then
   LDFLAGS="$LDFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"

diff --git a/src/version.c b/src/version.c
index 5a99da411ffb5e62666efb598735d29e054c5ac8..10da53dfbde777fbe59d0e64953d64e1f169a4ad 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1300,
 /**/
     1299,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 3f01ab737d56c303c36d20f1499e5ffb6852bd3e..1555defda0dd4b350087ee3f5fd751a6fdd4d25c 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -101,6 +101,9 @@
 # endif
 # ifndef FEAT_CLIPBOARD
 #  define FEAT_CLIPBOARD
+#  if defined(FEAT_SMALL) && !defined(FEAT_MOUSE)
+#   define FEAT_MOUSE
+#  endif
 # endif
 #endif
 #if defined(MACOS_X) || defined(MACOS_CLASSIC)