diff options
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rwxr-xr-x | configure | 22 | ||||
| -rw-r--r-- | configure.in | 12 |
3 files changed, 20 insertions, 17 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index c6f705e31..dd6514e84 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2008/05/26 + * Updating configure script: [FlavioJS] + - fixed memory manager using the argument of the last enable/disable option (any option) + - other minor changes * Increased the allowed packet size for chat messages [ultramage] - changed the capacity of the message column in chatlog (see sql update) 2008/05/25 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 12586 . +# From configure.in Revision: 12729 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -1257,9 +1257,9 @@ Optional Features: --enable-packetver=ARG Sets the PACKETVER define of the map-server. (see src/map/clif.h) --enable-mapregsql Makes map-wide script variables be saved to SQL - instead of TXT files in the sql map-server. (defauts - to no) - --enable-debug Compiles in debug mode. (defauts to no) + instead of TXT files in the sql map-server. + (disabled by default) + --enable-debug Compiles in debug mode. (disabled by default) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1738,8 +1738,8 @@ if test "${enable_manager+set}" = set; then "dmalloc");; "gcollect");; "bcheck");; - *) { { echo "$as_me:$LINENO: error: unknown memory manager '$enable_manager'... stopping" >&5 -echo "$as_me: error: unknown memory manager '$enable_manager'... stopping" >&2;} + *) { { echo "$as_me:$LINENO: error: unknown memory manager '$enableval'... stopping" >&5 +echo "$as_me: error: unknown memory manager '$enableval'... stopping" >&2;} { (exit 1); exit 1; }; };; esac @@ -1773,8 +1773,8 @@ if test "${enable_mapregsql+set}" = set; then case $enableval in no);; yes);; - *) { { echo "$as_me:$LINENO: error: invalid argument --enable-mapregsql=$enable_mapregsql... stopping" >&5 -echo "$as_me: error: invalid argument --enable-mapregsql=$enable_mapregsql... stopping" >&2;} + *) { { echo "$as_me:$LINENO: error: invalid argument --enable-mapregsql=$enableval... stopping" >&5 +echo "$as_me: error: invalid argument --enable-mapregsql=$enableval... stopping" >&2;} { (exit 1); exit 1; }; };; esac @@ -1795,8 +1795,8 @@ if test "${enable_debug+set}" = set; then case $enableval in no);; yes);; - *) { { echo "$as_me:$LINENO: error: invalid argument --enable-debug=$enable_mapregsql... stopping" >&5 -echo "$as_me: error: invalid argument --enable-debug=$enable_mapregsql... stopping" >&2;} + *) { { echo "$as_me:$LINENO: error: invalid argument --enable-debug=$enableval... stopping" >&5 +echo "$as_me: error: invalid argument --enable-debug=$enableval... stopping" >&2;} { (exit 1); exit 1; }; };; esac @@ -3989,7 +3989,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # # Memory manager # -case $enableval in +case $enable_manager in "no") CFLAGS="$CFLAGS -DNO_MEMMGR" ;; diff --git a/configure.in b/configure.in index 6bc3d3918..5134ee3cc 100644 --- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ AC_ARG_ENABLE( "dmalloc");; "gcollect");; "bcheck");; - *) AC_MSG_ERROR([[unknown memory manager '$enable_manager'... stopping]]);; + *) AC_MSG_ERROR([[unknown memory manager '$enableval'... stopping]]);; esac ], [enable_manager="builtin"] @@ -57,14 +57,14 @@ AC_ARG_ENABLE( [mapregsql], AC_HELP_STRING( [--enable-mapregsql], - [Makes map-wide script variables be saved to SQL instead of TXT files in the sql map-server. (defauts to no)] + [Makes map-wide script variables be saved to SQL instead of TXT files in the sql map-server. (disabled by default)] ), [ enable_mapregsql="$enableval" case $enableval in no);; yes);; - *) AC_MSG_ERROR([[invalid argument --enable-mapregsql=$enable_mapregsql... stopping]]);; + *) AC_MSG_ERROR([[invalid argument --enable-mapregsql=$enableval... stopping]]);; esac ], [enable_mapregsql="no"] @@ -78,14 +78,14 @@ AC_ARG_ENABLE( [debug], AC_HELP_STRING( [--enable-debug], - [Compiles in debug mode. (defauts to no)] + [Compiles in debug mode. (disabled by default)] ), [ enable_debug="$enableval" case $enableval in no);; yes);; - *) AC_MSG_ERROR([[invalid argument --enable-debug=$enable_mapregsql... stopping]]);; + *) AC_MSG_ERROR([[invalid argument --enable-debug=$enableval... stopping]]);; esac ], [enable_debug="no"] @@ -294,7 +294,7 @@ AC_COMPILE_IFELSE( # # Memory manager # -case $enableval in +case $enable_manager in "no") CFLAGS="$CFLAGS -DNO_MEMMGR" ;; |