diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2007-09-14 08:43:08 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2007-09-14 08:43:08 +0000 |
| commit | 5b792ffa48d6ef875cdcc8e171d5be2ad6835709 (patch) | |
| tree | d0b542d1e4dd1c9a20103f4a8a30c2d31c5b1488 /lang | |
| parent | Update to 5.2.4 release. (diff) | |
Add Xpm to OPTIONS (now we can).
Requested by: delphij
Notes
Notes:
svn path=/head/; revision=199478
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/php5/Makefile.ext | 9 | ||||
| -rw-r--r-- | lang/php53/Makefile.ext | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index 050feae1faf8..bdb2368337c1 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -86,9 +86,6 @@ USE_OPENSSL= yes LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg -. if !defined(WITHOUT_X11) -USE_XORG= xpm -. endif CONFIGURE_ARGS+=--with-gd \ --with-freetype-dir=${LOCALBASE} \ @@ -102,6 +99,9 @@ CONFIGURE_ARGS+=--with-xpm-dir=${X11BASE} OPTIONS= T1LIB "Include T1lib support" on \ TRUETYPE "Enable TrueType string function" on \ JIS "Enable JIS-mapped Japanese font support" off +. if !defined(WITHOUT_X11) +OPTIONS+= XPM "Enable Xpm support" on +. endif PHP_HEADER_DIRS=libgd .endif @@ -560,6 +560,9 @@ CONFIGURE_ARGS+=--enable-gd-native-ttf . if defined(WITH_JIS) CONFIGURE_ARGS+=--enable-gd-jis-conv . endif +. if !defined(WITHOUT_XPM) && !defined(WITHOUT_X11) +USE_XORG= xpm +. endif .endif .if ${PHP_MODNAME} == "mbstring" diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext index 050feae1faf8..bdb2368337c1 100644 --- a/lang/php53/Makefile.ext +++ b/lang/php53/Makefile.ext @@ -86,9 +86,6 @@ USE_OPENSSL= yes LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg -. if !defined(WITHOUT_X11) -USE_XORG= xpm -. endif CONFIGURE_ARGS+=--with-gd \ --with-freetype-dir=${LOCALBASE} \ @@ -102,6 +99,9 @@ CONFIGURE_ARGS+=--with-xpm-dir=${X11BASE} OPTIONS= T1LIB "Include T1lib support" on \ TRUETYPE "Enable TrueType string function" on \ JIS "Enable JIS-mapped Japanese font support" off +. if !defined(WITHOUT_X11) +OPTIONS+= XPM "Enable Xpm support" on +. endif PHP_HEADER_DIRS=libgd .endif @@ -560,6 +560,9 @@ CONFIGURE_ARGS+=--enable-gd-native-ttf . if defined(WITH_JIS) CONFIGURE_ARGS+=--enable-gd-jis-conv . endif +. if !defined(WITHOUT_XPM) && !defined(WITHOUT_X11) +USE_XORG= xpm +. endif .endif .if ${PHP_MODNAME} == "mbstring" |