Index: configure --- configure.orig 2011-07-05 17:13:25.000000000 +0200 +++ configure 2011-07-22 22:04:56.000000000 +0200 @@ -4591,7 +4591,7 @@ old_as_test_x="$as_test_x" as_test_x='test -e' # Extract the first word of "libmilter/mfapi.h", so it can be a program name with args. -set dummy libmilter/mfapi.h; ac_word=$2 +set dummy milter/mfapi.h; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_MINCLUDE+set}" = set; then : Index: embperl.c --- embperl.c.orig 2010-08-18 19:34:27.000000000 +0200 +++ embperl.c 2011-07-21 23:39:01.000000000 +0200 @@ -73,11 +73,13 @@ } memset(argv, 0, PERLPARSE_NUM_ARGS * sizeof(char *)); +#ifdef SAFE_EMBED_PERL + PL_perl_destruct_level = 1; +#endif if (my_perl != NULL) { #ifdef SAFE_EMBED_PERL PSC(my_perl); PERL_SET_INTERP(my_perl); - PL_perl_destruct_level = 1; perl_destruct(my_perl); perl_free(my_perl); my_perl = NULL; Index: milter_cap.c --- milter_cap.c.orig 2009-05-04 17:35:41.000000000 +0200 +++ milter_cap.c 2011-07-21 23:39:01.000000000 +0200 @@ -12,7 +12,7 @@ * ***********************************************************************/ #include -#include "libmilter/mfapi.h" +#include "milter/mfapi.h" #include "milter_cap.h" /********************************************************************** Index: mimedefang.c --- mimedefang.c.orig 2011-06-20 16:56:38.000000000 +0200 +++ mimedefang.c 2011-07-21 23:39:01.000000000 +0200 @@ -64,7 +64,7 @@ #include #include -#include "libmilter/mfapi.h" +#include "milter/mfapi.h" #include "milter_cap.h" #include