Skip to content

Commit eec2981

Browse files
committed
patch 7.4.2105
Problem: Configure reports default features to be "normal" while it is "huge". Solution: Change the default text.
1 parent 97baee8 commit eec2981

3 files changed

Lines changed: 17 additions & 3 deletions

File tree

src/auto/configure

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -757,6 +757,7 @@ infodir
757757
docdir
758758
oldincludedir
759759
includedir
760+
runstatedir
760761
localstatedir
761762
sharedstatedir
762763
sysconfdir
@@ -888,6 +889,7 @@ datadir='${datarootdir}'
888889
sysconfdir='${prefix}/etc'
889890
sharedstatedir='${prefix}/com'
890891
localstatedir='${prefix}/var'
892+
runstatedir='${localstatedir}/run'
891893
includedir='${prefix}/include'
892894
oldincludedir='/usr/include'
893895
docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1140,6 +1142,15 @@ do
11401142
| -silent | --silent | --silen | --sile | --sil)
11411143
silent=yes ;;
11421144

1145+
-runstatedir | --runstatedir | --runstatedi | --runstated \
1146+
| --runstate | --runstat | --runsta | --runst | --runs \
1147+
| --run | --ru | --r)
1148+
ac_prev=runstatedir ;;
1149+
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1150+
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1151+
| --run=* | --ru=* | --r=*)
1152+
runstatedir=$ac_optarg ;;
1153+
11431154
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
11441155
ac_prev=sbindir ;;
11451156
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1277,7 +1288,7 @@ fi
12771288
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
12781289
datadir sysconfdir sharedstatedir localstatedir includedir \
12791290
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1280-
libdir localedir mandir
1291+
libdir localedir mandir runstatedir
12811292
do
12821293
eval ac_val=\$$ac_var
12831294
# Remove trailing slashes.
@@ -1430,6 +1441,7 @@ Fine tuning of the installation directories:
14301441
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
14311442
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
14321443
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1444+
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
14331445
--libdir=DIR object code libraries [EPREFIX/lib]
14341446
--includedir=DIR C header files [PREFIX/include]
14351447
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1512,7 +1524,7 @@ Optional Packages:
15121524
--with-view-name=NAME what to call the View executable
15131525
--with-global-runtime=DIR global runtime directory in 'runtimepath'
15141526
--with-modified-by=NAME name of who modified a release version
1515-
--with-features=TYPE tiny, small, normal, big or huge (default: normal)
1527+
--with-features=TYPE tiny, small, normal, big or huge (default: huge)
15161528
--with-compiledby=NAME name to show in :version message
15171529
--with-lua-prefix=PFX Prefix where Lua is installed.
15181530
--with-luajit Link with LuaJIT instead of Lua.

src/configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ fi
437437
dnl Check user requested features.
438438

439439
AC_MSG_CHECKING(--with-features argument)
440-
AC_ARG_WITH(features, [ --with-features=TYPE tiny, small, normal, big or huge (default: normal)],
440+
AC_ARG_WITH(features, [ --with-features=TYPE tiny, small, normal, big or huge (default: huge)],
441441
features="$withval"; AC_MSG_RESULT($features),
442442
features="huge"; AC_MSG_RESULT(Defaulting to huge))
443443

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -758,6 +758,8 @@ static char *(features[]) =
758758

759759
static int included_patches[] =
760760
{ /* Add new patch number below this line */
761+
/**/
762+
2105,
761763
/**/
762764
2104,
763765
/**/

0 commit comments

Comments
 (0)