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: 16-Sep-2004 14:30:14
Branch: HEAD Handle: 2004091613301300
Modified files:
openpkg-src/emacs emacs.spec
Log:
either use xaw3d explicitly or not at all but never implicitly because
this is reported to cause trouble with not working scroll-bars under
run-time
Summary:
Revision Changes Path
1.47 +20 -2 openpkg-src/emacs/emacs.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.spec
============================================================================
$ cvs diff -u -r1.46 -r1.47 emacs.spec
--- openpkg-src/emacs/emacs.spec 4 Jun 2004 11:28:36 -0000 1.46
+++ openpkg-src/emacs/emacs.spec 16 Sep 2004 12:30:13 -0000 1.47
@@ -34,10 +34,11 @@
Group: Editor
License: GPL
Version: 21.3
-Release: 20040604
+Release: 20040916
# package options
%option with_x11 no
+%option with_xaw3d no
%option with_jpeg no
%option with_png no
%option with_tiff no
@@ -61,6 +62,10 @@
%if "%{with_x11}" == "yes"
BuildPreReq: X11
PreReq: X11
+%if "%{with_xaw3d}" == "yes"
+BuildPreReq: xaw3d
+PreReq: xaw3d
+%endif
%if "%{with_jpeg}" == "yes"
BuildPreReq: jpeg
PreReq: jpeg
@@ -96,6 +101,11 @@
%patch -p0
%build
+%if "%{with_xaw3d}" != "yes"
+ ( echo "ac_cv_header_X11_Xaw3d_Scrollbar_h=no"
+ echo "ac_cv_lib_Xaw3d_XawScrollbarSetThumb=no"
+ ) >config.cache
+%endif
%{l_shtool} subst \
-e 's;/${version}/;/;g' \
-e 's;/${version};;g' \
@@ -110,11 +120,19 @@
%endif
LDFLAGS="%{l_ldflags}" \
./configure \
+%if "%{with_xaw3d}" != "yes"
+ --cache-file=./config.cache \
+%endif
--prefix=%{l_prefix} \
%if "%{with_x11}" == "yes"
--with-x \
--x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
--x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
+%if "%{with_xaw3d}" == "yes"
+ --with-toolkit-scroll-bars \
+%else
+ --without-toolkit-scroll-bars \
+%endif
%if "%{with_jpeg}" == "yes"
--with-jpeg \
%endif
@@ -127,7 +145,7 @@
%if "%{with_gif}" == "yes"
--with-gif \
%endif
- --with-x-toolkit=yes
+ --with-x-toolkit=athena
%else
--with-x-toolkit=no \
--without-x
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
