Commit 1fc3f7c5 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

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.
parent b64678eb
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
* configure.in (AC_OUTPUT): fixed dist target by commenting out * configure.in (AC_OUTPUT): fixed dist target by commenting out
plug-ins/tools/common since it's also commented out in the Makefile 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> 2002-05-28 Sven Neumann <sven@gimp.org>
......
...@@ -777,17 +777,18 @@ AC_SUBST(HELPBROWSER) ...@@ -777,17 +777,18 @@ AC_SUBST(HELPBROWSER)
# Check for sendmail # Check for sendmail
#################### ####################
sendmail_path=":" AC_ARG_WITH(sendmail,[ --with-sendmail=DIR set sendmail command location])
AC_ARG_WITH(sendmail, [ --with-sendmail=DIR set sendmail command location],
if eval "test x$with_sendmail != x"; then if test "x$with_sendmail" != "x"; then
sendmail_path=$with_sendmail sendmail_path=$with_sendmail
fi) else
AC_PATH_PROG(SENDMAIL, "sendmail", $sendmail_path, $PATH:/usr/sbin:/usr/lib) sendmail_path=$PATH:/usr/sbin:/usr/lib
fi
if test $ac_cv_path_SENDMAIL != ":"; then AC_PATH_PROG(SENDMAIL, sendmail, , $sendmail_path)
MAILER="-DMAILER=\\\"$ac_cv_path_SENDMAIL\\\"" if test "x$SENDMAIL" != "x"; then
AC_DEFINE_UNQUOTED(SENDMAIL, "$SENDMAIL", [The MTA used the mail plug-in.])
fi fi
AC_SUBST(MAILER)
###################### ######################
......
...@@ -90,13 +90,6 @@ ...@@ -90,13 +90,6 @@
* As always: The utility of this plugin is left as an exercise for the reader * 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_UUENCODE 0
#define ENCAPSULATION_MIME 1 #define ENCAPSULATION_MIME 1
...@@ -105,6 +98,14 @@ ...@@ -105,6 +98,14 @@
#include "config.h" #include "config.h"
#ifndef SENDMAIL
#define SENDMAIL "/usr/lib/sendmail"
#endif
#ifndef UUENCODE
#define UUENCODE "uuencode"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
...@@ -325,7 +326,7 @@ save_image (gchar *filename, ...@@ -325,7 +326,7 @@ save_image (gchar *filename,
tmpname = gimp_temp_name (ext + 1); tmpname = gimp_temp_name (ext + 1);
/* construct the "sendmail user@location" line */ /* construct the "sendmail user@location" line */
strcpy (mailcmdline, MAILER); strcpy (mailcmdline, SENDMAIL);
strcat (mailcmdline, " "); strcat (mailcmdline, " ");
strcat (mailcmdline, mail_info.receipt); strcat (mailcmdline, mail_info.receipt);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment