vim/patches/vim-7.3.381.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.381
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.381
  11 Problem:    Configure silently skips interfaces that won't work.
  12 Solution:   Add the --enable-fail_if_missing argument. (Shlomi Fish)
  13 Files:      src/Makefile, src/configure.in, src/auto/configure
  14
  15
  16 *** ../vim-7.3.380/src/Makefile 2011-12-08 15:17:28.000000000 +0100
  17 --- src/Makefile        2011-12-14 20:49:26.000000000 +0100
  18 ***************
  19 *** 389,394 ****
  20 --- 389,399 ----
  21   #CONF_OPT_PLTHOME  = --with-plthome=/usr/local/drscheme
  22   #CONF_OPT_PLTHOME  = --with-plthome=/home/me/mz
  23
  24 + # Uncomment the next line to fail if one of the requested language interfaces
  25 + # cannot be configured.  Without this Vim will be build anyway, without
  26 + # the failing interfaces.
  27 + #CONF_OPT_FAIL = --enable-fail-if-missing
  28 +
  29   # PERL
  30   # Uncomment one of these when you want to include the Perl interface.
  31   # First one is for static linking, second one for dynamic loading.
  32 ***************
  33 *** 1648,1654 ****
  34                 CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
  35                 LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \
  36                 ./configure $(CONF_OPT_GUI) $(CONF_OPT_X) $(CONF_OPT_XSMP) \
  37 !               $(CONF_OPT_DARWIN) $(CONF_OPT_PERL) $(CONF_OPT_PYTHON) $(CONF_OPT_PYTHON3) \
  38                 $(CONF_OPT_TCL) $(CONF_OPT_RUBY) $(CONF_OPT_NLS) \
  39                 $(CONF_OPT_CSCOPE) $(CONF_OPT_MULTIBYTE) $(CONF_OPT_INPUT) \
  40                 $(CONF_OPT_OUTPUT) $(CONF_OPT_GPM) $(CONF_OPT_WORKSHOP) \
  41 --- 1653,1660 ----
  42                 CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
  43                 LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \
  44                 ./configure $(CONF_OPT_GUI) $(CONF_OPT_X) $(CONF_OPT_XSMP) \
  45 !               $(CONF_OPT_DARWIN) $(CONF_OPT_FAIL) \
  46 !               $(CONF_OPT_PERL) $(CONF_OPT_PYTHON) $(CONF_OPT_PYTHON3) \
  47                 $(CONF_OPT_TCL) $(CONF_OPT_RUBY) $(CONF_OPT_NLS) \
  48                 $(CONF_OPT_CSCOPE) $(CONF_OPT_MULTIBYTE) $(CONF_OPT_INPUT) \
  49                 $(CONF_OPT_OUTPUT) $(CONF_OPT_GPM) $(CONF_OPT_WORKSHOP) \
  50 *** ../vim-7.3.380/src/configure.in     2011-12-14 19:22:29.000000000 +0100
  51 --- src/configure.in    2011-12-14 20:46:36.000000000 +0100
  52 ***************
  53 *** 28,33 ****
  54 --- 28,43 ----
  55   AC_HEADER_STDC
  56   AC_HEADER_SYS_WAIT
  57
  58 + dnl Check for the flag that fails if stuff are missing.
  59 +
  60 + AC_MSG_CHECKING(--enable-fail-if-missing argument)
  61 + AC_ARG_ENABLE(fail_if_missing,
  62 +       [  --enable-fail-if-missing    Fail if dependencies on additional features
  63 +      specified on the command line are missing.],
  64 +       [fail_if_missing="yes"],
  65 +       [fail_if_missing="no"])
  66 + AC_MSG_RESULT($fail_if_missing)
  67 +
  68   dnl Set default value for CFLAGS if none is defined or it's empty
  69   if test -z "$CFLAGS"; then
  70     CFLAGS="-O"
  71 ***************
  72 *** 491,496 ****
  73 --- 501,509 ----
  74         LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua${vi_cv_version_lua}.so$LUA_SONAME\\\" $LUA_CFLAGS"
  75       fi
  76     fi
  77 +   if test "$fail_if_missing" = "yes" -a -z "$LUA_SRC"; then
  78 +     AC_MSG_ERROR([could not configure lua])
  79 +   fi
  80     AC_SUBST(LUA_SRC)
  81     AC_SUBST(LUA_OBJ)
  82     AC_SUBST(LUA_PRO)
  83 ***************
  84 *** 781,786 ****
  85 --- 794,803 ----
  86         PERL_CFLAGS="-DDYNAMIC_PERL_DLL=\\\"$libperl\\\" $PERL_CFLAGS"
  87       fi
  88     fi
  89 +
  90 +   if test "$fail_if_missing" = "yes" -a "$perl_ok" != "yes"; then
  91 +     AC_MSG_ERROR([could not configure perl])
  92 +   fi
  93   fi
  94   AC_SUBST(shrpenv)
  95   AC_SUBST(PERL_SRC)
  96 ***************
  97 *** 966,971 ****
  98 --- 983,992 ----
  99         AC_MSG_RESULT(too old)
 100       fi
 101     fi
 102 +
 103 +   if test "$fail_if_missing" = "yes" -a "$python_ok" != "yes"; then
 104 +     AC_MSG_ERROR([could not configure python])
 105 +   fi
 106   fi
 107
 108   AC_SUBST(PYTHON_CONFDIR)
 109 ***************
 110 *** 1389,1394 ****
 111 --- 1410,1418 ----
 112         AC_MSG_RESULT(too old; need Tcl version 8.0 or later)
 113       fi
 114     fi
 115 +   if test "$fail_if_missing" = "yes" -a -z "$TCL_SRC"; then
 116 +     AC_MSG_ERROR([could not configure Tcl])
 117 +   fi
 118   fi
 119   AC_SUBST(TCL_SRC)
 120   AC_SUBST(TCL_OBJ)
 121 ***************
 122 *** 1469,1474 ****
 123 --- 1493,1502 ----
 124         AC_MSG_RESULT(too old; need Ruby version 1.6.0 or later)
 125       fi
 126     fi
 127 +
 128 +   if test "$fail_if_missing" = "yes" -a -z "$RUBY_OBJ"; then
 129 +     AC_MSG_ERROR([could not configure Ruby])
 130 +   fi
 131   fi
 132   AC_SUBST(RUBY_SRC)
 133   AC_SUBST(RUBY_OBJ)
 134 *** ../vim-7.3.380/src/auto/configure   2011-12-14 19:22:29.000000000 +0100
 135 --- src/auto/configure  2011-12-14 20:49:51.000000000 +0100
 136 ***************
 137 *** 741,746 ****
 138 --- 741,747 ----
 139   ac_subst_files=''
 140   ac_user_opts='
 141   enable_option_checking
 142 + enable_fail_if_missing
 143   enable_darwin
 144   with_mac_arch
 145   with_developer_dir
 146 ***************
 147 *** 1418,1423 ****
 148 --- 1419,1426 ----
 149     --disable-option-checking  ignore unrecognized --enable/--with options
 150     --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
 151     --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
 152 +   --enable-fail-if-missing    Fail if dependencies on additional features
 153 +      specified on the command line are missing.
 154     --disable-darwin        Disable Darwin (Mac OS X) support.
 155     --disable-selinux     Don't check for SELinux support.
 156     --disable-xsmp          Disable XSMP session management
 157 ***************
 158 *** 3949,3954 ****
 159 --- 3952,3970 ----
 160   fi
 161
 162
 163 +
 164 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-fail-if-missing argument" >&5
 165 + $as_echo_n "checking --enable-fail-if-missing argument... " >&6; }
 166 + # Check whether --enable-fail_if_missing was given.
 167 + if test "${enable_fail_if_missing+set}" = set; then :
 168 +   enableval=$enable_fail_if_missing; fail_if_missing="yes"
 169 + else
 170 +   fail_if_missing="no"
 171 + fi
 172 +
 173 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fail_if_missing" >&5
 174 + $as_echo "$fail_if_missing" >&6; }
 175 +
 176   if test -z "$CFLAGS"; then
 177     CFLAGS="-O"
 178     test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall"
 179 ***************
 180 *** 4727,4732 ****
 181 --- 4743,4751 ----
 182         LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua${vi_cv_version_lua}.so$LUA_SONAME\\\" $LUA_CFLAGS"
 183       fi
 184     fi
 185 +   if test "$fail_if_missing" = "yes" -a -z "$LUA_SRC"; then
 186 +     as_fn_error "could not configure lua" "$LINENO" 5
 187 +   fi
 188
 189
 190
 191 ***************
 192 *** 5140,5145 ****
 193 --- 5159,5168 ----
 194         PERL_CFLAGS="-DDYNAMIC_PERL_DLL=\\\"$libperl\\\" $PERL_CFLAGS"
 195       fi
 196     fi
 197 +
 198 +   if test "$fail_if_missing" = "yes" -a "$perl_ok" != "yes"; then
 199 +     as_fn_error "could not configure perl" "$LINENO" 5
 200 +   fi
 201   fi
 202
 203
 204 ***************
 205 *** 5429,5434 ****
 206 --- 5452,5461 ----
 207   $as_echo "too old" >&6; }
 208       fi
 209     fi
 210 +
 211 +   if test "$fail_if_missing" = "yes" -a "$python_ok" != "yes"; then
 212 +     as_fn_error "could not configure python" "$LINENO" 5
 213 +   fi
 214   fi
 215
 216
 217 ***************
 218 *** 6216,6221 ****
 219 --- 6243,6251 ----
 220   $as_echo "too old; need Tcl version 8.0 or later" >&6; }
 221       fi
 222     fi
 223 +   if test "$fail_if_missing" = "yes" -a -z "$TCL_SRC"; then
 224 +     as_fn_error "could not configure Tcl" "$LINENO" 5
 225 +   fi
 226   fi
 227
 228
 229 ***************
 230 *** 6353,6358 ****
 231 --- 6383,6392 ----
 232   $as_echo "too old; need Ruby version 1.6.0 or later" >&6; }
 233       fi
 234     fi
 235 +
 236 +   if test "$fail_if_missing" = "yes" -a -z "$RUBY_OBJ"; then
 237 +     as_fn_error "could not configure Ruby" "$LINENO" 5
 238 +   fi
 239   fi
 240
 241
 242 *** ../vim-7.3.380/src/version.c        2011-12-14 20:21:29.000000000 +0100
 243 --- src/version.c       2011-12-14 20:50:42.000000000 +0100
 244 ***************
 245 *** 716,717 ****
 246 --- 716,719 ----
 247   {   /* Add new patch number below this line */
 248 + /**/
 249 +     381,
 250   /**/
 251
 252 --
 253 The psychic said, "God bless you."  I said, "I didn't sneeze."  She
 254 looked deep into my eyes and said, "You will, eventually."  And, damn
 255 if she wasn't right.  Two days later, I sneezed.  --Ellen Degeneres
 256
 257  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 258 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 259 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
 260  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///