Merged the /loginmerge branch (topic:192754)

 * the login server storage, ipban and logging systems have been abstracted and now provide a common interface; the rest has been merged into a single login server core (no more login/login_sql duplicity)
 * storage systems are now added via compiler options (WITH_SQL / WITH_TXT)
 * multiple storage engines can be compiled in at the same time, and the config option account.engine defines which one will be used.
 * due to MySQL autoincrement limitations, accounts with id '0' will not be supported; account IDs from this point on should start from '1'.
 * login_log() functions now again record IP addresses in dotted format, not as 4-byte integers (undo from r6868).
 * removed config options that defined column names in the login table
 * removed `memo` and `error message` columns from login db/savefile
 * moved `loginlog` table to the logs database
 * added sql files upgrade_svn12975.sql and upgrade_svn12975_log.sql
 * due to changes to the login table layout, I added an !optional! sql file (upgrade_svn12975_view.sql) that will provide a certain degree of backwards compatibility with existing software; read the instructions inside carefully!
 * moved third-party includes/libs to a separate directory
 * updated project files / makefiles

Changed the way GM levels are handled
 * removed conf/gm_account.txt
 * added the gm level column to the txt savefile (after 'email' column)
 * gm level information is now transferred along with account data
 
For open problems see bugreport:1889.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13000 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 36 insertions, 5 deletions

diff --git a/configure b/configure
index 39e0ecdcd..290958782 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 12803 .
+# From configure.in Revision: 12731 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -663,6 +663,7 @@ OBJEXT
 CPP
 GREP
 EGREP
+HAVE_OPENRJ_TXT
 MYSQL_CONFIG_HOME
 HAVE_MYSQL
 MYSQL_VERSION
@@ -1259,7 +1260,9 @@ Optional Features:
   --enable-mapregsql      Makes map-wide script variables be saved to SQL
                           instead of TXT files in the sql map-server.
                           (disabled by default)
-  --enable-debug          Compiles in debug mode. (disabled by default)
+  --enable-debug          Compiles extra debug code. (disabled by default)
+  --disable-openrj-txt    Disables the openrj-based account engine in the TXT
+                          login-server (enabled by default)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1718,7 +1721,7 @@ ac_config_files="$ac_config_files Makefile src/common/Makefile"
 
 ac_config_files="$ac_config_files src/char/Makefile src/login/Makefile src/ladmin/Makefile"
 
-ac_config_files="$ac_config_files src/char_sql/Makefile src/login_sql/Makefile src/txt-converter/Makefile"
+ac_config_files="$ac_config_files src/char_sql/Makefile src/txt-converter/Makefile"
 
 ac_config_files="$ac_config_files src/map/Makefile src/plugins/Makefile src/tool/Makefile"
 
@@ -1808,6 +1811,28 @@ fi
 
 
 #
+# OpenRJ account engine in the txt login server
+#
+# Check whether --enable-openrj-txt was given.
+if test "${enable_openrj_txt+set}" = set; then
+  enableval=$enable_openrj_txt;
+		HAVE_OPENRJ_TXT="$enableval"
+		case $enableval in
+			no);;
+			yes);;
+			*) { { echo "$as_me:$LINENO: error: invalid argument --enable-openrj-txt=$enableval... stopping" >&5
+echo "$as_me: error: invalid argument --enable-openrj-txt=$enableval... stopping" >&2;}
+   { (exit 1); exit 1; }; };;
+		esac
+
+else
+  HAVE_OPENRJ_TXT="yes"
+
+fi
+
+
+
+#
 # Enable/disable MySql and optionally specify the path to mysql_config (optional library)
 #
 
@@ -4531,6 +4556,12 @@ fi
 
 
 #
+# OpenRJ account engine in the txt login server
+#
+
+
+
+#
 # zlib library (required)
 #
 if test -n "${ZLIB_HOME}" ; then
@@ -6002,7 +6033,6 @@ do
     "src/login/Makefile") CONFIG_FILES="$CONFIG_FILES src/login/Makefile" ;;
     "src/ladmin/Makefile") CONFIG_FILES="$CONFIG_FILES src/ladmin/Makefile" ;;
     "src/char_sql/Makefile") CONFIG_FILES="$CONFIG_FILES src/char_sql/Makefile" ;;
-    "src/login_sql/Makefile") CONFIG_FILES="$CONFIG_FILES src/login_sql/Makefile" ;;
     "src/txt-converter/Makefile") CONFIG_FILES="$CONFIG_FILES src/txt-converter/Makefile" ;;
     "src/map/Makefile") CONFIG_FILES="$CONFIG_FILES src/map/Makefile" ;;
     "src/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/Makefile" ;;
@@ -6115,6 +6145,7 @@ OBJEXT!$OBJEXT$ac_delim
 CPP!$CPP$ac_delim
 GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
+HAVE_OPENRJ_TXT!$HAVE_OPENRJ_TXT$ac_delim
 MYSQL_CONFIG_HOME!$MYSQL_CONFIG_HOME$ac_delim
 HAVE_MYSQL!$HAVE_MYSQL$ac_delim
 MYSQL_VERSION!$MYSQL_VERSION$ac_delim
@@ -6128,7 +6159,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5