svnno****@sourc*****
svnno****@sourc*****
2008年 12月 3日 (水) 10:40:07 JST
Revision: 174
http://svn.sourceforge.jp/view?root=tritonn&view=rev&rev=174
Author: mir
Date: 2008-12-03 10:40:07 +0900 (Wed, 03 Dec 2008)
Log Message:
-----------
removed configure option --enable-abort.
now query abortion is auto-detected by checking libsenna.
Modified Paths:
--------------
tags/tritonn-1.0.12-mysql-5.0.67/configure
tags/tritonn-1.0.12-mysql-5.0.67/configure.in
-------------- next part --------------
Modified: tags/tritonn-1.0.12-mysql-5.0.67/configure
===================================================================
--- tags/tritonn-1.0.12-mysql-5.0.67/configure 2008-12-01 11:05:31 UTC (rev 173)
+++ tags/tritonn-1.0.12-mysql-5.0.67/configure 2008-12-03 01:40:07 UTC (rev 174)
@@ -1063,7 +1063,6 @@
--enable-local-infile Enable LOAD DATA LOCAL INFILE (default: disabled)
--disable-grant-options Disables the use of --init-file, --skip-grant-tables and --bootstrap options
--disable-largefile Omit support for large files
- --enable-abort enable query abortion for senna. [default=no]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -5955,7 +5954,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5958 "configure"' > conftest.$ac_ext
+ echo '#line 5957 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6829,7 +6828,7 @@
# Provide some information about the compiler.
-echo "$as_me:6832:" \
+echo "$as_me:6831:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -7863,11 +7862,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7866: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7865: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7870: \$? = $ac_status" >&5
+ echo "$as_me:7869: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -8096,11 +8095,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8099: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8098: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8103: \$? = $ac_status" >&5
+ echo "$as_me:8102: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -8156,11 +8155,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8159: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8158: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8163: \$? = $ac_status" >&5
+ echo "$as_me:8162: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9490,7 +9489,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 9493 "configure"' > conftest.$ac_ext
+ echo '#line 9492 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10361,7 +10360,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10364 "configure"
+#line 10363 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10459,7 +10458,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10462 "configure"
+#line 10461 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12638,11 +12637,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12641: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12640: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12645: \$? = $ac_status" >&5
+ echo "$as_me:12644: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -12698,11 +12697,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12701: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12700: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12705: \$? = $ac_status" >&5
+ echo "$as_me:12704: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13209,7 +13208,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 13212 "configure"' > conftest.$ac_ext
+ echo '#line 13211 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -14080,7 +14079,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14083 "configure"
+#line 14082 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14178,7 +14177,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14181 "configure"
+#line 14180 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15005,11 +15004,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15008: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15007: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15012: \$? = $ac_status" >&5
+ echo "$as_me:15011: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15065,11 +15064,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15068: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15067: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15072: \$? = $ac_status" >&5
+ echo "$as_me:15071: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16379,7 +16378,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 16382 "configure"' > conftest.$ac_ext
+ echo '#line 16381 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -17120,11 +17119,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17123: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17122: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17127: \$? = $ac_status" >&5
+ echo "$as_me:17126: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -17353,11 +17352,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17356: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17355: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17360: \$? = $ac_status" >&5
+ echo "$as_me:17359: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -17413,11 +17412,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17416: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17415: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17420: \$? = $ac_status" >&5
+ echo "$as_me:17419: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18747,7 +18746,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 18750 "configure"' > conftest.$ac_ext
+ echo '#line 18749 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -19618,7 +19617,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 19621 "configure"
+#line 19620 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19716,7 +19715,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 19719 "configure"
+#line 19718 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -23474,50 +23473,58 @@
{ (exit 1); exit 1; }; }
fi
- CPPFLAGS="${_CPPFLAGS}"
- LIBS="${_LIBS}"
- ;;
- esac
-
-fi;
-
-
-
-
-# SQL query abort for senna
-# Check whether --enable-abort or --disable-abort was given.
-if test "${enable_abort+set}" = set; then
- enableval="$enable_abort"
-
-else
- enable_abort="no"
-fi;
-if test "x$enable_abort" != "xno"; then
- echo "$as_me:$LINENO: checking for sen_index_set_abort_callback in -lsenna" >&5
-echo $ECHO_N "checking for sen_index_set_abort_callback in -lsenna... $ECHO_C" >&6
-if test "${ac_cv_lib_senna_sen_index_set_abort_callback+set}" = set; then
+ echo "$as_me:$LINENO: checking for sen_index_set_abort_callback" >&5
+echo $ECHO_N "checking for sen_index_set_abort_callback... $ECHO_C" >&6
+if test "${ac_cv_func_sen_index_set_abort_callback+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsenna $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define sen_index_set_abort_callback to an innocuous variant, in case <limits.h> declares sen_index_set_abort_callback.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define sen_index_set_abort_callback innocuous_sen_index_set_abort_callback
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char sen_index_set_abort_callback (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef sen_index_set_abort_callback
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
+{
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char sen_index_set_abort_callback ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_sen_index_set_abort_callback) || defined (__stub___sen_index_set_abort_callback)
+choke me
+#else
+char (*f) () = sen_index_set_abort_callback;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
int
main ()
{
-sen_index_set_abort_callback ();
+return f != sen_index_set_abort_callback;
;
return 0;
}
@@ -23544,20 +23551,19 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_senna_sen_index_set_abort_callback=yes
+ ac_cv_func_sen_index_set_abort_callback=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_senna_sen_index_set_abort_callback=no
+ac_cv_func_sen_index_set_abort_callback=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_senna_sen_index_set_abort_callback" >&5
-echo "${ECHO_T}$ac_cv_lib_senna_sen_index_set_abort_callback" >&6
-if test $ac_cv_lib_senna_sen_index_set_abort_callback = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_func_sen_index_set_abort_callback" >&5
+echo "${ECHO_T}$ac_cv_func_sen_index_set_abort_callback" >&6
+if test $ac_cv_func_sen_index_set_abort_callback = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -23565,16 +23571,19 @@
_ACEOF
-else
+fi
- { { echo "$as_me:$LINENO: error: sen_index_set_abort_callback was not found! Check your Senna build option." >&5
-echo "$as_me: error: sen_index_set_abort_callback was not found! Check your Senna build option." >&2;}
- { (exit 1); exit 1; }; }
-fi
+ CPPFLAGS="${_CPPFLAGS}"
+ LIBS="${_LIBS}"
+ ;;
+ esac
-fi
+fi;
+
+
+
#--------------------------------------------------------------------
# Check for system header files
#--------------------------------------------------------------------
Modified: tags/tritonn-1.0.12-mysql-5.0.67/configure.in
===================================================================
--- tags/tritonn-1.0.12-mysql-5.0.67/configure.in 2008-12-01 11:05:31 UTC (rev 173)
+++ tags/tritonn-1.0.12-mysql-5.0.67/configure.in 2008-12-03 01:40:07 UTC (rev 174)
@@ -944,6 +944,10 @@
or later is needed. Your senna is $SENNA_VERSION.])
fi
+ AC_CHECK_FUNC(sen_index_set_abort_callback,[
+ AC_DEFINE(USE_QUERY_ABORT, [1], [use SQL query abort for senna])
+ ])
+
CPPFLAGS="${_CPPFLAGS}"
LIBS="${_LIBS}"
;;
@@ -953,20 +957,6 @@
AC_SUBST([SENNA_INCLUDES])
AC_SUBST([SENNA_LIBS])
-# SQL query abort for senna
-AC_ARG_ENABLE(abort,
- [AC_HELP_STRING([--enable-abort],
- [enable query abortion for senna. [default=no]])],
- ,
- [enable_abort="no"])
-if test "x$enable_abort" != "xno"; then
- AC_CHECK_LIB(senna, sen_index_set_abort_callback,[
- AC_DEFINE(USE_QUERY_ABORT, [1], [use SQL query abort for senna])
- ], [
- AC_MSG_ERROR([sen_index_set_abort_callback was not found! Check your Senna build option.])
- ])
-fi
-
#--------------------------------------------------------------------
# Check for system header files
#--------------------------------------------------------------------