mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

77 lines
2.2 KiB

  1. --- ./configure.orig 2005-03-21 12:35:09.000000000 +0100
  2. +++ ./configure 2005-03-21 12:36:27.000000000 +0100
  3. @@ -48988,7 +48988,7 @@
  4. -for ac_header in sasl/sasl.h
  5. +for ac_header in sasl2/sasl.h
  6. do
  7. as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  8. if eval "test \"\${$as_ac_Header+set}\" = set"; then
  9. --- ./configure.in.orig 2005-03-21 12:35:40.000000000 +0100
  10. +++ ./configure.in 2005-03-04 14:11:05.000000000 +0100
  11. @@ -1177,7 +1177,7 @@
  12. SASL2_LIBS=""
  13. KDE_CHECK_HEADERS(sasl.h)dnl SASL1 header is enough for kio_ldap
  14. -KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
  15. +KDE_CHECK_HEADERS(sasl2/sasl.h, sasl2_header="yes")
  16. if test "$sasl2_header" = "yes" ; then
  17. KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2")
  18. fi
  19. --- ./kioslave/configure.in.in.orig 2004-09-30 00:30:49.000000000 +0200
  20. +++ ./kioslave/configure.in.in 2005-03-22 14:33:43.000000000 +0100
  21. @@ -4,7 +4,7 @@
  22. SASL2_LIBS=""
  23. KDE_CHECK_HEADERS(sasl.h)dnl SASL1 header is enough for kio_ldap
  24. -KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
  25. +KDE_CHECK_HEADERS(sasl2/sasl.h, sasl2_header="yes")
  26. if test "$sasl2_header" = "yes" ; then
  27. KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2")
  28. fi
  29. --- ./kioslave/ldap/kio_ldap.cpp.orig 2005-03-22 14:35:20.000000000 +0100
  30. +++ ./kioslave/ldap/kio_ldap.cpp 2005-03-22 14:36:19.000000000 +0100
  31. @@ -22,7 +22,7 @@
  32. #include <klocale.h>
  33. #ifdef HAVE_SASL_SASL_H //prefer libsasl2
  34. -#include <sasl/sasl.h>
  35. +#include <sasl2/sasl.h>
  36. #else
  37. #ifdef HAVE_SASL_H
  38. #include <sasl.h>
  39. --- ./kioslave/pop3/pop3.cc.orig 2005-03-22 12:08:08.000000000 +0100
  40. +++ ./kioslave/pop3/pop3.cc 2005-03-22 12:08:23.000000000 +0100
  41. @@ -43,7 +43,7 @@
  42. #ifdef HAVE_LIBSASL2
  43. extern "C" {
  44. -#include <sasl/sasl.h>
  45. +#include <sasl2/sasl.h>
  46. }
  47. #endif
  48. --- ./kioslave/smtp/command.h.orig 2005-03-22 14:35:48.000000000 +0100
  49. +++ ./kioslave/smtp/command.h 2005-03-22 14:36:33.000000000 +0100
  50. @@ -38,7 +38,7 @@
  51. #ifdef HAVE_LIBSASL2
  52. extern "C" {
  53. -#include <sasl/sasl.h>
  54. +#include <sasl2/sasl.h>
  55. }
  56. #endif
  57. --- ./kioslave/smtp/smtp.cc.orig 2005-03-22 14:35:56.000000000 +0100
  58. +++ ./kioslave/smtp/smtp.cc 2005-03-22 14:36:50.000000000 +0100
  59. @@ -32,7 +32,7 @@
  60. #ifdef HAVE_LIBSASL2
  61. extern "C" {
  62. -#include <sasl/sasl.h>
  63. +#include <sasl2/sasl.h>
  64. }
  65. #endif