patch-configure 2.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788
  1. --- monit-5.2.1.orig/configure 2010-09-24 21:46:55.000000000 +0200
  2. +++ monit-5.2.1/configure 2010-10-08 23:36:24.000000000 +0200
  3. @@ -10961,82 +10961,14 @@ fi
  4. # Architecture/OS detection
  5. # ------------------------------------------------------------------------
  6. -# Backward compatibility until we get ride of arch settings
  7. -if test `uname` = "SunOS"
  8. -then
  9. - ARCH="SOLARIS"
  10. - CFLAGS="$CFLAGS -D _REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
  11. - test_kstat="true"
  12. -
  13. -cat >>confdefs.h <<\_ACEOF
  14. -#define HAVE_CPU_WAIT 1
  15. -_ACEOF
  16. -
  17. -elif test `uname` = "Linux"
  18. -then
  19. - ARCH="LINUX"
  20. - CFLAGS="$CFLAGS -D _REENTRANT"
  21. - LDFLAGS="$LDFLAGS -rdynamic"
  22. - if test `uname -r | awk -F '.' '{print$1$2}'` -ge "26"
  23. - then
  24. -
  25. -cat >>confdefs.h <<\_ACEOF
  26. -#define HAVE_CPU_WAIT 1
  27. -_ACEOF
  28. -
  29. - fi
  30. -elif test `uname` = "HP-UX"
  31. -then
  32. - ARCH="HPUX"
  33. - CFLAGS="$CFLAGS -D _REENTRANT"
  34. -
  35. -cat >>confdefs.h <<\_ACEOF
  36. -#define HAVE_CPU_WAIT 1
  37. -_ACEOF
  38. -
  39. -elif test `uname` = "OpenBSD"
  40. -then
  41. - ARCH="OPENBSD"
  42. - CFLAGS="$CFLAGS -D _REENTRANT"
  43. - test_kvm="true"
  44. -elif test `uname` = "FreeBSD"
  45. -then
  46. - ARCH="FREEBSD"
  47. - CFLAGS="$CFLAGS -D _REENTRANT"
  48. - test_kvm="true"
  49. -elif test `uname` = "NetBSD"
  50. -then
  51. - ARCH="NETBSD"
  52. - CFLAGS="$CFLAGS -D _REENTRANT"
  53. - test_kvm="true"
  54. -elif test `uname` = "Darwin"
  55. -then
  56. - ARCH="DARWIN"
  57. - CFLAGS="$CFLAGS -DREENTRANT -no-cpp-precomp -DNEED_SOCKLEN_T_DEFINED"
  58. - test_kvm="true"
  59. - LIBS="$LIBS -framework System -multiply_defined suppress"
  60. -elif test `uname` = "AIX"
  61. -then
  62. - ARCH="AIX"
  63. - CFLAGS="$CFLAGS -D _REENTRANT"
  64. - LIBS="$LIBS -lodm"
  65. - # AIX v. 5.2
  66. - LIBS="$LIBS -lcfg"
  67. - # AIX v. 5.3
  68. - LIBS="$LIBS -lperfstat"
  69. +ARCH="LINUX"
  70. +CFLAGS="$CFLAGS -D _REENTRANT"
  71. +LDFLAGS="$LDFLAGS -rdynamic"
  72. cat >>confdefs.h <<\_ACEOF
  73. #define HAVE_CPU_WAIT 1
  74. _ACEOF
  75. -else
  76. - { $as_echo "$as_me:$LINENO: WARNING: Architecture not supported: \`uname\`." >&5
  77. -$as_echo "$as_me: WARNING: Architecture not supported: \`uname\`." >&2;}
  78. - CFLAGS="$CFLAGS -D _REENTRANT"
  79. - ARCH="UNKNOWN"
  80. -fi
  81. -
  82. -
  83. # ------------------------------------------------------------------------
  84. # Resource code
  85. # ------------------------------------------------------------------------