From b4f310c2f1e8cd6b1d7cadd6dc8b0a49dcf52275 Mon Sep 17 00:00:00 2001 From: "Andreas V. 'netrunner' Meier" Date: Tue, 18 Oct 2005 14:37:23 +0000 Subject: [PATCH] Andreas V. Meier: kdebase.conf: typo ($ instead -) kdebase.conf: fixe including of samba and openldap libs [2005100709134728581] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6494 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/kde/kdebase/kdebase.conf | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/package/kde/kdebase/kdebase.conf b/package/kde/kdebase/kdebase.conf index 32110d9f5..16834cfd3 100644 --- a/package/kde/kdebase/kdebase.conf +++ b/package/kde/kdebase/kdebase.conf @@ -22,8 +22,16 @@ . $base/package/kde/kde-3.conf -pkginstalled samba && var_append confopt " " \ - "--with-extra-includes=$root/$pkg_samba_prefix/include --with-extra-libs=$root/$pkg_samba_prefix/lib" +pkginstalled samba && { + extralibs="$root/$pkg_samba_prefix/lib" + pkginstalled openldap && \ + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$root/$pkg_openldap_prefix/lib + pkginstalled openldap && \ + extralibs="$extralibs:$root/$pkg_openldap_prefix/lib" + var_append confopt " " \ + "--with-extra-includes=$root/$pkg_samba_prefix/include" + var_append confopt " " "--with-extra-libs=$extralibs" +} kde_base_pi() { @@ -37,7 +45,7 @@ kde_base_pi() # Set's "Curser" as Konsole's default font, fixes the # doublespace issue - cp $fv $confdir/konsolerc $root/$prefix/share/config + cp -fv $confdir/konsolerc $root/$prefix/share/config # Set's aRts as the default soundsystem, prevents the # "CPU overload" errors