From da741cc5b1e6a5175a02e941b6ad7841b59b6852 Mon Sep 17 00:00:00 2001 From: Oliver Lehmann Date: Thu, 2 Oct 2003 19:02:03 +0000 Subject: Move USE_* above bsd.port.pre.mk. PR: 57502 Submitted by: Oliver Eikemeier --- mail/sylpheed/Makefile | 13 ++++++++++--- mail/sylpheed2-devel/Makefile | 13 ++++++++++--- mail/sylpheed2/Makefile | 13 ++++++++++--- mail/sylpheed3/Makefile | 13 ++++++++++--- 4 files changed, 40 insertions(+), 12 deletions(-) (limited to 'mail') diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index ccba8087c8a2..41c9ff0f9bfe 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -28,13 +28,21 @@ CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE} CONFIGURE_ARGS= --enable-ipv6 --prefix=${PREFIX} --with-included-gettext \ --program-transform-name='' -.include +.if !defined(WITHOUT_SSL) +USE_OPENSSL= yes +.endif .if defined(WITH_PIXBUF) USE_GNOME+= gdkpixbuf -CONFIGURE_ARGS+=--disable-imlib .else USE_GNOME+= imlib +.endif + +.include + +.if defined(WITH_PIXBUF) +CONFIGURE_ARGS+=--disable-imlib +.else CONFIGURE_ARGS+=--disable-gdk-pixbuf .endif .if defined(WITH_GPGME) @@ -64,7 +72,6 @@ CONFIGURE_ARGS+=--enable-ldap CONFIGURE_ARGS+=--disable-ldap .endif .if !defined(WITHOUT_SSL) -USE_OPENSSL= yes CONFIGURE_ARGS+=--enable-ssl .else CONFIGURE_ARGS+=--disable-ssl diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile index ccba8087c8a2..41c9ff0f9bfe 100644 --- a/mail/sylpheed2-devel/Makefile +++ b/mail/sylpheed2-devel/Makefile @@ -28,13 +28,21 @@ CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE} CONFIGURE_ARGS= --enable-ipv6 --prefix=${PREFIX} --with-included-gettext \ --program-transform-name='' -.include +.if !defined(WITHOUT_SSL) +USE_OPENSSL= yes +.endif .if defined(WITH_PIXBUF) USE_GNOME+= gdkpixbuf -CONFIGURE_ARGS+=--disable-imlib .else USE_GNOME+= imlib +.endif + +.include + +.if defined(WITH_PIXBUF) +CONFIGURE_ARGS+=--disable-imlib +.else CONFIGURE_ARGS+=--disable-gdk-pixbuf .endif .if defined(WITH_GPGME) @@ -64,7 +72,6 @@ CONFIGURE_ARGS+=--enable-ldap CONFIGURE_ARGS+=--disable-ldap .endif .if !defined(WITHOUT_SSL) -USE_OPENSSL= yes CONFIGURE_ARGS+=--enable-ssl .else CONFIGURE_ARGS+=--disable-ssl diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile index ccba8087c8a2..41c9ff0f9bfe 100644 --- a/mail/sylpheed2/Makefile +++ b/mail/sylpheed2/Makefile @@ -28,13 +28,21 @@ CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE} CONFIGURE_ARGS= --enable-ipv6 --prefix=${PREFIX} --with-included-gettext \ --program-transform-name='' -.include +.if !defined(WITHOUT_SSL) +USE_OPENSSL= yes +.endif .if defined(WITH_PIXBUF) USE_GNOME+= gdkpixbuf -CONFIGURE_ARGS+=--disable-imlib .else USE_GNOME+= imlib +.endif + +.include + +.if defined(WITH_PIXBUF) +CONFIGURE_ARGS+=--disable-imlib +.else CONFIGURE_ARGS+=--disable-gdk-pixbuf .endif .if defined(WITH_GPGME) @@ -64,7 +72,6 @@ CONFIGURE_ARGS+=--enable-ldap CONFIGURE_ARGS+=--disable-ldap .endif .if !defined(WITHOUT_SSL) -USE_OPENSSL= yes CONFIGURE_ARGS+=--enable-ssl .else CONFIGURE_ARGS+=--disable-ssl diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile index ccba8087c8a2..41c9ff0f9bfe 100644 --- a/mail/sylpheed3/Makefile +++ b/mail/sylpheed3/Makefile @@ -28,13 +28,21 @@ CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE} CONFIGURE_ARGS= --enable-ipv6 --prefix=${PREFIX} --with-included-gettext \ --program-transform-name='' -.include +.if !defined(WITHOUT_SSL) +USE_OPENSSL= yes +.endif .if defined(WITH_PIXBUF) USE_GNOME+= gdkpixbuf -CONFIGURE_ARGS+=--disable-imlib .else USE_GNOME+= imlib +.endif + +.include + +.if defined(WITH_PIXBUF) +CONFIGURE_ARGS+=--disable-imlib +.else CONFIGURE_ARGS+=--disable-gdk-pixbuf .endif .if defined(WITH_GPGME) @@ -64,7 +72,6 @@ CONFIGURE_ARGS+=--enable-ldap CONFIGURE_ARGS+=--disable-ldap .endif .if !defined(WITHOUT_SSL) -USE_OPENSSL= yes CONFIGURE_ARGS+=--enable-ssl .else CONFIGURE_ARGS+=--disable-ssl -- cgit v1.2.3