|
|
@@ -56,11 +56,11 @@ Prefix: %{l_prefix}
|
|
|
BuildRoot: %{l_buildroot}
|
|
|
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, flex, bison
|
|
|
PreReq: OpenPKG, openpkg >= 20040130
|
|
|
-BuildPreReq: freetype, fontconfig, png, jpeg, gd
|
|
|
-PreReq: freetype, fontconfig, png, jpeg, gd
|
|
|
+BuildPreReq: freetype, png, jpeg, gd
|
|
|
+PreReq: freetype, png, jpeg, gd
|
|
|
%if "%{with_x11}" == "yes"
|
|
|
-BuildPreReq: X11
|
|
|
-PreReq: X11
|
|
|
+BuildPreReq: X11, fontconfig
|
|
|
+PreReq: X11, fontconfig
|
|
|
%endif
|
|
|
%if "%{with_perl}" == "yes"
|
|
|
BuildPreReq: perl, perl-sys, perl-openpkg
|
|
|
@@ -109,8 +109,6 @@ AutoReqProv: no
|
|
|
--prefix=%{l_prefix} \
|
|
|
--with-extraincludedir=%{l_prefix}/include \
|
|
|
--with-extralibdir=%{l_prefix}/lib \
|
|
|
- --with-fontconfigincludedir=%{l_prefix}/include \
|
|
|
- --with-fontconfiglibdir=%{l_prefix}/lib \
|
|
|
--with-freetypeincludedir=%{l_prefix}/include \
|
|
|
--with-freetypelibdir=%{l_prefix}/lib \
|
|
|
--with-pngincludedir=%{l_prefix}/include \
|
|
|
@@ -127,6 +125,8 @@ AutoReqProv: no
|
|
|
--with-x \
|
|
|
--x-includes=`%{l_rc} --query x11_incdir` \
|
|
|
--x-libraries=`%{l_rc} --query x11_libdir` \
|
|
|
+ --with-fontconfigincludedir=%{l_prefix}/include \
|
|
|
+ --with-fontconfiglibdir=%{l_prefix}/lib \
|
|
|
%else
|
|
|
--without-x \
|
|
|
%endif
|
