Patches for KDE libs and base on solaris

Michael Matz matz at suse.de
Tue Nov 12 13:13:43 GMT 2002


Hi,

On Tue, 12 Nov 2002, Simon Hausmann wrote:

> Index: admin/acinclude.m4.in
> ===================================================================
> RCS file: /home/kde/kde-common/admin/acinclude.m4.in,v
> retrieving revision 2.301
> diff -u -r2.301 acinclude.m4.in
> --- admin/acinclude.m4.in	2002/10/24 21:21:50	2.301
> +++ admin/acinclude.m4.in	2002/11/12 04:25:29
> @@ -5230,13 +5230,13 @@
>    fi
>  fi
>
> -if test "$ssl_includes" = "/usr/include" || test  "$ssl_includes" = "/usr/local/include" || test -z "$ssl_includes"; then
> +if test "$ssl_includes" = "/usr/include" || test -z "$ssl_includes"; then
>   SSL_INCLUDES="";
>  else
>   SSL_INCLUDES="-I$ssl_includes"
>  fi
>
> -if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries"; then
> +if test "$ssl_libraries" = "/usr/lib" || test -z "$ssl_libraries"; then
>   SSL_LDFLAGS=""
>  else
>   SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries"
>
> These look wrong to me (I can already hear the
> we-have-installed-everything-in-usr-local-freebsd guys :-)

That's a difficult problem.  Probably the only solution is to add a
/usr/local/include at the very end of $(all_includes) (similar with
/usr/local/lib and LDFLAGS), and then strip any /usr/local references from
the individual XXX_INCLUDES and XXX_LDFLAGS.

On Tue, 12 Nov 2002, David Faure wrote:

> > Index: kio/kssl/Makefile.am
> > ===================================================================
> > RCS file: /home/kde/kdelibs/kio/kssl/Makefile.am,v
> > retrieving revision 1.27
> > diff -u -r1.27 Makefile.am
> > --- kio/kssl/Makefile.am	2002/05/25 10:58:51	1.27
> > +++ kio/kssl/Makefile.am	2002/11/12 04:15:46
> > @@ -1,4 +1,4 @@
> > -INCLUDES=$(all_includes) $(SSL_INCLUDES)
> > +INCLUDES=$(SSL_INCLUDES) $(all_includes)
> >
> > Good catch.
>
> Breaks with openssl is in /usr/include and the distro's KDE is there too

No it doesn't because SSL_INCLUDES never includes /usr/include (and never
/usr/local/include with the above).  That's why it's correct to list all
specific X_INCLUDES vars before the general ones.  Of course the
non-existance of /usr or /usr/local references needs to be enforced.

> (but the current "devel" KDE prefix is somewhere else) ?
> I know, one can always think of the reverse situation - but we're developing
> KDE, no openssl, so we're more likely to have two versions of KDE
> installed, than two versions of openssl.


Ciao,
Michael.





More information about the kde-core-devel mailing list