cyrus-sasl: Run autoconf before build.

[people/teissler/ipfire-2.x.git] / lfs / cyrus-sasl

diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index e9235cbd34e0c6792e1050e004a49d54948bd9f0..af2b1488939563cbbe97351c33888524a280437d 100644 (file)
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -82,8 +82,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-sasl-2.1.22-bad-elif.patch
        cd $(DIR_APP) && sed -i '/sasl_global/s/^static //' lib/client.c
-       cd $(DIR_APP) && sed -i 's/cat8/man8/' saslauthd/Makefile.in
+       cd $(DIR_APP) && sed -i 's/cat8/man8/' saslauthd/Makefile.am
+       cd $(DIR_APP) && autoconf
 
 ifeq "$(PASS)" ""
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
@@ -93,12 +95,14 @@ ifeq "$(PASS)" ""
        cd $(DIR_APP) && make install
        install -v -m700 -d /var/lib/sasl
        -mkdir /var/run/saslauthd
+       cp -vf $(DIR_SRC)/config/cyrus-sasl/smtpd.conf /usr/lib/sasl2/
 else
        # WITH LDAP SUPPORT AT THIS TIME
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
                            --with-dbpath=/var/lib/sasl/sasldb2 \
                            --with-saslauthd=/var/run \
                             --with-ldap --enable-ldapdb
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make -C include
        cd $(DIR_APP) && make -C sasldb
        cd $(DIR_APP) && make -C plugins