From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 18 Jun 2013 14:48:31 +0000 (+0200)
Subject: postfix: Do proper configuration.
X-Git-Tag: v2.13-core70~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c050a2243395789557f77e9d86015fe44ac90895;p=ipfire-2.x.git

postfix: Do proper configuration.

Adds LDAP support because the libs are always installed.
Disables IPv6, because IPFire 2 does not support IPv6.
The rest is cleanup stuff.
---

diff --git a/lfs/postfix b/lfs/postfix
index cfebeac067..77c6dd0e4a 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -36,6 +36,31 @@ PAK_VER    = 7
 
 DEPS       = "amavisd mysql"
 
+CCARGS     = -DNO_IPV6 `getconf LFS_CFLAGS` \
+	-DDEF_DAEMON_DIR="'\"/usr/lib/postfix\"'" \
+	-DDEF_MANPAGE_DIR="'\"/usr/share/man\"'"
+AUXLIBS    =
+
+# LDAP
+CCARGS    += -DHAS_LDAP -DLDAP_DEPRECATED=1
+AUXLIBS   += -lldap -llber
+
+# PCRE
+CCARGS    += -DHAS_PCRE -I/usr/include/pcre
+AUXLIBS   += -lpcre
+
+# MySQL
+CCARGS    += -DHAS_MYSQL -I/usr/include/mysql
+AUXLIBS   += -L/usr/lib/mysql -lmysqlclient -lm
+
+# SASL
+CCARGS    += -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl
+AUXLIBS   += -L/usr/lib/sasl2 -lsasl2
+
+# SSL
+CCARGS    += -DUSE_TLS `pkg-config --cflags openssl`
+AUXLIBS   += `pkg-config --libs openssl`
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -78,8 +103,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && make -f Makefile.init makefiles \
-				'CCARGS=-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" -DDEF_MANPAGE_DIR=\"/usr/share/man\" -DUSE_TLS -I/usr/include/openssl -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl -DHAS_MYSQL -I/usr/include/mysql' \
-				'AUXLIBS=-L/usr/lib -L/usr/lib/sasl2 -lz -lm  -lssl -lcrypto -lmysqlclient -L/usr/lib/mysql -lsasl2 -L/usr/lib'
+		DEBUG="" OPT="$(CFLAGS) -fno-strict-aliasing" CCARGS="$(CCARGS)" AUXLIBS="$(AUXLIBS)"
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && sh postfix-install -non-interactive
 	## Install configuration