apache.patch 1.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. --- apache_1.3.29/configure.orig Tue May 21 14:24:59 2002
  2. +++ apache_1.3.29/configure Mon Feb 10 11:08:40 2003
  3. @@ -1216,10 +1216,10 @@
  4. ## or we cannot support the case where the relative
  5. ## path is just the emtpy one, i.e. ""]
  6. ##
  7. -runtimedir_relative=`echo $runtimedir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
  8. -logfiledir_relative=`echo $logfiledir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
  9. -sysconfdir_relative=`echo $sysconfdir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
  10. -libexecdir_relative=`echo $libexecdir | sed -e "s:^$prefix/*::" -e 's:\(.\)$:\1/:'`
  11. +runtimedir_relative="$runtimedir/"
  12. +logfiledir_relative="$logfiledir/"
  13. +sysconfdir_relative="$sysconfdir/"
  14. +libexecdir_relative="$libexecdir/"
  15. ##
  16. ## check and debug
  17. --- apache_1.3.29/src/Configure.dist 2003-06-11 11:59:51.000000000 +0200
  18. +++ apache_1.3.29/src/Configure 2003-06-11 12:46:14.000000000 +0200
  19. @@ -1190,14 +1190,20 @@
  20. SHLIB_SUFFIX_DEPTH=0
  21. ;;
  22. *-solaris2*)
  23. - if [ "x`$CC -v 2>&1 | grep gcc`" != "x" ]; then
  24. - CFLAGS_SHLIB="-fPIC"
  25. - else
  26. - CFLAGS_SHLIB="-KPIC"
  27. - fi
  28. + CFLAGS_SHLIB="-KPIC"
  29. LDFLAGS_SHLIB="-G"
  30. - LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
  31. LDFLAGS_SHLIB_EXPORT=""
  32. + for word in `$CC -v 2>&1` ; do
  33. + case $word in
  34. + --with-gnu-ld)
  35. + LDFLAGS_SHLIB="-shared"
  36. + ;;
  37. + *gcc*)
  38. + CFLAGS_SHLIB="-fPIC"
  39. + ;;
  40. + esac
  41. + done
  42. + LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
  43. SHLIB_SUFFIX_DEPTH=1
  44. ;;
  45. *-sunos4*)
  46. --- apache_1.3.29/src/main/util_script.c.orig Mon Jul 28 17:13:56 2003
  47. +++ apache_1.3.29/src/main/util_script.c Tue Jul 29 15:55:27 2003
  48. @@ -246,6 +246,7 @@
  49. }
  50. }
  51. + if (!(env_path = ap_pstrdup(r->pool, ap_table_get(r->subprocess_env, "PATH"))))
  52. if (!(env_path = ap_pstrdup(r->pool, getenv("PATH")))) {
  53. env_path = DEFAULT_PATH;
  54. }