Browse Source

fix freetype support and add t1lib support

Ralf S. Engelschall 22 years ago
parent
commit
20f76428b8
1 changed files with 5 additions and 4 deletions
  1. 5 4
      xpdf/xpdf.spec

+ 5 - 4
xpdf/xpdf.spec

@@ -41,8 +41,8 @@ Source0:      ftp://ftp.foolabs.com/pub/xpdf/xpdf-%{version}.tar.gz
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030103, X11, freetype, xpm, lesstif
-PreReq:       OpenPKG, openpkg >= 20030103, X11, freetype, xpm, lesstif
+BuildPreReq:  OpenPKG, openpkg >= 20030103, X11, freetype, t1lib, xpm, lesstif, gcc
+PreReq:       OpenPKG, openpkg >= 20030103, X11, freetype, t1lib, xpm, lesstif
 AutoReq:      no
 AutoReqProv:  no
 
@@ -60,8 +60,9 @@ AutoReqProv:  no
     CXX="%{l_cxx}" \
     CFLAGS="%{l_cflags -O}" \
     CXXFLAGS="%{l_cxxflags -O}" \
-    CPPFLAGS="%{l_cppflags}" \
+    CPPFLAGS="%{l_cppflags} `%{l_prefix}/bin/freetype-config --cflags`" \
     LDFLAGS="%{l_ldflags}" \
+    LIBS="`%{l_prefix}/bin/freetype-config --libs`" \
     ./configure \
         --prefix=%{l_prefix} \
         --sysconfdir=%{l_prefix}/etc/xpdf \
@@ -73,7 +74,7 @@ AutoReqProv:  no
         --with-Xpm-library=%{l_prefix}/lib \
         --with-t1-includes=%{l_prefix}/include \
         --with-t1-library=%{l_prefix}/lib \
-        --with-freetype2-includes=%{l_prefix}/include \
+        --with-freetype2-includes=%{l_prefix}/include/freetype2 \
         --with-freetype2-library=%{l_prefix}/lib \
         --enable-a4-paper
     %{l_make} %{l_mflags -O}