OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Mar-2004 09:26:07
Branch: HEAD Handle: 2004030508260700
Modified files:
openpkg-src/emacs emacs.spec
Log:
fix TIFF support, make TIFF support explicit and add GIF support
Summary:
Revision Changes Path
1.45 +22 -2 openpkg-src/emacs/emacs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.spec
============================================================================
$ cvs diff -u -r1.44 -r1.45 emacs.spec
--- openpkg-src/emacs/emacs.spec 2 Mar 2004 19:43:08 -0000 1.44
+++ openpkg-src/emacs/emacs.spec 5 Mar 2004 08:26:07 -0000 1.45
@@ -34,15 +34,17 @@
Group: Editor
License: GPL
Version: 21.3
-Release: 20040302
+Release: 20040305
# package options
%option with_x11 no
%option with_jpeg no
%option with_png no
+%option with_tiff no
+%option with_gif no
# package option dependencies
-%if "%{with_jpeg}" == "yes" || "%{with_png}" == "yes"
+%if "%{with_jpeg}" == "yes" || "%{with_png}" == "yes" || "%{with_tiff}" == "yes" ||
"%{with_gif}" == "yes"
%undefine with_x11
%define with_x11 yes
%endif
@@ -67,6 +69,14 @@
BuildPreReq: png, zlib
PreReq: png, zlib
%endif
+%if "%{with_tiff}" == "yes"
+BuildPreReq: tiff
+PreReq: tiff
+%endif
+%if "%{with_gif}" == "yes"
+BuildPreReq: giflib
+PreReq: giflib
+%endif
%endif
AutoReq: no
AutoReqProv: no
@@ -93,7 +103,11 @@
configure
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+%if "%{with_tiff}" == "yes"
+ CPPFLAGS="%{l_cppflags tiff .}" \
+%else
CPPFLAGS="%{l_cppflags}" \
+%endif
LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
@@ -106,6 +120,12 @@
%endif
%if "%{with_png}" == "yes"
--with-png \
+%endif
+%if "%{with_tiff}" == "yes"
+ --with-tiff \
+%endif
+%if "%{with_gif}" == "yes"
+ --with-gif \
%endif
--with-x-toolkit=yes
%else
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
