patch-configure 21 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743
  1. $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  2. --- mysql-5.0.81.orig/configure 2009-04-16 13:56:58.000000000 +0200
  3. +++ mysql-5.0.81/configure 2009-05-12 10:59:57.000000000 +0200
  4. @@ -885,8 +885,6 @@ MYSQLD_EXTRA_LIBS
  5. CLIENT_EXTRA_LDFLAGS
  6. MYSQLD_EXTRA_LDFLAGS
  7. LIBDL
  8. -COMPILE_PSTACK_FALSE
  9. -COMPILE_PSTACK_TRUE
  10. pstack_libs
  11. pstack_dirs
  12. WRAPLIBS
  13. @@ -21587,165 +21585,11 @@ else
  14. $as_echo "no" >&6; }
  15. fi
  16. -
  17. -
  18. -{ $as_echo "$as_me:$LINENO: checking \"return type of sprintf\"" >&5
  19. -$as_echo_n "checking \"return type of sprintf\"... " >&6; }
  20. -
  21. -#check the return type of sprintf
  22. -case $SYSTEM_TYPE in
  23. - *netware*)
  24. - cat >>confdefs.h <<\_ACEOF
  25. -#define SPRINTF_RETURNS_INT 1
  26. -_ACEOF
  27. - { $as_echo "$as_me:$LINENO: result: \"int\"" >&5
  28. -$as_echo "\"int\"" >&6; }
  29. - ;;
  30. - *)
  31. -if test "$cross_compiling" = yes; then
  32. - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  33. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  34. -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
  35. -See \`config.log' for more details." >&5
  36. -$as_echo "$as_me: error: cannot run test program while cross compiling
  37. -See \`config.log' for more details." >&2;}
  38. - { (exit 1); exit 1; }; }; }
  39. -else
  40. - cat >conftest.$ac_ext <<_ACEOF
  41. -/* confdefs.h. */
  42. -_ACEOF
  43. -cat confdefs.h >>conftest.$ac_ext
  44. -cat >>conftest.$ac_ext <<_ACEOF
  45. -/* end confdefs.h. */
  46. -
  47. - int main()
  48. - {
  49. - char* s = "hello";
  50. - char buf[6];
  51. - if((int)sprintf(buf, s) == strlen(s))
  52. - return 0;
  53. -
  54. - return -1;
  55. - }
  56. -
  57. -_ACEOF
  58. -rm -f conftest$ac_exeext
  59. -if { (ac_try="$ac_link"
  60. -case "(($ac_try" in
  61. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  62. - *) ac_try_echo=$ac_try;;
  63. -esac
  64. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  65. -$as_echo "$ac_try_echo") >&5
  66. - (eval "$ac_link") 2>&5
  67. - ac_status=$?
  68. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  69. - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  70. - { (case "(($ac_try" in
  71. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  72. - *) ac_try_echo=$ac_try;;
  73. -esac
  74. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  75. -$as_echo "$ac_try_echo") >&5
  76. - (eval "$ac_try") 2>&5
  77. - ac_status=$?
  78. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  79. - (exit $ac_status); }; }; then
  80. -
  81. +# return type of sprintf is int for Linux glibc/uClibc
  82. cat >>confdefs.h <<\_ACEOF
  83. #define SPRINTF_RETURNS_INT 1
  84. _ACEOF
  85. - { $as_echo "$as_me:$LINENO: result: \"int\"" >&5
  86. -$as_echo "\"int\"" >&6; }
  87. -else
  88. - $as_echo "$as_me: program exited with status $ac_status" >&5
  89. -$as_echo "$as_me: failed program was:" >&5
  90. -sed 's/^/| /' conftest.$ac_ext >&5
  91. -
  92. -( exit $ac_status )
  93. -if test "$cross_compiling" = yes; then
  94. - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  95. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  96. -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
  97. -See \`config.log' for more details." >&5
  98. -$as_echo "$as_me: error: cannot run test program while cross compiling
  99. -See \`config.log' for more details." >&2;}
  100. - { (exit 1); exit 1; }; }; }
  101. -else
  102. - cat >conftest.$ac_ext <<_ACEOF
  103. -/* confdefs.h. */
  104. -_ACEOF
  105. -cat confdefs.h >>conftest.$ac_ext
  106. -cat >>conftest.$ac_ext <<_ACEOF
  107. -/* end confdefs.h. */
  108. -
  109. - int main()
  110. - {
  111. - char* s = "hello";
  112. - char buf[6];
  113. - if((char*)sprintf(buf,s) == buf + strlen(s))
  114. - return 0;
  115. - return -1;
  116. - }
  117. -_ACEOF
  118. -rm -f conftest$ac_exeext
  119. -if { (ac_try="$ac_link"
  120. -case "(($ac_try" in
  121. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  122. - *) ac_try_echo=$ac_try;;
  123. -esac
  124. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  125. -$as_echo "$ac_try_echo") >&5
  126. - (eval "$ac_link") 2>&5
  127. - ac_status=$?
  128. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  129. - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  130. - { (case "(($ac_try" in
  131. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  132. - *) ac_try_echo=$ac_try;;
  133. -esac
  134. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  135. -$as_echo "$ac_try_echo") >&5
  136. - (eval "$ac_try") 2>&5
  137. - ac_status=$?
  138. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  139. - (exit $ac_status); }; }; then
  140. -
  141. -cat >>confdefs.h <<\_ACEOF
  142. -#define SPRINTF_RETURNS_PTR 1
  143. -_ACEOF
  144. -
  145. - { $as_echo "$as_me:$LINENO: result: \"ptr\"" >&5
  146. -$as_echo "\"ptr\"" >&6; }
  147. -else
  148. - $as_echo "$as_me: program exited with status $ac_status" >&5
  149. -$as_echo "$as_me: failed program was:" >&5
  150. -sed 's/^/| /' conftest.$ac_ext >&5
  151. -
  152. -( exit $ac_status )
  153. -
  154. -cat >>confdefs.h <<\_ACEOF
  155. -#define SPRINTF_RETURNS_GARBAGE 1
  156. -_ACEOF
  157. -
  158. - { $as_echo "$as_me:$LINENO: result: \"garbage\"" >&5
  159. -$as_echo "\"garbage\"" >&6; }
  160. -fi
  161. -rm -rf conftest.dSYM
  162. -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  163. -fi
  164. -
  165. -
  166. -
  167. -fi
  168. -rm -rf conftest.dSYM
  169. -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  170. -fi
  171. -
  172. -
  173. - ;;
  174. -esac
  175. # Extract the first word of "uname", so it can be a program name with args.
  176. set dummy uname; ac_word=$2
  177. @@ -22841,98 +22685,8 @@ $as_echo "no" >&6; }
  178. fi
  179. -# Look for PS usage. We use double dollar-signs in FIND_PROC because this
  180. -# value is written to a makefile, which interprets away one level of
  181. -# dollar-signs. So, interpretation stages are m4 and then shell in autoconf,
  182. -# then Make, then shell. The autoconf substitution uses single quotes, so
  183. -# no unprotected single quotes should appear in the expression.
  184. -# Extract the first word of "ps", so it can be a program name with args.
  185. -set dummy ps; ac_word=$2
  186. -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  187. -$as_echo_n "checking for $ac_word... " >&6; }
  188. -if test "${ac_cv_path_PS+set}" = set; then
  189. - $as_echo_n "(cached) " >&6
  190. -else
  191. - case $PS in
  192. - [\\/]* | ?:[\\/]*)
  193. - ac_cv_path_PS="$PS" # Let the user override the test with a path.
  194. - ;;
  195. - *)
  196. - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  197. -for as_dir in $PATH
  198. -do
  199. - IFS=$as_save_IFS
  200. - test -z "$as_dir" && as_dir=.
  201. - for ac_exec_ext in '' $ac_executable_extensions; do
  202. - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  203. - ac_cv_path_PS="$as_dir/$ac_word$ac_exec_ext"
  204. - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  205. - break 2
  206. - fi
  207. -done
  208. -done
  209. -IFS=$as_save_IFS
  210. -
  211. - test -z "$ac_cv_path_PS" && ac_cv_path_PS="ps"
  212. - ;;
  213. -esac
  214. -fi
  215. -PS=$ac_cv_path_PS
  216. -if test -n "$PS"; then
  217. - { $as_echo "$as_me:$LINENO: result: $PS" >&5
  218. -$as_echo "$PS" >&6; }
  219. -else
  220. - { $as_echo "$as_me:$LINENO: result: no" >&5
  221. -$as_echo "no" >&6; }
  222. -fi
  223. -
  224. -
  225. -{ $as_echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5
  226. -$as_echo_n "checking \"how to check if pid exists\"... " >&6; }
  227. -PS=$ac_cv_path_PS
  228. # Linux style
  229. -if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
  230. -then
  231. - FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
  232. -# Solaris
  233. -elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
  234. -then
  235. - FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
  236. -# BSD style
  237. -elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null
  238. -then
  239. - FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
  240. -# SysV style
  241. -elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null
  242. -then
  243. - FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
  244. -# Do anybody use this?
  245. -elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null
  246. -then
  247. - FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
  248. -else
  249. - case $SYSTEM_TYPE in
  250. - *freebsd*|*dragonfly*)
  251. - FIND_PROC="$PS p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
  252. - ;;
  253. - *darwin*)
  254. - FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
  255. - ;;
  256. - *cygwin*)
  257. - FIND_PROC="$PS -e | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
  258. - ;;
  259. - *netware*)
  260. - FIND_PROC=
  261. - ;;
  262. - *)
  263. - { { $as_echo "$as_me:$LINENO: error: Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." >&5
  264. -$as_echo "$as_me: error: Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual." >&2;}
  265. - { (exit 1); exit 1; }; }
  266. - esac
  267. -fi
  268. -
  269. -{ $as_echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
  270. -$as_echo "\"$FIND_PROC\"" >&6; }
  271. +FIND_PROC="/bin/ps wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
  272. # Check if a pid is valid
  273. # Extract the first word of "kill", so it can be a program name with args.
  274. @@ -26681,350 +26435,14 @@ fi
  275. fi
  276. -
  277. -if test "$TARGET_LINUX" = "true"; then
  278. - { $as_echo "$as_me:$LINENO: checking for atomic operations" >&5
  279. -$as_echo_n "checking for atomic operations... " >&6; }
  280. -
  281. -
  282. - ac_ext=cpp
  283. -ac_cpp='$CXXCPP $CPPFLAGS'
  284. -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  285. -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  286. -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  287. -
  288. -
  289. - atom_ops=
  290. - if test "$cross_compiling" = yes; then
  291. - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  292. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  293. -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
  294. -See \`config.log' for more details." >&5
  295. -$as_echo "$as_me: error: cannot run test program while cross compiling
  296. -See \`config.log' for more details." >&2;}
  297. - { (exit 1); exit 1; }; }; }
  298. -else
  299. - cat >conftest.$ac_ext <<_ACEOF
  300. -/* confdefs.h. */
  301. -_ACEOF
  302. -cat confdefs.h >>conftest.$ac_ext
  303. -cat >>conftest.$ac_ext <<_ACEOF
  304. -/* end confdefs.h. */
  305. -
  306. -#include <asm/atomic.h>
  307. -int main()
  308. -{
  309. - atomic_t v;
  310. -
  311. - atomic_set(&v, 23);
  312. - atomic_add(5, &v);
  313. - return atomic_read(&v) == 28 ? 0 : -1;
  314. -}
  315. -
  316. -_ACEOF
  317. -rm -f conftest$ac_exeext
  318. -if { (ac_try="$ac_link"
  319. -case "(($ac_try" in
  320. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  321. - *) ac_try_echo=$ac_try;;
  322. -esac
  323. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  324. -$as_echo "$ac_try_echo") >&5
  325. - (eval "$ac_link") 2>&5
  326. - ac_status=$?
  327. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  328. - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  329. - { (case "(($ac_try" in
  330. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  331. - *) ac_try_echo=$ac_try;;
  332. -esac
  333. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  334. -$as_echo "$ac_try_echo") >&5
  335. - (eval "$ac_try") 2>&5
  336. - ac_status=$?
  337. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  338. - (exit $ac_status); }; }; then
  339. -
  340. cat >>confdefs.h <<\_ACEOF
  341. -#define HAVE_ATOMIC_ADD 1
  342. -_ACEOF
  343. -
  344. - atom_ops="${atom_ops}atomic_add "
  345. -else
  346. - $as_echo "$as_me: program exited with status $ac_status" >&5
  347. -$as_echo "$as_me: failed program was:" >&5
  348. -sed 's/^/| /' conftest.$ac_ext >&5
  349. -
  350. -fi
  351. -rm -rf conftest.dSYM
  352. -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  353. -fi
  354. -
  355. -
  356. - if test "$cross_compiling" = yes; then
  357. - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  358. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  359. -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
  360. -See \`config.log' for more details." >&5
  361. -$as_echo "$as_me: error: cannot run test program while cross compiling
  362. -See \`config.log' for more details." >&2;}
  363. - { (exit 1); exit 1; }; }; }
  364. -else
  365. - cat >conftest.$ac_ext <<_ACEOF
  366. -/* confdefs.h. */
  367. -_ACEOF
  368. -cat confdefs.h >>conftest.$ac_ext
  369. -cat >>conftest.$ac_ext <<_ACEOF
  370. -/* end confdefs.h. */
  371. -
  372. -#include <asm/atomic.h>
  373. -int main()
  374. -{
  375. - atomic_t v;
  376. -
  377. - atomic_set(&v, 23);
  378. - atomic_sub(5, &v);
  379. - return atomic_read(&v) == 18 ? 0 : -1;
  380. -}
  381. -
  382. -_ACEOF
  383. -rm -f conftest$ac_exeext
  384. -if { (ac_try="$ac_link"
  385. -case "(($ac_try" in
  386. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  387. - *) ac_try_echo=$ac_try;;
  388. -esac
  389. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  390. -$as_echo "$ac_try_echo") >&5
  391. - (eval "$ac_link") 2>&5
  392. - ac_status=$?
  393. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  394. - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  395. - { (case "(($ac_try" in
  396. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  397. - *) ac_try_echo=$ac_try;;
  398. -esac
  399. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  400. -$as_echo "$ac_try_echo") >&5
  401. - (eval "$ac_try") 2>&5
  402. - ac_status=$?
  403. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  404. - (exit $ac_status); }; }; then
  405. -
  406. -cat >>confdefs.h <<\_ACEOF
  407. -#define HAVE_ATOMIC_SUB 1
  408. -_ACEOF
  409. -
  410. - atom_ops="${atom_ops}atomic_sub "
  411. -else
  412. - $as_echo "$as_me: program exited with status $ac_status" >&5
  413. -$as_echo "$as_me: failed program was:" >&5
  414. -sed 's/^/| /' conftest.$ac_ext >&5
  415. -
  416. -fi
  417. -rm -rf conftest.dSYM
  418. -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  419. -fi
  420. -
  421. -
  422. -
  423. - if test -z "$atom_ops"; then atom_ops="no"; fi
  424. - { $as_echo "$as_me:$LINENO: result: $atom_ops" >&5
  425. -$as_echo "$atom_ops" >&6; }
  426. -
  427. - ac_ext=c
  428. -ac_cpp='$CPP $CPPFLAGS'
  429. -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  430. -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  431. -ac_compiler_gnu=$ac_cv_c_compiler_gnu
  432. -
  433. -
  434. -
  435. -# Check whether --with-pstack was given.
  436. -if test "${with_pstack+set}" = set; then
  437. - withval=$with_pstack; USE_PSTACK=$withval
  438. -else
  439. - USE_PSTACK=no
  440. -fi
  441. -
  442. - pstack_libs=
  443. - pstack_dirs=
  444. - if test "$USE_PSTACK" = yes -a "$TARGET_LINUX" = "true" -a "$BASE_MACHINE_TYPE" = "i386"
  445. - then
  446. - have_libiberty= have_libbfd=
  447. - my_save_LIBS="$LIBS"
  448. - { $as_echo "$as_me:$LINENO: checking for fdmatch in -liberty" >&5
  449. -$as_echo_n "checking for fdmatch in -liberty... " >&6; }
  450. -if test "${ac_cv_lib_iberty_fdmatch+set}" = set; then
  451. - $as_echo_n "(cached) " >&6
  452. -else
  453. - ac_check_lib_save_LIBS=$LIBS
  454. -LIBS="-liberty $LIBS"
  455. -cat >conftest.$ac_ext <<_ACEOF
  456. -/* confdefs.h. */
  457. -_ACEOF
  458. -cat confdefs.h >>conftest.$ac_ext
  459. -cat >>conftest.$ac_ext <<_ACEOF
  460. -/* end confdefs.h. */
  461. -
  462. -/* Override any GCC internal prototype to avoid an error.
  463. - Use char because int might match the return type of a GCC
  464. - builtin and then its argument prototype would still apply. */
  465. -#ifdef __cplusplus
  466. -extern "C"
  467. -#endif
  468. -char fdmatch ();
  469. -int
  470. -main ()
  471. -{
  472. -return fdmatch ();
  473. - ;
  474. - return 0;
  475. -}
  476. -_ACEOF
  477. -rm -f conftest.$ac_objext conftest$ac_exeext
  478. -if { (ac_try="$ac_link"
  479. -case "(($ac_try" in
  480. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  481. - *) ac_try_echo=$ac_try;;
  482. -esac
  483. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  484. -$as_echo "$ac_try_echo") >&5
  485. - (eval "$ac_link") 2>conftest.er1
  486. - ac_status=$?
  487. - grep -v '^ *+' conftest.er1 >conftest.err
  488. - rm -f conftest.er1
  489. - cat conftest.err >&5
  490. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  491. - (exit $ac_status); } && {
  492. - test -z "$ac_c_werror_flag" ||
  493. - test ! -s conftest.err
  494. - } && test -s conftest$ac_exeext && {
  495. - test "$cross_compiling" = yes ||
  496. - $as_test_x conftest$ac_exeext
  497. - }; then
  498. - ac_cv_lib_iberty_fdmatch=yes
  499. -else
  500. - $as_echo "$as_me: failed program was:" >&5
  501. -sed 's/^/| /' conftest.$ac_ext >&5
  502. -
  503. - ac_cv_lib_iberty_fdmatch=no
  504. -fi
  505. -
  506. -rm -rf conftest.dSYM
  507. -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  508. - conftest$ac_exeext conftest.$ac_ext
  509. -LIBS=$ac_check_lib_save_LIBS
  510. -fi
  511. -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_iberty_fdmatch" >&5
  512. -$as_echo "$ac_cv_lib_iberty_fdmatch" >&6; }
  513. -if test "x$ac_cv_lib_iberty_fdmatch" = x""yes; then
  514. - have_libiberty=yes
  515. - { $as_echo "$as_me:$LINENO: checking for bfd_openr in -lbfd" >&5
  516. -$as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
  517. -if test "${ac_cv_lib_bfd_bfd_openr+set}" = set; then
  518. - $as_echo_n "(cached) " >&6
  519. -else
  520. - ac_check_lib_save_LIBS=$LIBS
  521. -LIBS="-lbfd -liberty $LIBS"
  522. -cat >conftest.$ac_ext <<_ACEOF
  523. -/* confdefs.h. */
  524. -_ACEOF
  525. -cat confdefs.h >>conftest.$ac_ext
  526. -cat >>conftest.$ac_ext <<_ACEOF
  527. -/* end confdefs.h. */
  528. -
  529. -/* Override any GCC internal prototype to avoid an error.
  530. - Use char because int might match the return type of a GCC
  531. - builtin and then its argument prototype would still apply. */
  532. -#ifdef __cplusplus
  533. -extern "C"
  534. -#endif
  535. -char bfd_openr ();
  536. -int
  537. -main ()
  538. -{
  539. -return bfd_openr ();
  540. - ;
  541. - return 0;
  542. -}
  543. +#define HAVE_ATOMIC_ADD 0
  544. _ACEOF
  545. -rm -f conftest.$ac_objext conftest$ac_exeext
  546. -if { (ac_try="$ac_link"
  547. -case "(($ac_try" in
  548. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  549. - *) ac_try_echo=$ac_try;;
  550. -esac
  551. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  552. -$as_echo "$ac_try_echo") >&5
  553. - (eval "$ac_link") 2>conftest.er1
  554. - ac_status=$?
  555. - grep -v '^ *+' conftest.er1 >conftest.err
  556. - rm -f conftest.er1
  557. - cat conftest.err >&5
  558. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  559. - (exit $ac_status); } && {
  560. - test -z "$ac_c_werror_flag" ||
  561. - test ! -s conftest.err
  562. - } && test -s conftest$ac_exeext && {
  563. - test "$cross_compiling" = yes ||
  564. - $as_test_x conftest$ac_exeext
  565. - }; then
  566. - ac_cv_lib_bfd_bfd_openr=yes
  567. -else
  568. - $as_echo "$as_me: failed program was:" >&5
  569. -sed 's/^/| /' conftest.$ac_ext >&5
  570. -
  571. - ac_cv_lib_bfd_bfd_openr=no
  572. -fi
  573. -
  574. -rm -rf conftest.dSYM
  575. -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  576. - conftest$ac_exeext conftest.$ac_ext
  577. -LIBS=$ac_check_lib_save_LIBS
  578. -fi
  579. -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bfd_bfd_openr" >&5
  580. -$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
  581. -if test "x$ac_cv_lib_bfd_bfd_openr" = x""yes; then
  582. - have_libbfd=yes
  583. -fi
  584. -
  585. -fi
  586. -
  587. - LIBS="$my_save_LIBS"
  588. -
  589. - if test x"$have_libiberty" = xyes -a x"$have_libbfd" = xyes
  590. - then
  591. - pstack_dirs='$(top_srcdir)'/pstack
  592. - pstack_libs="../pstack/libpstack.a -lbfd -liberty"
  593. - # We must link staticly when using pstack
  594. - with_mysqld_ldflags="-all-static"
  595. -
  596. -
  597. cat >>confdefs.h <<\_ACEOF
  598. -#define USE_PSTACK 1
  599. +#define HAVE_ATOMIC_SUB 0
  600. _ACEOF
  601. - else
  602. - USE_PSTACK="no"
  603. - fi
  604. - else
  605. - USE_PSTACK="no"
  606. - fi
  607. -fi
  608. - if test "$USE_PSTACK" = "yes"; then
  609. - COMPILE_PSTACK_TRUE=
  610. - COMPILE_PSTACK_FALSE='#'
  611. -else
  612. - COMPILE_PSTACK_TRUE='#'
  613. - COMPILE_PSTACK_FALSE=
  614. -fi
  615. -
  616. -{ $as_echo "$as_me:$LINENO: checking if we should use pstack" >&5
  617. -$as_echo_n "checking if we should use pstack... " >&6; }
  618. -{ $as_echo "$as_me:$LINENO: result: $USE_PSTACK" >&5
  619. -$as_echo "$USE_PSTACK" >&6; }
  620. # Check for gtty if termio.h doesn't exists
  621. if test "$ac_cv_header_termio_h" = "no" -a "$ac_cv_header_termios_h" = "no"
  622. @@ -27201,96 +26619,6 @@ fi
  623. # Later in this script LIBS will be augmented with a threads library.
  624. NON_THREADED_LIBS="$LIBS"
  625. -{ $as_echo "$as_me:$LINENO: checking for int8" >&5
  626. -$as_echo_n "checking for int8... " >&6; }
  627. -case $SYSTEM_TYPE in
  628. - *netware)
  629. - { $as_echo "$as_me:$LINENO: result: no" >&5
  630. -$as_echo "no" >&6; }
  631. - ;;
  632. - *)
  633. -if test "$cross_compiling" = yes; then
  634. - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  635. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  636. -{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
  637. -See \`config.log' for more details." >&5
  638. -$as_echo "$as_me: error: cannot run test program while cross compiling
  639. -See \`config.log' for more details." >&2;}
  640. - { (exit 1); exit 1; }; }; }
  641. -else
  642. - cat >conftest.$ac_ext <<_ACEOF
  643. -/* confdefs.h. */
  644. -_ACEOF
  645. -cat confdefs.h >>conftest.$ac_ext
  646. -cat >>conftest.$ac_ext <<_ACEOF
  647. -/* end confdefs.h. */
  648. -
  649. -#ifdef HAVE_STDLIB_H
  650. -#include <stdlib.h>
  651. -#endif
  652. -
  653. -#ifdef HAVE_STDDEF_H
  654. -#include <stddef.h>
  655. -#endif
  656. -
  657. -#ifdef HAVE_SYS_TYPES_H
  658. -#include <sys/types.h>
  659. -#endif
  660. -
  661. -int main()
  662. -{
  663. - int8 i;
  664. - return 0;
  665. -}
  666. -
  667. -_ACEOF
  668. -rm -f conftest$ac_exeext
  669. -if { (ac_try="$ac_link"
  670. -case "(($ac_try" in
  671. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  672. - *) ac_try_echo=$ac_try;;
  673. -esac
  674. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  675. -$as_echo "$ac_try_echo") >&5
  676. - (eval "$ac_link") 2>&5
  677. - ac_status=$?
  678. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  679. - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  680. - { (case "(($ac_try" in
  681. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  682. - *) ac_try_echo=$ac_try;;
  683. -esac
  684. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  685. -$as_echo "$ac_try_echo") >&5
  686. - (eval "$ac_try") 2>&5
  687. - ac_status=$?
  688. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  689. - (exit $ac_status); }; }; then
  690. -
  691. -cat >>confdefs.h <<\_ACEOF
  692. -#define HAVE_INT_8_16_32 1
  693. -_ACEOF
  694. -
  695. -{ $as_echo "$as_me:$LINENO: result: yes" >&5
  696. -$as_echo "yes" >&6; }
  697. -else
  698. - $as_echo "$as_me: program exited with status $ac_status" >&5
  699. -$as_echo "$as_me: failed program was:" >&5
  700. -sed 's/^/| /' conftest.$ac_ext >&5
  701. -
  702. -( exit $ac_status )
  703. -{ $as_echo "$as_me:$LINENO: result: no" >&5
  704. -$as_echo "no" >&6; }
  705. -
  706. -fi
  707. -rm -rf conftest.dSYM
  708. -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  709. -fi
  710. -
  711. -
  712. - ;;
  713. -esac
  714. -
  715. #
  716. # Some system specific hacks
  717. #
  718. @@ -43458,13 +42786,6 @@ $as_echo "$as_me: error: conditional \"A
  719. Usually this means the macro was only invoked conditionally." >&2;}
  720. { (exit 1); exit 1; }; }
  721. fi
  722. -if test -z "${COMPILE_PSTACK_TRUE}" && test -z "${COMPILE_PSTACK_FALSE}"; then
  723. - { { $as_echo "$as_me:$LINENO: error: conditional \"COMPILE_PSTACK\" was never defined.
  724. -Usually this means the macro was only invoked conditionally." >&5
  725. -$as_echo "$as_me: error: conditional \"COMPILE_PSTACK\" was never defined.
  726. -Usually this means the macro was only invoked conditionally." >&2;}
  727. - { (exit 1); exit 1; }; }
  728. -fi
  729. if test -z "${HAVE_YASSL_TRUE}" && test -z "${HAVE_YASSL_FALSE}"; then
  730. { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_YASSL\" was never defined.