--3V7upXqbjpZ4EhLz
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit

Hi,

could someone with cvs access please have a look at the attached (quite
trivial patches) against kdebase-3.1alpha1 and commit the changes if I
didn't do something stupid? The patches cure the following problems I've
encountered while compiling on my Solaris 8/x86 box (the same should
be true for Sparc systems):

My testing environment:
Solaris 8 10/01 (x86)
gcc 2.95.2,
Qt 3.0.5
XFree86 (just the Xserver, libs & includes as provided by Sun)

* kdm/configure.in.in:

  The test for the symbol "main" in libXau.a fails (and thus prevents kdm
  from being compiled on Solaris), because there is no such
  symbol in that library, so I changed it to look for "XauReadAuth". Further,
  I had to add "$all_libraries" for this test AND add the switch
  '--xlibraries=/usr/openwin/lib" during ./configure, since Sun doesn't
  provide symlinks (for static libs like libXau) in /usr/lib in contrast to
  most (all?) other X libraries. Maybe it should be noted in the compilation
  FAQ that it is always a good idea to use '--x-includes' and '--x-libraries'
  during configure on Solaris...

* ksysguard/configure.in.in:

  The "test" command in Solaris' /bin/sh is a shell-builtin which doesn't
  know anything of a "-e" switch, so I changed it to be a "-f" (which is
  pobably wrong and maybe should be "-x" or "-r". But since I've no access
  to a Linux system I cannot verify this right now).

  BTW, the "test -e" issue is present in the various kde-i18n packages as
  well (KDE 2.x.x and KDE 3.0.x), and I think it may be worth to "fix" this
  there as well...

* admin/acinclude.m4.in:

  The Java SDK needs to be looked for in /usr/j2se on Solaris systems, and
  the file "jni_md.h" can then be found in $kde_java_includedir/solaris.

Further, compiling "kxkb" fails completely with:

--- snip ---
Making all in kxkb
make[2]: Entering directory `/export/volumes/src/kde/3.1alpha1/kdebase-3.0.6/kxkb'
source='rules.cpp' object='rules.lo' libtool=yes \
depfile='.deps/rules.Plo' tmpdepfile='.deps/rules.TPlo' \
depmode=gcc /bin/ksh ../admin/depcomp \
/bin/ksh ../libtool --silent --mode=compile --tag=CXX g++ -DHAVE_CONFIG_H -I. -I. -I.. -I/vol/kde-3.1alpha1/include -I/vol/qt-3.0.5/include -I/usr/openwin/include  -I/vol/local/include -I/vol/graphics/include -I/vol/cups/include -I/vol/X11/include/freetype2  -DQT_THREAD_SUPPORT  -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4  -Wnon-virtual-dtor -Wno-long-long -Wbad-function-cast -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -fno-builtin -g -O2 -fno-exceptions -fno-check-new -DQT_CLEAN_NAMESPACE -DQT_NO_COMPAT -DQT_NO_ASCII_CAST -D_GNU_SOURCE  -c -o rules.lo `test -f 'rules.cpp' || echo './'`rules.cpp
rules.cpp:16: X11/extensions/XKBrules.h: No such file or directory
make[2]: *** [rules.lo] Error 1
make[2]: Leaving directory `/export/volumes/src/kde/3.1alpha1/kdebase-3.0.6/kxkb'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/export/volumes/src/kde/3.1alpha1/kdebase-3.0.6'
make: *** [all] Error 2
--- snip ---
  
I currently do not see an easy way to fix this (it will probably compile with
a full installation of a recent XFree which obviuosly provides the missing
header file), but perhaps "kxkb" should be disabled on Solaris for now.
In fact, I'm not quite sure, what kxkb actually does, but I have kdelibs and
kdebase running without it quite happily right now... ;-)

cheers,
	Torsten

-- 
   Torsten Kasch                               tk@Genetik.Uni-Bielefeld.DE
        Biologie VI/Zentrum f. Genomforschung
        Universität Bielefeld                  Phone: +49 521 106-4828
        D-33594 Bielefeld                      Fax:   +49 521 106-5626

--3V7upXqbjpZ4EhLz
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="kdebase-3.1alpha.udiff"

--- kdm/configure.in.in	2002/07/01 18:53:56	1.1
+++ kdm/configure.in.in	2002/08/03 22:03:55
@@ -91,7 +91,7 @@
 AC_MSG_RESULT([checking for X library directory... $XLIBDIR])
 AC_DEFINE_UNQUOTED(XLIBDIR, "$XLIBDIR", [Define where to find the X libraries])
 
-AC_CHECK_LIB(Xau, main, [:], 
+AC_CHECK_LIB(Xau, XauReadAuth, [:], , $all_libraries
 	[
 	  AC_MSG_WARN([Cannot build KDM! Make sure that libXau.a is installed!])
 	  DO_NOT_COMPILE="$DO_NOT_COMPILE kdm"
--- ksysguard/configure.in.in	2002/07/01 18:54:13	1.1
+++ ksysguard/configure.in.in	2002/08/03 21:16:39
@@ -23,7 +23,7 @@
 AC_SUBST(LIBSENSORS)
 
 dnl Check for dell laptop support
-AM_CONDITIONAL(supports_i8k, test -e /proc/i8k)
+AM_CONDITIONAL(supports_i8k, test -f /proc/i8k)
 
 case "$UNAME" in
 	Linux) LIBHOSTS="$LIBSENSORS" ;;
--- admin/acinclude.m4.in	2002/07/01 18:53:37	1.1
+++ admin/acinclude.m4.in	2002/08/03 21:14:47
@@ -4551,6 +4551,7 @@
      
      
       dnl No option set -> look in $PATH
+      KDE_JAVA_PREFIX(/usr/j2se)
       KDE_JAVA_PREFIX(/usr/j*dk*)
       KDE_JAVA_PREFIX(/usr/lib/j*dk*)
       KDE_JAVA_PREFIX(/opt/j*sdk*)
@@ -4638,6 +4639,8 @@
     dnl and under linux here..
     test -d "$kde_java_includedir/linux" && jni_includes="$jni_includes -I$kde_java_includedir/linux"
     test -d "$kde_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_java_includedir/genunix"
+    dnl and on Solaris here:
+    test -d "$kde_java_includedir/solaris" && jni_includes="$jni_includes -I$kde_java_includedir/solaris"
 
   else
     JAVAC=

--3V7upXqbjpZ4EhLz--
 
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<