dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed dist target by commenting out plug-ins/tools/common since it's also 

2002-05-28  Sven Neumann  <sven@gimp.org>

	* configure.in (AC_OUTPUT): fixed dist target by commenting out
	plug-ins/tools/common since it's also commented out in the Makefile
	in plug-ins/tools. Fixed broken check for sendmail.

	* plug-ins/common/mail.c: use the SENDMAIL define from config.h.
This commit is contained in:
Sven Neumann 2002-05-28 00:59:27 +00:00 committed by Sven Neumann
parent b64678ebbc
commit 1fc3f7c5ad
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -2,7 +2,9 @@
* configure.in (AC_OUTPUT): fixed dist target by commenting out
plug-ins/tools/common since it's also commented out in the Makefile
in plug-ins/tools.
in plug-ins/tools. Fixed broken check for sendmail.
* plug-ins/common/mail.c: use the SENDMAIL define from config.h.
2002-05-28 Sven Neumann <sven@gimp.org>

19
configure.in
View File

@ -777,17 +777,18 @@ AC_SUBST(HELPBROWSER)
# Check for sendmail
####################
sendmail_path=":"
AC_ARG_WITH(sendmail, [ --with-sendmail=DIR set sendmail command location],
if eval "test x$with_sendmail != x"; then
sendmail_path=$with_sendmail
fi)
AC_PATH_PROG(SENDMAIL, "sendmail", $sendmail_path, $PATH:/usr/sbin:/usr/lib)
AC_ARG_WITH(sendmail,[ --with-sendmail=DIR set sendmail command location])
if test $ac_cv_path_SENDMAIL != ":"; then
MAILER="-DMAILER=\\\"$ac_cv_path_SENDMAIL\\\""
if test "x$with_sendmail" != "x"; then
sendmail_path=$with_sendmail
else
sendmail_path=$PATH:/usr/sbin:/usr/lib
fi
AC_PATH_PROG(SENDMAIL, sendmail, , $sendmail_path)
if test "x$SENDMAIL" != "x"; then
AC_DEFINE_UNQUOTED(SENDMAIL, "$SENDMAIL", [The MTA used the mail plug-in.])
fi
AC_SUBST(MAILER)
######################

17
plug-ins/common/mail.c
View File

@ -90,13 +90,6 @@
* As always: The utility of this plugin is left as an exercise for the reader
*
*/
#ifndef MAILER
#define MAILER "/usr/lib/sendmail"
#endif
#ifndef UUENCODE
#define UUENCODE "uuencode"
#endif
#define ENCAPSULATION_UUENCODE 0
#define ENCAPSULATION_MIME 1
@ -105,6 +98,14 @@
#include "config.h"
#ifndef SENDMAIL
#define SENDMAIL "/usr/lib/sendmail"
#endif
#ifndef UUENCODE
#define UUENCODE "uuencode"
#endif
#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
@ -325,7 +326,7 @@ save_image (gchar *filename,
tmpname = gimp_temp_name (ext + 1);
/* construct the "sendmail user@location" line */
strcpy (mailcmdline, MAILER);
strcpy (mailcmdline, SENDMAIL);
strcat (mailcmdline, " ");
strcat (mailcmdline, mail_info.receipt);