[Devil-linux-commit] build/scripts postfix,1.25,1.26

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1054/scripts

Modified Files:
	postfix 
Log Message:
don't make everything dependend on tls


Index: postfix
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/postfix,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- postfix	2 Sep 2004 13:17:10 -0000	1.25
+++ postfix	2 Sep 2004 13:20:36 -0000	1.26
@@ -29,6 +29,8 @@
 	build )
 		if [ "$CONFIG_POSTFIX" = "y" ]; then
 			make tidy
+			CCARGS=""
+			AUXLIBS=""
 			if [ "$CONFIG_POSTFIX_TLS" = "y" ]; then
 				if [ ! -f postfix_tls_patch ]; then
 					PFIXTLSPATCH=$(ls $WORKDIR/pfixtls*/pfixtls.diff)
@@ -37,24 +39,24 @@
 				fi
 				CCARGS="-DHAS_SSL -I/usr/include/openssl"
 				AUXLIBS="-lssl -lcrypto"
-				if [ "$CONFIG_CYRUS_SASL" = "y" ]; then
-					CCARGS="$CCARGS -DUSE_SASL_AUTH -I/usr/include/sasl"
-					AUXLIBS="$AUXLIBS -lsasl2"
-				fi
-				if [ "$CONFIG_OPENLDAPLIB" = "y" ]; then
-					CCARGS="$CCARGS -DHAS_LDAP"
-					AUXLIBS="$AUXLIBS -lldap -llber"
-				fi
-				if [ "$CONFIG_MYSQL_CLIENT" = "y" ]; then
-					CCARGS="$CCARGS -DHAS_MYSQL -I/usr/include/mysql"
-					AUXLIBS="$AUXLIBS -lmysqlclient -lm -lz"
-				fi
-				if [ "$CONFIG_POSTGRESQL_CLIENT" = "y" ]; then
-					CCARGS="$CCARGS -DHAS_PGSQL -I/usr/include/pgsql"
-					AUXLIBS="$AUXLIBS -lpq"
-				fi
-				make makefiles CCARGS="$CCARGS" AUXLIBS="$AUXLIBS" || exit 1
 			fi
+			if [ "$CONFIG_CYRUS_SASL" = "y" ]; then
+				CCARGS="$CCARGS -DUSE_SASL_AUTH -I/usr/include/sasl"
+				AUXLIBS="$AUXLIBS -lsasl2"
+			fi
+			if [ "$CONFIG_OPENLDAPLIB" = "y" ]; then
+				CCARGS="$CCARGS -DHAS_LDAP"
+				AUXLIBS="$AUXLIBS -lldap -llber"
+			fi
+			if [ "$CONFIG_MYSQL_CLIENT" = "y" ]; then
+				CCARGS="$CCARGS -DHAS_MYSQL -I/usr/include/mysql"
+				AUXLIBS="$AUXLIBS -lmysqlclient -lm -lz"
+			fi
+			if [ "$CONFIG_POSTGRESQL_CLIENT" = "y" ]; then
+				CCARGS="$CCARGS -DHAS_PGSQL -I/usr/include/pgsql"
+				AUXLIBS="$AUXLIBS -lpq"
+			fi
+			make makefiles CCARGS="$CCARGS" AUXLIBS="$AUXLIBS" || exit 1
 			make $PMAKE || exit 1
 			strip_debug
 		fi