multilib.patch 1.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758
  1. --- neon-0.27.0/neon-config.in.multilib
  2. +++ neon-0.27.0/neon-config.in
  3. @@ -5,7 +5,11 @@
  4. prefix=@prefix@
  5. exec_prefix=@exec_prefix@
  6. includedir=@includedir@
  7. -libdir=@libdir@
  8. +
  9. +libdir=`pkg-config --variable=libdir neon`
  10. +CFLAGS=`pkg-config --cflags neon`
  11. +LIBS=`pkg-config --libs neon`
  12. +has_lfs=`pkg-config --variable=has_lfs neon`
  13. usage()
  14. {
  15. @@ -23,7 +27,7 @@
  16. --support FEATURE exit with success if feature is supported
  17. Known features:
  18. - dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [@NE_FLAG_LFS@],
  19. + dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [${has_lfs}],
  20. i18n [@NE_FLAG_I18N@], ts_ssl [@NE_FLAG_TS_SSL@]
  21. EOF
  22. @@ -69,11 +73,10 @@
  23. ;;
  24. --cflags)
  25. - echo -I${includedir}/neon @NEON_CFLAGS@
  26. + echo ${CFLAGS}
  27. ;;
  28. --libs)
  29. - LIBS="-lneon @NEON_LIBS@"
  30. # Don't add standard library paths
  31. if test "$prefix" != "/usr"; then
  32. LIBS="-L${libdir} ${LIBS}"
  33. @@ -93,7 +96,7 @@
  34. zlib|ZLIB) support @NE_FLAG_ZLIB@ ;;
  35. ipv6|IPV6) support @NE_FLAG_IPV6@ ;;
  36. dav|DAV) support @NE_FLAG_DAV@ ;;
  37. - lfs|LFS) support @NE_FLAG_LFS@ ;;
  38. + lfs|LFS) support ${has_lfs} ;;
  39. i18n|I18N) support @NE_FLAG_I18N@ ;;
  40. ts_ssl|TS_SSL) support @NE_FLAG_TS_SSL@ ;;
  41. *) support no ;;
  42. --- neon-0.27.0/neon.pc.in.multilib
  43. +++ neon-0.27.0/neon.pc.in
  44. @@ -2,6 +2,7 @@
  45. exec_prefix=@exec_prefix@
  46. libdir=@libdir@
  47. includedir=@includedir@
  48. +has_lfs=@NE_FLAG_LFS@
  49. Name: neon
  50. Description: HTTP/WebDAV client library