patch-configure 2.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125
  1. --- xfsprogs-3.1.5.orig/configure 2011-03-31 05:11:43.000000000 +0200
  2. +++ xfsprogs-3.1.5/configure 2011-10-12 14:40:56.000000000 +0200
  3. @@ -245,7 +245,7 @@ $0: the script under such a shell if you
  4. fi
  5. fi
  6. fi
  7. -SHELL=${CONFIG_SHELL-/bin/sh}
  8. +SHELL=${CONFIG_SHELL-/bin/bash}
  9. export SHELL
  10. # Unset more variables known to interfere with behavior of common tools.
  11. CLICOLOR_FORCE= GREP_OPTIONS=
  12. @@ -6414,7 +6414,7 @@ fi
  13. LIBTOOL_DEPS="$ltmain"
  14. # Always use our own libtool.
  15. -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  16. +LIBTOOL='$(CONFIG_SHELL) $(top_builddir)/libtool'
  17. @@ -10790,11 +10790,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  18. test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP"
  19. - pkg_distribution=`uname -s`
  20. + pkg_distribution=Linux
  21. test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION"
  22. - pkg_platform=`uname -s | tr 'A-Z' 'a-z' | tr -d / | sed -e 's/irix64/irix/'`
  23. + pkg_platform=linux
  24. test -z "$PLATFORM" || pkg_platform="$PLATFORM"
  25. @@ -12036,90 +12036,6 @@ fi
  26. - for ac_header in aio.h
  27. -do :
  28. - ac_fn_c_check_header_mongrel "$LINENO" "aio.h" "ac_cv_header_aio_h" "$ac_includes_default"
  29. -if test "x$ac_cv_header_aio_h" = x""yes; then :
  30. - cat >>confdefs.h <<_ACEOF
  31. -#define HAVE_AIO_H 1
  32. -_ACEOF
  33. -
  34. -fi
  35. -
  36. -done
  37. -
  38. - if test $ac_cv_header_aio_h = no; then
  39. - echo
  40. - echo 'FATAL ERROR: could not find a valid <aio.h> header.'
  41. - exit 1
  42. - fi
  43. -
  44. - for ac_func in lio_listio
  45. -do :
  46. - ac_fn_c_check_func "$LINENO" "lio_listio" "ac_cv_func_lio_listio"
  47. -if test "x$ac_cv_func_lio_listio" = x""yes; then :
  48. - cat >>confdefs.h <<_ACEOF
  49. -#define HAVE_LIO_LISTIO 1
  50. -_ACEOF
  51. -
  52. -fi
  53. -done
  54. -
  55. - if test $ac_cv_func_lio_listio = yes; then
  56. - librt=""
  57. - else
  58. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lio_listio in -lrt" >&5
  59. -$as_echo_n "checking for lio_listio in -lrt... " >&6; }
  60. -if test "${ac_cv_lib_rt_lio_listio+set}" = set; then :
  61. - $as_echo_n "(cached) " >&6
  62. -else
  63. - ac_check_lib_save_LIBS=$LIBS
  64. -LIBS="-lrt -lpthread $LIBS"
  65. -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  66. -/* end confdefs.h. */
  67. -
  68. -/* Override any GCC internal prototype to avoid an error.
  69. - Use char because int might match the return type of a GCC
  70. - builtin and then its argument prototype would still apply. */
  71. -#ifdef __cplusplus
  72. -extern "C"
  73. -#endif
  74. -char lio_listio ();
  75. -int
  76. -main ()
  77. -{
  78. -return lio_listio ();
  79. - ;
  80. - return 0;
  81. -}
  82. -_ACEOF
  83. -if ac_fn_c_try_link "$LINENO"; then :
  84. - ac_cv_lib_rt_lio_listio=yes
  85. -else
  86. - ac_cv_lib_rt_lio_listio=no
  87. -fi
  88. -rm -f core conftest.err conftest.$ac_objext \
  89. - conftest$ac_exeext conftest.$ac_ext
  90. -LIBS=$ac_check_lib_save_LIBS
  91. -fi
  92. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_lio_listio" >&5
  93. -$as_echo "$ac_cv_lib_rt_lio_listio" >&6; }
  94. -if test "x$ac_cv_lib_rt_lio_listio" = x""yes; then :
  95. - cat >>confdefs.h <<_ACEOF
  96. -#define HAVE_LIBRT 1
  97. -_ACEOF
  98. -
  99. - LIBS="-lrt $LIBS"
  100. -
  101. -else
  102. -
  103. - echo
  104. - echo 'FATAL ERROR: could not find a library with lio_listio.'
  105. - exit 1
  106. -fi
  107. -
  108. - librt="-lrt"
  109. - fi