- two missing dirs

[packages/amavisd.git] / amavisd-nomilter.patch

diff --git a/amavisd-nomilter.patch b/amavisd-nomilter.patch
index 6ca2cea3c441dbd55d957f58ed36eb65382c6614..9a0543e4eaf9446dbf6354bc3134ca4100609899 100644 (file)
--- a/amavisd-nomilter.patch
+++ b/amavisd-nomilter.patch
@@ -1,33 +1,42 @@
-diff -Nru amavisd-snapshot-20010714.orig/configure.in amavisd-snapshot-20010714/configure.in
---- amavisd-snapshot-20010714.orig/configure.in        Sat Jul 14 18:23:35 2001
-+++ amavisd-snapshot-20010714/configure.in     Sat Apr 20 16:47:21 2002
-@@ -173,28 +173,7 @@
+diff -urN amavisd-snapshot-20020300.org/configure.in amavisd-snapshot-20020300/configure.in
+--- amavisd-snapshot-20020300.org/configure.in Thu Jun  6 22:33:49 2002
++++ amavisd-snapshot-20020300/configure.in     Thu Jun  6 22:40:47 2002
+@@ -184,37 +184,7 @@
+   AC_PATH_PROG(libmilter_config, libmilter-config)
+   if test "x$libmilter_config" = x ; then
  
- if test "x$enable_milter" = xyes ; then
- 
--  AC_CHECK_FUNCS(inet_aton,,AC_CHECK_LIB(resolv,inet_aton))
+-    AC_CHECK_FUNCS(inet_aton,,[AC_CHECK_LIB(resolv,inet_aton)])
 -
--  ACX_PTHREAD([
--    LIBS="$PTHREAD_LIBS $LIBS"
--    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
--    CC="$PTHREAD_CC"
+-    ACX_PTHREAD([
+-      LIBS="$PTHREAD_LIBS $LIBS"
+-      CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+-      CC="$PTHREAD_CC"
 -
--    AC_CHECK_HEADERS(sm/gen.h,
--      AC_EGREP_HEADER([typedef.*bool],sm/gen.h,
--        AC_DEFINE(HAVE_SM_GEN_BOOL_TYPE, 1,
--                  [ Define if <sm/gen.h> defines the bool type. ])))
+-      AC_CHECK_HEADERS(sm/gen.h,
+-        [AC_EGREP_HEADER([typedef.*bool],sm/gen.h,
+-           [AC_DEFINE(HAVE_SM_GEN_BOOL_TYPE, 1,
+-                      [ Define if <sm/gen.h> defines the bool type. ])])])
 -
--    # sendmail 8.11: need -lsmutil
--    # sendmail 8.12: need -lsm
--    AC_CHECK_LIB(smutil,errstring,,AC_CHECK_LIB(sm,sm_errstring))
+-      # maybe sendmail is using sfio (for TLS encryption)
+-      AC_CHECK_LIB(sfio,_stdprintf)
 -
--    AC_CHECK_HEADERS(libmilter/mfapi.h,
--      AC_CHECK_LIB(milter,smfi_main,,enable_milter=no),
--      enable_milter=no)
--    ],
--    [AC_MSG_WARN([No usable pthreads library found - disabling milter])
--     enable_milter=no])
-+     enable_milter=no
- 
- fi
+-      # sendmail 8.11: need -lsmutil
+-      # sendmail 8.12: need -lsm
+-      AC_CHECK_LIB(smutil,errstring,,[AC_CHECK_LIB(sm,sm_errstring)])
+-      AC_CHECK_LIB(smutil,strlcpy,
+-                   [AC_DEFINE(HAVE_SMUTIL_STRLCPY, 1,
+-                              [ Define if you have the strlcpy function in libsmutil. ])],
+-                   [AC_CHECK_LIB(sm,sm_strlcpy,
+-                                 [AC_DEFINE(HAVE_SM_SM_STRLCPY, 1,
+-                                            [ Define if you have the sm_strlcpy function in libsm. ])])])
+-
+-      AC_CHECK_HEADERS(libmilter/mfapi.h,
+-        [AC_CHECK_LIB(milter,smfi_main,,enable_milter=no)],
+-         enable_milter=no)
+-      ],
+-      [AC_MSG_WARN([No usable pthreads library found - disabling milter])
+-       enable_milter=no])
++       enable_milter=no
  
+   else
+     milter_cflags=`$libmilter_config --cflags`