diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2008-02-09 19:53:30 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2008-02-09 19:53:30 +0000 |
commit | 1b637bf2926c395d8b9dd4f52c0167dae5ed6707 (patch) | |
tree | a2301b7b58be3e17ff67ea0d848055e993edcccd | |
parent | 5ef36a85c4d6d3239660983a4464b654d4584cea (diff) | |
download | mailfromd-gmach.tar.gz mailfromd-gmach.tar.bz2 |
* THANKS: Add Tom Lynch. Obfuscate email addresses.gmach
* pmult/pmult.c: Remove kludges that were necessary to include
files from meta1 source tree. Assume PreAlpha24.1 at least.
* pmult/Makefile.am (INCLUDES): Remove @META1_INCLUDES@
* configure.ac (--enable-pmilter option): Assume all the necessary
libraries are installed under ${path}/include/sm, and libraries
under ${path}/lib/meta1.
git-svn-id: file:///svnroot/mailfromd/branches/gmach@1608 7a8a7f39-df28-0410-adc6-e0d955640f24
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | THANKS | 25 | ||||
-rw-r--r-- | configure.ac | 60 | ||||
-rw-r--r-- | pmult/Makefile.am | 3 | ||||
-rw-r--r-- | pmult/pmult.c | 31 |
5 files changed, 59 insertions, 70 deletions
@@ -1,3 +1,13 @@ | |||
1 | 2008-02-09 Sergey Poznyakoff <gray@gnu.org.ua> | ||
2 | |||
3 | * THANKS: Add Tom Lynch. Obfuscate email addresses. | ||
4 | * pmult/pmult.c: Remove kludges that were necessary to include | ||
5 | files from meta1 source tree. Assume PreAlpha24.1 at least. | ||
6 | * pmult/Makefile.am (INCLUDES): Remove @META1_INCLUDES@ | ||
7 | * configure.ac (--enable-pmilter option): Assume all the necessary | ||
8 | libraries are installed under ${path}/include/sm, and libraries | ||
9 | under ${path}/lib/meta1. | ||
10 | |||
1 | 2008-02-06 Sergey Poznyakoff <gray@gnu.org.ua> | 11 | 2008-02-06 Sergey Poznyakoff <gray@gnu.org.ua> |
2 | 12 | ||
3 | Ported r1606 from trunk. | 13 | Ported r1606 from trunk. |
@@ -1,18 +1,19 @@ | |||
1 | Mailfromd THANKS file. | 1 | Mailfromd THANKS file. |
2 | 2 | ||
3 | Many people further contributed to Mailfromd, by reporting problems, | 3 | Many people further contributed to mailfromd by reporting problems, |
4 | suggesting various improvements or submitting actual code. Here is a | 4 | suggesting various improvements or submitting actual code. Here is a list |
5 | list of these people in alphabetical order. Help us keep it | 5 | of these people in alphabetical order. Help us keep it complete and exempt |
6 | complete and exempt of errors. | 6 | of errors. |
7 | 7 | ||
8 | Alan Dobkin <MailFromD@omnicomp.org> | 8 | Alan Dobkin <MailFromD --AT-- omnicomp --DOT-- org> |
9 | Brent Spencer <bspencer@XsiteDesigns.com> | 9 | Brent Spencer <bspencer --AT-- XsiteDesigns --DOT-- com> |
10 | Jan Rafaj <jr-mailfromd@cedric.unob.cz> | 10 | Jan Rafaj <jr-mailfromd --AT-- cedric --DOT-- unob --DOT-- cz> |
11 | Jeff Ballard <ballard@engr.wisc.edu> | 11 | Jeff Ballard <ballard --AT-- engr --DOT-- wisc --DOT-- edu> |
12 | Nacho González López <nacho@es.gnu.org> | 12 | Nacho González López <nacho --AT-- es --DOT-- gnu --DOT-- org> |
13 | Peter Markeloff <magic@farlep.net> | 13 | Peter Markeloff <magic --AT-- farlep --DOT-- net> |
14 | Sergey Afonin <a_s_y@sama.ru> | 14 | Tom Lynch <tlynch --AT-- primate --DOT-- wisc --DOT-- edu> |
15 | Zeus Panchenko <zeus@dn.farlep.net> | 15 | Sergey Afonin <a_s_y --AT-- sama --DOT-- ru> |
16 | Zeus Panchenko <zeus --AT-- dn --DOT-- farlep --DOT-- net> | ||
16 | 17 | ||
17 | 18 | ||
18 | ;;;; Local Variables: | 19 | ;;;; Local Variables: |
diff --git a/configure.ac b/configure.ac index 695d0b32..ebcbc9df 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -522,51 +522,55 @@ AC_DEFINE_UNQUOTED(DEFAULT_LOG_FACILITY, $DEFAULT_LOG_FACILITY, | |||
522 | [Default log facility]) | 522 | [Default log facility]) |
523 | 523 | ||
524 | # Test for libpmilter | 524 | # Test for libpmilter |
525 | AC_SUBST(META1_LIBS) | ||
526 | |||
525 | AC_ARG_ENABLE([pmilter], | 527 | AC_ARG_ENABLE([pmilter], |
526 | AC_HELP_STRING([--enable-pmilter=PATH-TO-META1], | 528 | AC_HELP_STRING([--enable-pmilter[[=PATH]]], |
527 | [enable pmilter support (EXPERIMENTAL)]), | 529 | [enable pmilter support (EXPERIMENTAL)]), |
528 | [case "${enableval}" in | 530 | [case "${enableval}" in |
529 | /*) meta1_dir=`echo ${enableval} | sed 's,/$,,'` | 531 | yes) enable_pmilter=yes;; |
530 | enable_pmilter=yes | 532 | no) enable_pmilter=no;; |
531 | ;; | 533 | /*) dir=$enableval/lib/meta1 |
532 | *) AC_MSG_ERROR([Argument to --enable-pmilter is not a directory name]) | 534 | if test -d $dir; then |
535 | META1_LIBS="-L$dir" | ||
536 | else | ||
537 | AC_MSG_ERROR([$dir: No such directory]) | ||
538 | fi | ||
539 | enable_pmilter=yes | ||
540 | ;; | ||
541 | *) AC_MSG_ERROR([Bad argument to --enable-pmilter]) | ||
533 | esac],[enable_pmilter=no]) | 542 | esac],[enable_pmilter=no]) |
534 | 543 | ||
535 | if test "$enable_pmilter" = yes; then | 544 | if test "$enable_pmilter" = yes; then |
536 | saved_LIBS=$LIBS | 545 | saved_LIBS=$LIBS |
537 | AC_SUBST(PTHREAD_LIBRARIES) | 546 | AC_SUBST(PTHREAD_LIBRARIES) |
538 | AC_CHECK_LIB(pthread, pthread_self, | 547 | AC_CHECK_LIB(pthread, pthread_self, |
539 | [ have_pthread=yes | 548 | [ have_pthread=yes |
540 | PTHREAD_LIBRARIES="-lpthread -lc" ], | 549 | PTHREAD_LIBRARIES="-lpthread -lc" ], |
541 | [ PTHREAD_LIBRARIES="-lpthread" | 550 | [ PTHREAD_LIBRARIES="-lpthread" |
542 | AC_CHECK_FUNC(pthread_self, | 551 | AC_CHECK_FUNC(pthread_self, |
543 | [HAVE_PTHREAD=yes]) ]) | 552 | [HAVE_PTHREAD=yes]) ]) |
544 | if test $have_pthread != yes; then | 553 | if test $have_pthread != yes; then |
545 | AC_MSG_ERROR([POSIX threads library not found. Please install it and then reconfigure]) | 554 | AC_MSG_ERROR([POSIX threads library not found. Please install it and then reconfigure]) |
546 | fi | 555 | fi |
547 | 556 | ||
548 | libs="libpmilter/libpmilter.a \ | 557 | AC_CHECK_HEADERS([sm/error.h sm/hdrmoddef.h sm/pmfapi.h sm/pmilter.h sm/smreplycodes.h sm/generic.h sm/mfapi.h sm/pmfdef.h sm/smmts.h], |
549 | libpmilter/libpmutil.a\ | 558 | [], |
550 | libevthr/libevthr.a\ | 559 | [AC_MSG_ERROR([Required header file $ac_header not found])], |
551 | libthr/libthr.a\ | 560 | [ |
552 | libmta/librcbcomm.a\ | 561 | #ifdef HAVE_SM_ERROR_H |
553 | libmta/librcb.a\ | 562 | # include <sm/error.h> |
554 | libmta/libmtar.a\ | 563 | #endif]) |
555 | libmta/libcstrr.a\ | 564 | |
556 | libcheck/libcheck.a\ | 565 | libs="pmilter pmutil evthr thr rcbcomm rcb mtar cstrr replr" |
557 | librepl/libreplr.a" | 566 | LDFLAGS="$LDFLAGS $META1_LIBS" |
558 | |||
559 | AC_SUBST(META1_LIBS) | ||
560 | for file in $libs | 567 | for file in $libs |
561 | do | 568 | do |
562 | if test -f $meta1_dir/$file; then | 569 | AC_CHECK_LIB($file, main, |
563 | META1_LIBS="$META1_LIBS $meta1_dir/$file" | 570 | [META1_LIBS="$META1_LIBS -l$file"], |
564 | else | 571 | [AC_MSG_ERROR([Required library lib$file not found])]) |
565 | AC_MSG_ERROR([Required library $file not found in $meta1_dir]) | ||
566 | fi | ||
567 | done | 572 | done |
568 | AC_SUBST(ENABLE_PMULT,'${PMULT_PROG}') | 573 | AC_SUBST(ENABLE_PMULT,'${PMULT_PROG}') |
569 | AC_SUBST(META1_INCLUDES,"-I$meta1_dir/include") | ||
570 | LIBS=$saved_LIBS | 574 | LIBS=$saved_LIBS |
571 | fi | 575 | fi |
572 | 576 | ||
diff --git a/pmult/Makefile.am b/pmult/Makefile.am index b32888b7..68c0f522 100644 --- a/pmult/Makefile.am +++ b/pmult/Makefile.am | |||
@@ -26,8 +26,7 @@ INCLUDES = \ | |||
26 | -I$(top_srcdir)/lib\ | 26 | -I$(top_srcdir)/lib\ |
27 | -I$(top_srcdir)/gnu\ | 27 | -I$(top_srcdir)/gnu\ |
28 | -I../gnu\ | 28 | -I../gnu\ |
29 | -I../gacopyz\ | 29 | -I../gacopyz |
30 | @META1_INCLUDES@ | ||
31 | 30 | ||
32 | pmult_SOURCES = pmult.c pdbg.h | 31 | pmult_SOURCES = pmult.c pdbg.h |
33 | LDADD = \ | 32 | LDADD = \ |
diff --git a/pmult/pmult.c b/pmult/pmult.c index 0b1dff21..92cfc844 100644 --- a/pmult/pmult.c +++ b/pmult/pmult.c | |||
@@ -34,34 +34,6 @@ | |||
34 | #include <inttypes.h> | 34 | #include <inttypes.h> |
35 | const char *mu_umaxtostr (unsigned slot, uintmax_t val); | 35 | const char *mu_umaxtostr (unsigned slot, uintmax_t val); |
36 | 36 | ||
37 | /* There are several problems with using libpmilter, as of | ||
38 | meta1-1.0.PreAlpha22.0: | ||
39 | |||
40 | 1. libpmilter and libpmutl are installed, but none of the seven libraries | ||
41 | they depend on is; | ||
42 | 2. None of the necessary headers are installed, except pmfapi.h, | ||
43 | pmilter.h and pmfdef.h; | ||
44 | 3. The rest of headers include generic.h which defines PACKAGE_* symbols, | ||
45 | which no decent library should ever attempt to do; | ||
46 | |||
47 | I compensate for these deficiences by: | ||
48 | |||
49 | 1 and 2 - Special handling in configure.ac, which requires Meta1 sources | ||
50 | to be present; | ||
51 | 3 - Using the necessary symbols ASAP and undefining them before | ||
52 | including the pmilter headers; | ||
53 | */ | ||
54 | |||
55 | const char *program_version = "pmult (" PACKAGE_STRING ")"; | ||
56 | const char *package_bugreport = "<" PACKAGE_BUGREPORT ">"; | ||
57 | #undef PACKAGE | ||
58 | #undef PACKAGE_BUGREPORT | ||
59 | #undef PACKAGE_NAME | ||
60 | #undef PACKAGE_STRING | ||
61 | #undef PACKAGE_TARNAME | ||
62 | #undef PACKAGE_VERSION | ||
63 | #undef VERSION | ||
64 | |||
65 | #include "sm/error.h" | 37 | #include "sm/error.h" |
66 | #include "sm/smreplycodes.h" | 38 | #include "sm/smreplycodes.h" |
67 | #include "sm/pmilter.h" | 39 | #include "sm/pmilter.h" |
@@ -70,6 +42,9 @@ const char *package_bugreport = "<" PACKAGE_BUGREPORT ">"; | |||
70 | 42 | ||
71 | #include "pdbg.h" | 43 | #include "pdbg.h" |
72 | 44 | ||
45 | const char *program_version = "pmult (" PACKAGE_STRING ")"; | ||
46 | const char *package_bugreport = "<" PACKAGE_BUGREPORT ">"; | ||
47 | |||
73 | char *portspec; /* Communication socket */ | 48 | char *portspec; /* Communication socket */ |
74 | int log_to_stderr; /* Use stderr for logging */ | 49 | int log_to_stderr; /* Use stderr for logging */ |
75 | char *log_tag; /* override mu_log_tag */ | 50 | char *log_tag; /* override mu_log_tag */ |