diff options
| author | Alexander Leidinger <netchild@FreeBSD.org> | 2005-09-14 18:02:02 +0000 |
|---|---|---|
| committer | Alexander Leidinger <netchild@FreeBSD.org> | 2005-09-14 18:02:02 +0000 |
| commit | b90aea061c33db559d3130109d0b60d0b1ca3226 (patch) | |
| tree | a5cdfa40d062ec6487f961dec861e4cc7c103de4 | |
| parent | Update to DAT 4581 (diff) | |
Fix compile ("LOCALEDIR undeclared" error) for people which don't want
openssl support.
Noticed by: Piotr Smyrak <piotr.smyrak@heron.pl>
Submitted by: marcus via Piotr Smyrak <piotr.smyrak@heron.pl>
Tested by: Piotr Smyrak <piotr.smyrak@heron.pl>
Notes
Notes:
svn path=/head/; revision=142729
| -rw-r--r-- | mail/claws-mail/Makefile | 4 | ||||
| -rw-r--r-- | mail/sylpheed-claws/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index 5a8cb56fc69d..9e98ec8ce43a 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -43,8 +43,6 @@ CONFIGURE_ARGS= --program-suffix="-claws" --enable-ipv6 \ CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ - OPENSSL_CFLAGS="-I${OPENSSLINC}" \ - OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" OPTIONS= ALL "Enable all options." off \ @@ -71,6 +69,8 @@ EXTRA_PATCHES= ${FILESDIR}/extra-doc:Makefile.in .include "${PORTSDIR}/Mk/bsd.openssl.mk" CONFIGURE_ARGS+= --enable-openssl --with-openssl-includes=${OPENSSLINC} \ --with-openssl-libs=${OPENSSLLIB} +CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ + OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" .else CONFIGURE_ARGS+= --disable-openssl .endif diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile index 5a8cb56fc69d..9e98ec8ce43a 100644 --- a/mail/sylpheed-claws/Makefile +++ b/mail/sylpheed-claws/Makefile @@ -43,8 +43,6 @@ CONFIGURE_ARGS= --program-suffix="-claws" --enable-ipv6 \ CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ - OPENSSL_CFLAGS="-I${OPENSSLINC}" \ - OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" OPTIONS= ALL "Enable all options." off \ @@ -71,6 +69,8 @@ EXTRA_PATCHES= ${FILESDIR}/extra-doc:Makefile.in .include "${PORTSDIR}/Mk/bsd.openssl.mk" CONFIGURE_ARGS+= --enable-openssl --with-openssl-includes=${OPENSSLINC} \ --with-openssl-libs=${OPENSSLLIB} +CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ + OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" .else CONFIGURE_ARGS+= --disable-openssl .endif |