diff options
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | HISTORY.DE | 2 | ||||
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | mail.c | 6 |
4 files changed, 22 insertions, 6 deletions
@@ -52,6 +52,8 @@ new: VDRs startup. - The update check for manual timers does now ignore timers whose start or stop time was edited by the user. +- default path to sendmail is now '/usr/sbin/sendmail' and can be configured in the Makefile, + thanks to Ville Skyttä for providing a patch. fixes: - fixed a crash when pressing 'Ok' in an empty timers done menu @@ -56,6 +56,8 @@ neu: durch den ersten Aufruf von cPlugin::MainThreadHook ausgelöst, anstatt 20s nach dem VDR-Start. - Die Überwachung manueller Timer ignoriert nun Timer, deren Start- oder Stopzeit vom Anwender geändert wurde. +- Der Default-Pfad zu sendmail ist nun '/usr/sbin/sendmail' und kann per Makefile konfiguriert + werden, Danke an Ville Skyttä für den Patch. fixes: - Absturz beim Drücken von 'Ok' in leerem Menü erledigter Timer behoben @@ -42,6 +42,10 @@ ifndef AUTOCONFIG endif +### the sendmail executable to use when epgsearch is configured to use the +### sendmail method for sending mail +SENDMAIL = /usr/sbin/sendmail + ### ### CONFIG END ### do not edit below this line if you don't know what you do ;-) @@ -118,11 +122,15 @@ PACKAGE = vdr-$(ARCHIVE) INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include #INCLUDES += -I$(VDRDIR)/include -DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DEFINES1 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(MAINMENUSHORTCUT)"' -DEFINES2 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN2)"' -DEFINES3 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN3)"' -DEFINES4 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN4)"' +EPGSEARCH_DEFINES += -D_GNU_SOURCE +ifneq ($(SENDMAIL),) +EPGSEARCH_DEFINES += -DSENDMAIL='"$(SENDMAIL)"' +endif +DEFINES += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +DEFINES1 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(MAINMENUSHORTCUT)"' +DEFINES2 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN2)"' +DEFINES3 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN3)"' +DEFINES4 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN4)"' ### The object files (add further files here): @@ -31,6 +31,10 @@ The project's page is at http://winni.vdr-developer.org/epgsearch #include "epgsearchtools.h" #include "uservars.h" +#ifndef SENDMAIL +#define SENDMAIL "/usr/sbin/sendmail" +#endif + extern bool isUTF8; using namespace std; @@ -130,7 +134,7 @@ bool cMailNotifier::SendMailViaSendmail() { char mailcmd[256]; const char* mailargs = "%s -i -FVDR -oem %s"; - const char* mailproc = "/usr/lib/sendmail"; + const char* mailproc = SENDMAIL; FILE* mail; string to = EPGSearchConfig.MailAddressTo; |