1
0

patch-configure 4.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149
  1. --- libtool-2.4.orig/configure 2010-09-22 16:44:17.000000000 +0200
  2. +++ libtool-2.4/configure 2011-02-18 13:44:57.000000000 +0100
  3. @@ -13473,135 +13473,6 @@ func_stripname_cnf ()
  4. esac
  5. } # func_stripname_cnf
  6. - if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
  7. - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
  8. - (test "X$CXX" != "Xg++"))) ; then
  9. - ac_ext=cpp
  10. -ac_cpp='$CXXCPP $CPPFLAGS'
  11. -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  12. -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  13. -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  14. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
  15. -$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
  16. -if test -z "$CXXCPP"; then
  17. - if test "${ac_cv_prog_CXXCPP+set}" = set; then :
  18. - $as_echo_n "(cached) " >&6
  19. -else
  20. - # Double quotes because CXXCPP needs to be expanded
  21. - for CXXCPP in "$CXX -E" "/lib/cpp"
  22. - do
  23. - ac_preproc_ok=false
  24. -for ac_cxx_preproc_warn_flag in '' yes
  25. -do
  26. - # Use a header file that comes with gcc, so configuring glibc
  27. - # with a fresh cross-compiler works.
  28. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
  29. - # <limits.h> exists even on freestanding compilers.
  30. - # On the NeXT, cc -E runs the code through the compiler's parser,
  31. - # not just through cpp. "Syntax error" is here to catch this case.
  32. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  33. -/* end confdefs.h. */
  34. -#ifdef __STDC__
  35. -# include <limits.h>
  36. -#else
  37. -# include <assert.h>
  38. -#endif
  39. - Syntax error
  40. -_ACEOF
  41. -if ac_fn_cxx_try_cpp "$LINENO"; then :
  42. -
  43. -else
  44. - # Broken: fails on valid input.
  45. -continue
  46. -fi
  47. -rm -f conftest.err conftest.i conftest.$ac_ext
  48. -
  49. - # OK, works on sane cases. Now check whether nonexistent headers
  50. - # can be detected and how.
  51. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  52. -/* end confdefs.h. */
  53. -#include <ac_nonexistent.h>
  54. -_ACEOF
  55. -if ac_fn_cxx_try_cpp "$LINENO"; then :
  56. - # Broken: success on invalid input.
  57. -continue
  58. -else
  59. - # Passes both tests.
  60. -ac_preproc_ok=:
  61. -break
  62. -fi
  63. -rm -f conftest.err conftest.i conftest.$ac_ext
  64. -
  65. -done
  66. -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  67. -rm -f conftest.i conftest.err conftest.$ac_ext
  68. -if $ac_preproc_ok; then :
  69. - break
  70. -fi
  71. -
  72. - done
  73. - ac_cv_prog_CXXCPP=$CXXCPP
  74. -
  75. -fi
  76. - CXXCPP=$ac_cv_prog_CXXCPP
  77. -else
  78. - ac_cv_prog_CXXCPP=$CXXCPP
  79. -fi
  80. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
  81. -$as_echo "$CXXCPP" >&6; }
  82. -ac_preproc_ok=false
  83. -for ac_cxx_preproc_warn_flag in '' yes
  84. -do
  85. - # Use a header file that comes with gcc, so configuring glibc
  86. - # with a fresh cross-compiler works.
  87. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
  88. - # <limits.h> exists even on freestanding compilers.
  89. - # On the NeXT, cc -E runs the code through the compiler's parser,
  90. - # not just through cpp. "Syntax error" is here to catch this case.
  91. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  92. -/* end confdefs.h. */
  93. -#ifdef __STDC__
  94. -# include <limits.h>
  95. -#else
  96. -# include <assert.h>
  97. -#endif
  98. - Syntax error
  99. -_ACEOF
  100. -if ac_fn_cxx_try_cpp "$LINENO"; then :
  101. -
  102. -else
  103. - # Broken: fails on valid input.
  104. -continue
  105. -fi
  106. -rm -f conftest.err conftest.i conftest.$ac_ext
  107. -
  108. - # OK, works on sane cases. Now check whether nonexistent headers
  109. - # can be detected and how.
  110. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  111. -/* end confdefs.h. */
  112. -#include <ac_nonexistent.h>
  113. -_ACEOF
  114. -if ac_fn_cxx_try_cpp "$LINENO"; then :
  115. - # Broken: success on invalid input.
  116. -continue
  117. -else
  118. - # Passes both tests.
  119. -ac_preproc_ok=:
  120. -break
  121. -fi
  122. -rm -f conftest.err conftest.i conftest.$ac_ext
  123. -
  124. -done
  125. -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  126. -rm -f conftest.i conftest.err conftest.$ac_ext
  127. -if $ac_preproc_ok; then :
  128. -
  129. -else
  130. - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  131. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  132. -as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
  133. -See \`config.log' for more details" "$LINENO" 5; }
  134. -fi
  135. ac_ext=c
  136. ac_cpp='$CPP $CPPFLAGS'
  137. @@ -13609,10 +13480,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
  138. ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  139. ac_compiler_gnu=$ac_cv_c_compiler_gnu
  140. -else
  141. - _lt_caught_CXX_error=yes
  142. -fi
  143. -
  144. ac_ext=cpp
  145. ac_cpp='$CXXCPP $CPPFLAGS'
  146. ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'