Ver código fonte

* Changes to the configure script:
- added option --enable-profiler (supports gprof)
- added option --enable-64bit (don't force 32bit)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13486 54d463be-8e91-2dee-dedb-b68131a5f0ec

FlavioJS 16 anos atrás
pai
commit
4d467728cf
3 arquivos alterados com 461 adições e 245 exclusões
  1. 6 4
      Changelog-Trunk.txt
  2. 373 222
      configure
  3. 82 19
      configure.in

+ 6 - 4
Changelog-Trunk.txt

@@ -3,12 +3,14 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2009/01/25
+	* Changes to the configure script: [FlavioJS]
+	- added option --enable-profiler (supports gprof)
+	- added option --enable-64bit (don't force 32bit)
 2009/01/24
-	* Changed pc_spiritball_timer and pc_addspiritball: (bugreport:2705) [FlavioJS]
+	* Changed pc_spiritball_timer and pc_addspiritball: (bugreport:2705)
 	- don't make assumptions about the calling order of timers
-	- ensure that sd->spirit_timer is is ordered by expiration time
-	* Changed pc_spiritball_timer to not assume that timers are called in the same order they are created. (bugreport:2705)
-	- the timer heap makes no garantees about the order order when timers have the same tick
+	- ensure that sd->spirit_timer is ordered by expiration time
 	* Changed the variables of the mapcache structs to fixed size equivalents.
 	* Changed all uses of struct skill_unit_group* to group_id in status_change_entry's. [FlavioJS]
 2009/01/23

Diferenças do arquivo suprimidas por serem muito extensas
+ 373 - 222
configure


+ 82 - 19
configure.in

@@ -56,9 +56,11 @@ AC_ARG_ENABLE(
 AC_ARG_ENABLE(
 	[debug],
 	AC_HELP_STRING(
-		[--enable-debug],
-		[Compiles extra debug code. (disabled by default)],
-		[(available options: yes, no, gdb)]
+		[--enable-debug@<:@=ARG@:>@],
+		[
+			Compiles extra debug code. (disabled by default)
+			(available options: yes, no, gdb)
+		]
 	),
 	[
 		enable_debug="$enableval"
@@ -73,6 +75,51 @@ AC_ARG_ENABLE(
 )
 
 
+#
+# Profiler
+#
+AC_ARG_ENABLE(
+	[profiler],
+	AC_HELP_STRING(
+		[--enable-profiler=ARG],
+		[Profilers: no, gprof (disabled by default)]
+	),
+	[
+		enable_profiler="$enableval"
+		case $enableval in
+			"no");;
+			"gprof");;
+			*) AC_MSG_ERROR([[invalid argument --enable-profiler=$enableval... stopping]]);;
+		esac
+	],
+	[enable_profiler="no"]
+)
+
+
+#
+# 64bit
+#
+AC_ARG_ENABLE(
+	[64bit],
+	AC_HELP_STRING(
+		[--enable-64bit],
+		[
+			Don't force 32 bit. (disabled by default)
+			64bit support is still being tested, not recommended for production servers.
+		]
+	),
+	[
+		enable_64bit="$enableval"
+		case $enableval in
+			"no");;
+			"yes");;
+			*) AC_MSG_ERROR([[invalid argument --enable-64bit=$enableval... stopping]]);;
+		esac
+	],
+	[enable_64bit="no"]
+)
+
+
 #
 # Enable/disable MySql and optionally specify the path to mysql_config (optional library)
 #
@@ -205,25 +252,27 @@ AC_C_BIGENDIAN(
 )
 
 
-AC_MSG_CHECKING([whether pointers can be stored in ints (old code)])
-pointers_fit_in_ints="no"
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM([[static int test_array[((long int)sizeof(int)) == ((long int)sizeof(void*)) ? 1 : -1];]])],
-	[pointers_fit_in_ints="yes"],
-	[]
-)
-if test "$pointers_fit_in_ints" = "no" ; then
-	CFLAGS="$CFLAGS -m32"
-	LDFLAGS="$LDFLAGS -m32"
+if test "$enable_64bit" = "no" ; then
+	AC_MSG_CHECKING([whether pointers can be stored in ints (old code)])
+	pointers_fit_in_ints="no"
 	AC_COMPILE_IFELSE(
-		[AC_LANG_PROGRAM([[static int test_array[((long int)sizeof(int)) == ((long int)sizeof(void *)) ? 1 : -1];]])],
-		[pointers_fit_in_ints="yes (with -m32)"],
+		[AC_LANG_PROGRAM([[static int test_array[((long int)sizeof(int)) == ((long int)sizeof(void*)) ? 1 : -1];]])],
+		[pointers_fit_in_ints="yes"],
 		[]
 	)
-fi
-AC_MSG_RESULT($pointers_fit_in_ints)
-if test "$pointers_fit_in_ints" = "no" ; then
-	AC_MSG_ERROR([pointers cannot be stored in ints, required for old code... stopping])
+	if test "$pointers_fit_in_ints" = "no" ; then
+		CFLAGS="$CFLAGS -m32"
+		LDFLAGS="$LDFLAGS -m32"
+		AC_COMPILE_IFELSE(
+			[AC_LANG_PROGRAM([[static int test_array[((long int)sizeof(int)) == ((long int)sizeof(void *)) ? 1 : -1];]])],
+			[pointers_fit_in_ints="yes (with -m32)"],
+			[]
+		)
+	fi
+	AC_MSG_RESULT($pointers_fit_in_ints)
+	if test "$pointers_fit_in_ints" = "no" ; then
+		AC_MSG_ERROR([pointers cannot be stored in ints, required for old code... stopping])
+	fi
 fi
 
 
@@ -334,6 +383,20 @@ case $enable_debug in
 esac
 
 
+#
+# Profiler
+#
+case $enable_profiler in
+	"no")
+		# default value
+		;;
+	"gprof")
+		CFLAGS="$CFLAGS -pg"
+		LDFLAGS="$LDFLAGS -pg"
+		;;
+esac
+
+
 #
 # zlib library (required)
 #

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff