1
0

patch-configure 4.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113
  1. --- osiris-4.2.3.orig/configure 2006-07-28 01:57:51.000000000 +0200
  2. +++ osiris-4.2.3/configure 2011-01-21 20:40:11.234913757 +0100
  3. @@ -3403,7 +3403,7 @@ else
  4. fi
  5. -OS_NAME=`uname`
  6. +OS_NAME=Linux
  7. AUTOHEADER=echo
  8. if test "x$prefix" = "xNONE" ; then
  9. @@ -3573,7 +3573,6 @@ else
  10. for ssldir in $tryssldir "" /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
  11. CPPFLAGS="$saved_CPPFLAGS"
  12. - LDFLAGS="$saved_LDFLAGS"
  13. # GOD DAMN FUCKING STATIC BINARIES ON SOLARIS CAN EAT MY ASS.
  14. @@ -3596,29 +3595,6 @@ else
  15. if test ! -z "$ssldir" -a ! -d "$ssldir" ; then
  16. continue;
  17. fi
  18. - if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then
  19. - # Try to use $ssldir/lib if it exists, otherwise
  20. - # $ssldir
  21. - if test -d "$ssldir/lib" ; then
  22. - LDFLAGS="-L$ssldir/lib $saved_LDFLAGS"
  23. - if test ! -z "$need_dash_r" ; then
  24. - LDFLAGS="-R$ssldir/lib $LDFLAGS"
  25. - fi
  26. - else
  27. - LDFLAGS="-L$ssldir $saved_LDFLAGS"
  28. - if test ! -z "$need_dash_r" ; then
  29. - LDFLAGS="-R$ssldir $LDFLAGS"
  30. - fi
  31. - fi
  32. -
  33. - # Try to use $ssldir/include if it exists, otherwise
  34. - # $ssldir
  35. - if test -d "$ssldir/include" ; then
  36. - CPPFLAGS="-I$ssldir/include $saved_CPPFLAGS"
  37. - else
  38. - CPPFLAGS="-I$ssldir $saved_CPPFLAGS"
  39. - fi
  40. - fi
  41. # Basic test to check for compatible version and correct linking
  42. @@ -3694,34 +3670,6 @@ fi
  43. echo "$as_me:$LINENO: result: $ac_cv_openssldir" >&5
  44. echo "${ECHO_T}$ac_cv_openssldir" >&6
  45. -if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ; then
  46. -# AC_DEFINE(HAVE_OPENSSL)
  47. - ssldir=$ac_cv_openssldir
  48. - if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then
  49. - # Try to use $ssldir/lib if it exists, otherwise
  50. - # $ssldir
  51. - if test -d "$ssldir/lib" ; then
  52. - LDFLAGS="-L$ssldir/lib $saved_LDFLAGS"
  53. - if test ! -z "$need_dash_r" ; then
  54. - LDFLAGS="-R$ssldir/lib $LDFLAGS"
  55. - fi
  56. - else
  57. - LDFLAGS="-L$ssldir $saved_LDFLAGS"
  58. - if test ! -z "$need_dash_r" ; then
  59. - LDFLAGS="-R$ssldir $LDFLAGS"
  60. - fi
  61. - fi
  62. - # Try to use $ssldir/include if it exists, otherwise
  63. - # $ssldir
  64. - if test -d "$ssldir/include" ; then
  65. - CPPFLAGS="-I$ssldir/include $saved_CPPFLAGS"
  66. - else
  67. - CPPFLAGS="-I$ssldir $saved_CPPFLAGS"
  68. - fi
  69. - fi
  70. -fi
  71. -
  72. -
  73. case "$OS_NAME" in
  74. SunOS*)
  75. LIBS="$saved_LIBS $ssldir/lib/libssl.a $ssldir/lib/libcrypto.a"
  76. @@ -3738,7 +3686,7 @@ CYGWIN*)
  77. esac
  78. -DB_CONFIG_ARGS="--enable-shared=no --enable-static=yes"
  79. +DB_CONFIG_ARGS="--enable-shared=no --enable-static=yes --target=${target_alias} --host=${host_alias} --build=${build_alias}"
  80. case "${OS_NAME}" in
  81. MINGW32*)
  82. @@ -4448,11 +4396,6 @@ cat >>confdefs.h <<_ACEOF
  83. #define SYSTEM_LINUX 1
  84. _ACEOF
  85. -
  86. - rc=`grep -c krb5 /usr/include/openssl/ssl.h`
  87. - if test $rc -ne 0; then
  88. - CPPFLAGS="-I/usr/kerberos/include/ ${CPPFLAGS}"
  89. - fi
  90. ;;
  91. BSD*)
  92. @@ -11394,7 +11337,6 @@ chmod ug+x src/install/install.sh
  93. echo " Osiris MD Directory: ${with_md_root_dir}"
  94. echo " Osiris MD user: ${with_osiris_md_user}"
  95. echo " Osiris MD config dir: ${with_md_conf_dir}"
  96. - cd ./src/osirisd/modules;./genmods.sh;cd ../../..
  97. echo " ==> use one of the following targets:"
  98. echo ""
  99. echo " all: make everything, agent, CLI and management console."