subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Sperling <s...@apache.org>
Subject Re: [PATCH] Use kde4-config for determining KDE's library and include directories.
Date Mon, 14 Mar 2016 12:09:17 GMT
On Mon, Mar 14, 2016 at 11:35:32AM +0100, Raphael Kubo da Costa wrote:
> [[[
> At the moment the kde4-config script is used only to determine KDE4's
> prefix, and then its header and library locations are derived manually.
> 
> This is not optimal, as it assumes the libraries are always installed
> into $kde_prefix/lib{64} and the headers in $kde_prefix/include. The
> latter is especially problematic as the headers are often installed in a
> subdirectory of include/ so they do not conflict with their KDE
> Frameworks 5 counterparts.
> 
> * build/ac-macros/kwallet.m4: Use the `--install include' and `--install
>   lib' kde4-config parameters to retrieve the location where KDE4's
>   headers and libraries are installed, respectively.
> ]]]

Thanks, committed in http://svn.apache.org/r1734926 and proposed
for backport to 1.9.x in  http://svn.apache.org/r1734927

> Index: build/ac-macros/kwallet.m4
> ===================================================================
> --- build/ac-macros/kwallet.m4	(revision 1734906)
> +++ build/ac-macros/kwallet.m4	(working copy)
> @@ -68,15 +68,15 @@ AC_DEFUN(SVN_LIB_KWALLET,
>                      fi
>                    done
>                    qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
> -                  kde_dir="`$KDE4_CONFIG --prefix`"
> -                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
> +                  kde_incdir="`$KDE4_CONFIG --install include`"
> +                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_incdir"
>                    qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus
QtGui`"
>                    SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui
$qt_libs_other_options"
>                    CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
>                    LIBS="$LIBS $SVN_KWALLET_LIBS"
>                    qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
> -                  kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
> -                  LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix)`"
> +                  kde_libdir="`$KDE4_CONFIG --install lib`"
> +                  LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_libdir)`"
>                    AC_LANG(C++)
>                    AC_LINK_IFELSE([AC_LANG_SOURCE([[
>  #include <kwallet.h>


Mime
View raw message