patch-configure 1.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263
  1. --- pacemaker-1.0.11.orig/configure 2011-05-24 17:00:37.000000000 +0200
  2. +++ pacemaker-1.0.11/configure 2011-10-07 12:41:11.000000000 +0200
  3. @@ -12484,7 +12484,7 @@ $as_echo_n "checking for $2 in $1... " >
  4. printf "#include <stdio.h>\n" > ${Cfile}.c
  5. printf "#include <%s>\n" $1 >> ${Cfile}.c
  6. printf "int main(int argc, char **argv) { printf(\"%%s\", %s); return 0; }\n" $2 >> ${Cfile}.c
  7. - $CC $CFLAGS ${Cfile}.c -o ${Cfile}
  8. + $CC_FOR_BUILD $CFLAGS_FOR_BUILD ${Cfile}.c -o ${Cfile}
  9. value=`${Cfile}`
  10. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $value" >&5
  11. $as_echo "$value" >&6; }
  12. @@ -12660,7 +12660,7 @@ case $libdir in
  13. *prefix*|NONE)
  14. { $as_echo "$as_me:${as_lineno-$LINENO}: checking which lib directory to use" >&5
  15. $as_echo_n "checking which lib directory to use... " >&6; }
  16. - for aDir in lib64 lib
  17. + for aDir in lib
  18. do
  19. trydir="${exec_prefix}/${aDir}"
  20. if
  21. @@ -12713,33 +12713,11 @@ $as_echo "$as_me: WARNING: $j directory
  22. done
  23. -case "$host_os" in
  24. -*bsd*) LIBS="-L/usr/local/lib"
  25. - CPPFLAGS="$CPPFLAGS -I/usr/local/include"
  26. - INIT_EXT=".sh"
  27. - ;;
  28. -*solaris*)
  29. - ;;
  30. -*linux*)
  31. -
  32. cat >>confdefs.h <<_ACEOF
  33. #define ON_LINUX 1
  34. _ACEOF
  35. - CFLAGS="$CFLAGS -I${prefix}/include"
  36. - ;;
  37. -darwin*)
  38. -
  39. -cat >>confdefs.h <<_ACEOF
  40. -#define ON_DARWIN 1
  41. -_ACEOF
  42. -
  43. - LIBS="$LIBS -L${prefix}/lib"
  44. - CFLAGS="$CFLAGS -I${prefix}/include"
  45. - ;;
  46. -esac
  47. -
  48. -CFLAGS="$CFLAGS -I${prefix}/include/heartbeat"
  49. +CFLAGS="$CFLAGS -I@@STAGING_DIR@@/usr/include/heartbeat"
  50. @@ -17159,7 +17137,6 @@ else
  51. # We had to eliminate -Wnested-externs because of libtool changes
  52. EXTRA_FLAGS="-fgnu89-inline
  53. - -fstack-protector-all
  54. -Wall
  55. -Waggregate-return
  56. -Wbad-function-cast