diff options
| -rw-r--r-- | Changelog-Trunk.txt | 5 | ||||
| -rwxr-xr-x | configure | 31 | ||||
| -rw-r--r-- | configure.in | 27 |
3 files changed, 58 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 92ae65a49..a0c012245 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,11 @@ 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/04/13 + * Changes to the configure script: [FlavioJS] + - clarified how --with-zlib is used + - added --enable-packetver to set the PACKETVER define (used often enough + to get it's own option, but unnecessary since it can be set with CFLAGS) + - added -g compiler option to --enable-debug * Changed LOG_ALL definition to really log everything [Toms] 2008/04/12 * Login will no longer set character offline when going from map @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 11985. +# From configure.in Revision: 12578 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -1254,6 +1254,8 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-manager=ARG memory managers: no, builtin, memwatch, dmalloc, gcollect, bcheck (defaults to builtin) + --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) @@ -1269,7 +1271,9 @@ Optional Packages: of pcre installation directory (by default pcre is used if found) --with-zlib=DIR root directory path of zlib installation (defaults - to /usr/local or /usr if not found in /usr/local) + to /usr/local or /usr if not found in /usr/local). + Assumes that the header files are in DIR/include and + the library files are in DIR/lib Some influential environment variables: CC C compiler command @@ -1743,6 +1747,19 @@ fi # +# packetver +# +# Check whether --enable-packetver was given. +if test "${enable_packetver+set}" = set; then + enableval=$enable_packetver; enable_packetver="$enableval" +else + enable_packetver="" + +fi + + + +# # mapregsql # # Check whether --enable-mapregsql was given. @@ -4361,6 +4378,14 @@ esac # +# Packetver +# +if test -n "$enable_packetver" ; then + CFLAGS="$CFLAGS -DPACKETVER=$enable_packetver" +fi + + +# # Mapregsql # if test "$enable_mapregsql" = "yes" ; then @@ -4372,7 +4397,7 @@ fi # Debug # if test "$enable_debug" = "yes" ; then - CFLAGS="$CFLAGS -DDEBUG" + CFLAGS="$CFLAGS -g -DDEBUG" fi diff --git a/configure.in b/configure.in index 2751d945e..ac0e7b436 100644 --- a/configure.in +++ b/configure.in @@ -37,6 +37,20 @@ AC_ARG_ENABLE( # +# packetver +# +AC_ARG_ENABLE( + [packetver], + AC_HELP_STRING( + [--enable-packetver=ARG], + [Sets the PACKETVER define of the map-server. (see src/map/clif.h)] + ), + [enable_packetver="$enableval"], + [enable_packetver=""] +) + + +# # mapregsql # AC_ARG_ENABLE( @@ -139,7 +153,8 @@ AC_ARG_WITH( [zlib], AC_HELP_STRING( [--with-zlib=DIR], - [root directory path of zlib installation (defaults to /usr/local or /usr if not found in /usr/local)] + [root directory path of zlib installation (defaults to /usr/local or /usr if not found in /usr/local). + Assumes that the header files are in DIR/include and the library files are in DIR/lib] ), [ test -n "$withval" && ZLIB_HOME="$withval" @@ -273,6 +288,14 @@ esac # +# Packetver +# +if test -n "$enable_packetver" ; then + CFLAGS="$CFLAGS -DPACKETVER=$enable_packetver" +fi + + +# # Mapregsql # if test "$enable_mapregsql" = "yes" ; then @@ -284,7 +307,7 @@ fi # Debug # if test "$enable_debug" = "yes" ; then - CFLAGS="$CFLAGS -DDEBUG" + CFLAGS="$CFLAGS -g -DDEBUG" fi |