Sync with PHP_5_3 (what a nice mess..thanks guys for keeping the branches in sync...

diff --git a/main/main.c b/main/main.c
index 3fa496d4e07a916b8947bf291f503779d6a6d392..2091ae3c5e24271b60776e64cd30df770bbbbbdd 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -462,8 +462,9 @@ static PHP_INI_MH(OnChangeMailForceExtra)
  * PHP_INCLUDE_PATH
  */
 
-/* Windows and Netware use the internal mail */
-#if defined(PHP_WIN32) || defined(NETWARE)
+#if defined(PHP_PROG_SENDMAIL) && !defined(NETWARE)
+#      define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i "
+#elif defined(PHP_WIN32)
 #      define DEFAULT_SENDMAIL_PATH NULL
 #else
 #      define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i"