Merge remote-tracking branch 'ms/ipsec-subnets' into next

[ipfire-2.x.git] / lfs / cyrus-imapd

diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index f7722345c4e53c8456ec83277ee6d9fc9cd90e3c..f4c855c760e6f2bd3d0603a4c96ce02052b3c7b0 100644 (file)
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -31,11 +31,14 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = armv5tel i586
 PROG       = cyrus-imapd
 PAK_VER    = 5
 
 DEPS       = ""
 
+CFLAGS    += -I/usr/include/et
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -79,9 +82,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-autocreate-0.9.4.diff
        cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-gcc4.patch
-#      cp -f /usr/include/et/com_err.h /usr/include/com_err.h
-       cd $(DIR_APP) && cp -vf /usr/share/automake-*/config.{guess,sub} .
-       cd $(DIR_APP) && autoreconf -vfi
        cd $(DIR_APP) && ./configure --prefix=/usr --with-service-path=/usr/lib/cyrus \
                                --with-cyrus-prefix=/usr/lib/cyrus --sysconfdir=/var/ipfire/cyrusimap \
                                --with-auth=unix --with-perl --with-sasl --with-idle=idled \