diff options
Diffstat (limited to 'pmult')
| -rw-r--r-- | pmult/Makefile.am | 3 | ||||
| -rw-r--r-- | pmult/pmult.c | 31 |
2 files changed, 4 insertions, 30 deletions
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 = \ -I$(top_srcdir)/lib\ -I$(top_srcdir)/gnu\ -I../gnu\ - -I../gacopyz\ - @META1_INCLUDES@ + -I../gacopyz pmult_SOURCES = pmult.c pdbg.h 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 @@ #include <inttypes.h> const char *mu_umaxtostr (unsigned slot, uintmax_t val); -/* There are several problems with using libpmilter, as of - meta1-1.0.PreAlpha22.0: - - 1. libpmilter and libpmutl are installed, but none of the seven libraries - they depend on is; - 2. None of the necessary headers are installed, except pmfapi.h, - pmilter.h and pmfdef.h; - 3. The rest of headers include generic.h which defines PACKAGE_* symbols, - which no decent library should ever attempt to do; - - I compensate for these deficiences by: - - 1 and 2 - Special handling in configure.ac, which requires Meta1 sources - to be present; - 3 - Using the necessary symbols ASAP and undefining them before - including the pmilter headers; -*/ - -const char *program_version = "pmult (" PACKAGE_STRING ")"; -const char *package_bugreport = "<" PACKAGE_BUGREPORT ">"; -#undef PACKAGE -#undef PACKAGE_BUGREPORT -#undef PACKAGE_NAME -#undef PACKAGE_STRING -#undef PACKAGE_TARNAME -#undef PACKAGE_VERSION -#undef VERSION - #include "sm/error.h" #include "sm/smreplycodes.h" #include "sm/pmilter.h" @@ -70,6 +42,9 @@ const char *package_bugreport = "<" PACKAGE_BUGREPORT ">"; #include "pdbg.h" +const char *program_version = "pmult (" PACKAGE_STRING ")"; +const char *package_bugreport = "<" PACKAGE_BUGREPORT ">"; + char *portspec; /* Communication socket */ int log_to_stderr; /* Use stderr for logging */ char *log_tag; /* override mu_log_tag */ |