- really fix this patch, make the whole damn thing compile

Changed files:
    cyrus-imapd-et.patch -> 1.2

diff --git a/cyrus-imapd-et.patch b/cyrus-imapd-et.patch
index 3b32ed53596dd61c8e4924fb0c779c7be07732b5..971c798ff352048a323496bbb2464a37472d007b 100644 (file)
--- a/cyrus-imapd-et.patch
+++ b/cyrus-imapd-et.patch
@@ -1,17 +1,13 @@
---- cyrus-imapd-2.0.14/configure.in.wiget      Thu Jun 21 20:46:04 2001
-+++ cyrus-imapd-2.0.14/configure.in    Thu Jun 21 23:40:18 2001
-@@ -668,11 +668,12 @@
+diff -burN cyrus-imapd-2.1.14-orig/configure.in cyrus-imapd-2.1.14/configure.in
+--- cyrus-imapd-2.1.14-orig/configure.in       2003-09-04 13:29:51.877651520 +0200
++++ cyrus-imapd-2.1.14/configure.in    2003-09-04 13:32:18.193408144 +0200
+@@ -793,7 +793,8 @@
        ;;
    *) # use whatever they told us, or whatever we found
       COMPILE_ET="${with_com_err}/bin/compile_et"
 -     COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
-+     COM_ERR_LDFLAGS="-L${with_com_err}/lib"
++     COM_ERR_LDFLAGS="-L${with_com_err}/lib/libcom_err.a"
 +     COM_ERR_LIBS="-lcom_err"
       COM_ERR_CPPFLAGS="-I${with_com_err}/include"
       # Ever get the feeling people hide this stuff on purpose?
       if test -d "${with_com_err}/include/et" ; then
--       COM_ERR_CPPFLAGS="-I${with_com_err}/include"
-+      COM_ERR_CPPFLAGS="-I${with_com_err}/include/et"
-      fi
- dnl     CMU_ADD_LIBPATH_TO(${with_com_err}/lib, COM_ERR_LDFLAGS)
-      COMPILE_ET="${with_com_err}/bin/compile_et"