OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Oct-2006 14:13:44
Branch: HEAD Handle: 2006101613134400
Modified files:
openpkg-src/t1lib t1lib.spec
Log:
make X11 support optional and disable by default
Summary:
Revision Changes Path
1.15 +17 -3 openpkg-src/t1lib/t1lib.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/t1lib/t1lib.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 t1lib.spec
--- openpkg-src/t1lib/t1lib.spec 13 Oct 2006 17:34:43 -0000 1.14
+++ openpkg-src/t1lib/t1lib.spec 16 Oct 2006 12:13:44 -0000 1.15
@@ -33,7 +33,10 @@
Group: Graphics
License: LGPL
Version: 5.1.0
-Release: 20061013
+Release: 20061016
+
+# package options
+%option with_x11 no
# list of sources
Source0:
http://www.ibiblio.org/pub/Linux/libs/graphics/t1lib-%{version}.tar.gz
@@ -41,8 +44,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, X11, gcc, make, config
-PreReq: OpenPKG, openpkg >= 20040130, X11
+BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, config
+PreReq: OpenPKG, openpkg >= 20040130
+%if "%{with_x11}" == "yes"
+BuildPreReq: X11
+PreReq: X11
+%endif
AutoReq: no
AutoReqProv: no
@@ -72,6 +79,13 @@
./configure \
--prefix=%{l_prefix} \
--datadir=%{l_prefix}/etc \
+%if "%{with_x11}" == "yes"
+ --with-x \
+ --x-includes=`%{l_rc} --query x11_incdir` \
+ --x-libraries=`%{l_rc} --query x11_libdir` \
+%else
+ --without-x \
+%endif
--disable-shared
%{l_make} %{l_mflags -O} without_doc
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
