* Added `--enable-buildbot` to configure.in (follow-up to r15128).

 * Fixed TXT-removal branch configure and Makefile errors and removed TXT-only leftovers.
 * SQL libs are now required to configure/make TXT-removal branch.

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

2 files changed, 40 insertions, 8 deletions

diff --git a/configure b/configure
index 348dcb804..cc3891e63 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 14870 .
+# From configure.in Revision: 15238 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -272,7 +272,7 @@ PACKAGE_VERSION=
 PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 
-ac_unique_file="eAthena"
+ac_unique_file="rAthena"
 ac_unique_file="src/common/cbasetypes.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
@@ -849,6 +849,8 @@ Optional Features:
   --enable-debug[=ARG]
                           Compiles extra debug code. (disabled by default)
                           (available options: yes, no, gdb)
+  --enable-buildbot[=ARG]
+                          (available options: yes, no)
   --enable-rdtsc          Uses rdtsc as timing source (disabled by default)
                           Enable it when you've timing issues. (For example:
                           in conjunction with XEN or Other Virtualization
@@ -1405,8 +1407,9 @@ else
 fi;
 
 #
-# BuildBot
+# Buildbot
 #
+# Check whether --enable-buildbot or --disable-buildbot was given.
 if test "${enable_buildbot+set}" = set; then
   enableval="$enable_buildbot"
 
@@ -1424,7 +1427,6 @@ else
 
 fi;
 
-
 #
 # RDTSC as Tick Source
 #
@@ -4495,14 +4497,13 @@ esac
 #
 case $enable_buildbot in
 	"no")
-		#default value
+		# default value
 		;;
 	"yes")
-		CFLAGS="$CFLAGS -g -DBUILDBOT"
+		CFLAGS="$CFLAGS -DBUILDBOT"
 		;;
 esac
 
-
 #
 # RDTSC
 #
diff --git a/configure.in b/configure.in
index 3aff089db..8872e7c8c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(eAthena)
+AC_INIT(rAthena)
 AC_REVISION($Revision$)
 AC_PREREQ([2.59])
 AC_CONFIG_SRCDIR([src/common/cbasetypes.h])
@@ -76,6 +76,26 @@ AC_ARG_ENABLE(
 )
 
 #
+# Buildbot
+#
+AC_ARG_ENABLE(
+	[buildbot],
+	AC_HELP_STRING(
+		[--enable-buildbot@<:@=ARG@:>@],
+		[(available options: yes, no)]
+	),
+	[
+		enable_buildbot="$enableval"
+		case $enableval in
+			"no");;
+			"yes");;
+			*) AC_MSG_ERROR([[invalid argument --enable-buildbot=$enableval... stopping]]);;
+		esac
+	],
+	[enable_buildbot="no"]
+)
+
+#
 # RDTSC as Tick Source 
 #
 AC_ARG_ENABLE(
@@ -511,6 +531,17 @@ case $enable_debug in
 		;;
 esac
 
+#
+# Buildbot
+#
+case $enable_buildbot in
+	"no")
+		# default value
+		;;
+	"yes")
+		CFLAGS="$CFLAGS -DBUILDBOT"
+		;;
+esac
 
 #
 # RDTSC