Module Name: src
Committed By: joerg
Date: Wed Sep 11 09:59:13 UTC 2013
Modified Files:
src/external/ibm-public/postfix: Makefile.inc
Log Message:
Drop now redundant assignment from the MKPIC=no case.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/ibm-public/postfix/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/ibm-public/postfix/Makefile.inc
diff -u src/external/ibm-public/postfix/Makefile.inc:1.15 src/external/ibm-public/postfix/Makefile.inc:1.16
--- src/external/ibm-public/postfix/Makefile.inc:1.15 Wed Sep 11 09:58:02 2013
+++ src/external/ibm-public/postfix/Makefile.inc Wed Sep 11 09:59:13 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.15 2013/09/11 09:58:02 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.16 2013/09/11 09:59:13 joerg Exp $
.include <bsd.own.mk>
@@ -61,13 +61,9 @@ CPPFLAGS+= -DHAS_LDAP
. if defined(PROG)
LDADD+= -lldap -llber
DPADD+= ${LIBLDAP} ${LIBLBER}
-. if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != ""))
-LDADD+= -llber
-DPADD+= ${LIBLBER}
-. if ${MKCRYPTO} != "no"
+. if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "")) && ${MKCRYPTO} != "no"
DPADD+= ${LIBSSL} ${LIBCRYPTO}
LDADD+= -lssl -lcrypto
-. endif
. endif
. endif
.endif # USE_LDAP != no
