patch-configure 11 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370
  1. --- xfsprogs-3.1.1.orig/configure 2010-01-29 21:33:34.000000000 +0100
  2. +++ xfsprogs-3.1.1/configure 2010-02-14 00:02:10.000000000 +0100
  3. @@ -6404,7 +6404,7 @@ fi
  4. LIBTOOL_DEPS="$ltmain"
  5. # Always use our own libtool.
  6. -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  7. +LIBTOOL='$(CONFIG_SHELL) $(top_builddir)/libtool'
  8. @@ -11216,7 +11216,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  9. test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION"
  10. - pkg_platform=`uname -s | tr 'A-Z' 'a-z' | sed -e 's/irix64/irix/'`
  11. + pkg_platform=linux
  12. test -z "$PLATFORM" || pkg_platform="$PLATFORM"
  13. @@ -12602,349 +12602,6 @@ fi
  14. -for ac_header in aio.h
  15. -do
  16. -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  17. -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  18. - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  19. -$as_echo_n "checking for $ac_header... " >&6; }
  20. -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  21. - $as_echo_n "(cached) " >&6
  22. -fi
  23. -ac_res=`eval 'as_val=${'$as_ac_Header'}
  24. - $as_echo "$as_val"'`
  25. - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  26. -$as_echo "$ac_res" >&6; }
  27. -else
  28. - # Is the header compilable?
  29. -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
  30. -$as_echo_n "checking $ac_header usability... " >&6; }
  31. -cat >conftest.$ac_ext <<_ACEOF
  32. -/* confdefs.h. */
  33. -_ACEOF
  34. -cat confdefs.h >>conftest.$ac_ext
  35. -cat >>conftest.$ac_ext <<_ACEOF
  36. -/* end confdefs.h. */
  37. -$ac_includes_default
  38. -#include <$ac_header>
  39. -_ACEOF
  40. -rm -f conftest.$ac_objext
  41. -if { (ac_try="$ac_compile"
  42. -case "(($ac_try" in
  43. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  44. - *) ac_try_echo=$ac_try;;
  45. -esac
  46. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  47. -$as_echo "$ac_try_echo") >&5
  48. - (eval "$ac_compile") 2>conftest.er1
  49. - ac_status=$?
  50. - grep -v '^ *+' conftest.er1 >conftest.err
  51. - rm -f conftest.er1
  52. - cat conftest.err >&5
  53. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  54. - (exit $ac_status); } && {
  55. - test -z "$ac_c_werror_flag" ||
  56. - test ! -s conftest.err
  57. - } && test -s conftest.$ac_objext; then
  58. - ac_header_compiler=yes
  59. -else
  60. - $as_echo "$as_me: failed program was:" >&5
  61. -sed 's/^/| /' conftest.$ac_ext >&5
  62. -
  63. - ac_header_compiler=no
  64. -fi
  65. -
  66. -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  67. -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  68. -$as_echo "$ac_header_compiler" >&6; }
  69. -
  70. -# Is the header present?
  71. -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
  72. -$as_echo_n "checking $ac_header presence... " >&6; }
  73. -cat >conftest.$ac_ext <<_ACEOF
  74. -/* confdefs.h. */
  75. -_ACEOF
  76. -cat confdefs.h >>conftest.$ac_ext
  77. -cat >>conftest.$ac_ext <<_ACEOF
  78. -/* end confdefs.h. */
  79. -#include <$ac_header>
  80. -_ACEOF
  81. -if { (ac_try="$ac_cpp conftest.$ac_ext"
  82. -case "(($ac_try" in
  83. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  84. - *) ac_try_echo=$ac_try;;
  85. -esac
  86. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  87. -$as_echo "$ac_try_echo") >&5
  88. - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  89. - ac_status=$?
  90. - grep -v '^ *+' conftest.er1 >conftest.err
  91. - rm -f conftest.er1
  92. - cat conftest.err >&5
  93. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  94. - (exit $ac_status); } >/dev/null && {
  95. - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  96. - test ! -s conftest.err
  97. - }; then
  98. - ac_header_preproc=yes
  99. -else
  100. - $as_echo "$as_me: failed program was:" >&5
  101. -sed 's/^/| /' conftest.$ac_ext >&5
  102. -
  103. - ac_header_preproc=no
  104. -fi
  105. -
  106. -rm -f conftest.err conftest.$ac_ext
  107. -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
  108. -$as_echo "$ac_header_preproc" >&6; }
  109. -
  110. -# So? What about this header?
  111. -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
  112. - yes:no: )
  113. - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
  114. -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
  115. - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
  116. -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
  117. - ac_header_preproc=yes
  118. - ;;
  119. - no:yes:* )
  120. - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
  121. -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
  122. - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
  123. -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
  124. - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
  125. -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
  126. - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
  127. -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
  128. - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
  129. -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
  130. - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  131. -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
  132. -
  133. - ;;
  134. -esac
  135. -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  136. -$as_echo_n "checking for $ac_header... " >&6; }
  137. -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  138. - $as_echo_n "(cached) " >&6
  139. -else
  140. - eval "$as_ac_Header=\$ac_header_preproc"
  141. -fi
  142. -ac_res=`eval 'as_val=${'$as_ac_Header'}
  143. - $as_echo "$as_val"'`
  144. - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  145. -$as_echo "$ac_res" >&6; }
  146. -
  147. -fi
  148. -as_val=`eval 'as_val=${'$as_ac_Header'}
  149. - $as_echo "$as_val"'`
  150. - if test "x$as_val" = x""yes; then
  151. - cat >>confdefs.h <<_ACEOF
  152. -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  153. -_ACEOF
  154. -
  155. -fi
  156. -
  157. -done
  158. -
  159. - if test $ac_cv_header_aio_h = no; then
  160. - echo
  161. - echo 'FATAL ERROR: could not find a valid <aio.h> header.'
  162. - exit 1
  163. - fi
  164. -
  165. -
  166. -for ac_func in lio_listio
  167. -do
  168. -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  169. -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
  170. -$as_echo_n "checking for $ac_func... " >&6; }
  171. -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
  172. - $as_echo_n "(cached) " >&6
  173. -else
  174. - cat >conftest.$ac_ext <<_ACEOF
  175. -/* confdefs.h. */
  176. -_ACEOF
  177. -cat confdefs.h >>conftest.$ac_ext
  178. -cat >>conftest.$ac_ext <<_ACEOF
  179. -/* end confdefs.h. */
  180. -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
  181. - For example, HP-UX 11i <limits.h> declares gettimeofday. */
  182. -#define $ac_func innocuous_$ac_func
  183. -
  184. -/* System header to define __stub macros and hopefully few prototypes,
  185. - which can conflict with char $ac_func (); below.
  186. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
  187. - <limits.h> exists even on freestanding compilers. */
  188. -
  189. -#ifdef __STDC__
  190. -# include <limits.h>
  191. -#else
  192. -# include <assert.h>
  193. -#endif
  194. -
  195. -#undef $ac_func
  196. -
  197. -/* Override any GCC internal prototype to avoid an error.
  198. - Use char because int might match the return type of a GCC
  199. - builtin and then its argument prototype would still apply. */
  200. -#ifdef __cplusplus
  201. -extern "C"
  202. -#endif
  203. -char $ac_func ();
  204. -/* The GNU C library defines this for functions which it implements
  205. - to always fail with ENOSYS. Some functions are actually named
  206. - something starting with __ and the normal name is an alias. */
  207. -#if defined __stub_$ac_func || defined __stub___$ac_func
  208. -choke me
  209. -#endif
  210. -
  211. -int
  212. -main ()
  213. -{
  214. -return $ac_func ();
  215. - ;
  216. - return 0;
  217. -}
  218. -_ACEOF
  219. -rm -f conftest.$ac_objext conftest$ac_exeext
  220. -if { (ac_try="$ac_link"
  221. -case "(($ac_try" in
  222. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  223. - *) ac_try_echo=$ac_try;;
  224. -esac
  225. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  226. -$as_echo "$ac_try_echo") >&5
  227. - (eval "$ac_link") 2>conftest.er1
  228. - ac_status=$?
  229. - grep -v '^ *+' conftest.er1 >conftest.err
  230. - rm -f conftest.er1
  231. - cat conftest.err >&5
  232. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  233. - (exit $ac_status); } && {
  234. - test -z "$ac_c_werror_flag" ||
  235. - test ! -s conftest.err
  236. - } && test -s conftest$ac_exeext && {
  237. - test "$cross_compiling" = yes ||
  238. - $as_test_x conftest$ac_exeext
  239. - }; then
  240. - eval "$as_ac_var=yes"
  241. -else
  242. - $as_echo "$as_me: failed program was:" >&5
  243. -sed 's/^/| /' conftest.$ac_ext >&5
  244. -
  245. - eval "$as_ac_var=no"
  246. -fi
  247. -
  248. -rm -rf conftest.dSYM
  249. -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  250. - conftest$ac_exeext conftest.$ac_ext
  251. -fi
  252. -ac_res=`eval 'as_val=${'$as_ac_var'}
  253. - $as_echo "$as_val"'`
  254. - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  255. -$as_echo "$ac_res" >&6; }
  256. -as_val=`eval 'as_val=${'$as_ac_var'}
  257. - $as_echo "$as_val"'`
  258. - if test "x$as_val" = x""yes; then
  259. - cat >>confdefs.h <<_ACEOF
  260. -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  261. -_ACEOF
  262. -
  263. -fi
  264. -done
  265. -
  266. - if test $ac_cv_func_lio_listio = yes; then
  267. - librt=""
  268. - else
  269. -
  270. -{ $as_echo "$as_me:$LINENO: checking for lio_listio in -lrt" >&5
  271. -$as_echo_n "checking for lio_listio in -lrt... " >&6; }
  272. -if test "${ac_cv_lib_rt_lio_listio+set}" = set; then
  273. - $as_echo_n "(cached) " >&6
  274. -else
  275. - ac_check_lib_save_LIBS=$LIBS
  276. -LIBS="-lrt $LIBS"
  277. -cat >conftest.$ac_ext <<_ACEOF
  278. -/* confdefs.h. */
  279. -_ACEOF
  280. -cat confdefs.h >>conftest.$ac_ext
  281. -cat >>conftest.$ac_ext <<_ACEOF
  282. -/* end confdefs.h. */
  283. -
  284. -/* Override any GCC internal prototype to avoid an error.
  285. - Use char because int might match the return type of a GCC
  286. - builtin and then its argument prototype would still apply. */
  287. -#ifdef __cplusplus
  288. -extern "C"
  289. -#endif
  290. -char lio_listio ();
  291. -int
  292. -main ()
  293. -{
  294. -return lio_listio ();
  295. - ;
  296. - return 0;
  297. -}
  298. -_ACEOF
  299. -rm -f conftest.$ac_objext conftest$ac_exeext
  300. -if { (ac_try="$ac_link"
  301. -case "(($ac_try" in
  302. - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  303. - *) ac_try_echo=$ac_try;;
  304. -esac
  305. -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  306. -$as_echo "$ac_try_echo") >&5
  307. - (eval "$ac_link") 2>conftest.er1
  308. - ac_status=$?
  309. - grep -v '^ *+' conftest.er1 >conftest.err
  310. - rm -f conftest.er1
  311. - cat conftest.err >&5
  312. - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  313. - (exit $ac_status); } && {
  314. - test -z "$ac_c_werror_flag" ||
  315. - test ! -s conftest.err
  316. - } && test -s conftest$ac_exeext && {
  317. - test "$cross_compiling" = yes ||
  318. - $as_test_x conftest$ac_exeext
  319. - }; then
  320. - ac_cv_lib_rt_lio_listio=yes
  321. -else
  322. - $as_echo "$as_me: failed program was:" >&5
  323. -sed 's/^/| /' conftest.$ac_ext >&5
  324. -
  325. - ac_cv_lib_rt_lio_listio=no
  326. -fi
  327. -
  328. -rm -rf conftest.dSYM
  329. -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  330. - conftest$ac_exeext conftest.$ac_ext
  331. -LIBS=$ac_check_lib_save_LIBS
  332. -fi
  333. -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_lio_listio" >&5
  334. -$as_echo "$ac_cv_lib_rt_lio_listio" >&6; }
  335. -if test "x$ac_cv_lib_rt_lio_listio" = x""yes; then
  336. - cat >>confdefs.h <<_ACEOF
  337. -#define HAVE_LIBRT 1
  338. -_ACEOF
  339. -
  340. - LIBS="-lrt $LIBS"
  341. -
  342. -else
  343. -
  344. - echo
  345. - echo 'FATAL ERROR: could not find a library with lio_listio.'
  346. - exit 1
  347. -fi
  348. -
  349. - librt="-lrt"
  350. - fi
  351. -
  352. -
  353. -
  354. -
  355. -
  356. -
  357. for ac_header in uuid.h sys/uuid.h uuid/uuid.h
  358. do
  359. as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`