You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Branko Čibej <br...@wandisco.com> on 2014/03/06 09:35:54 UTC

Re: svn commit: r1574710 - in /subversion/trunk: ./ build/generator/ build/generator/templates/ subversion/libsvn_auth_gnome_keyring/ subversion/libsvn_auth_kwallet/ subversion/libsvn_client/ subversion/libsvn_delta/ subversion/libsvn_diff/ subversion/libs...

On 05.03.2014 23:45, stsp@apache.org wrote:
> Author: stsp
> Date: Wed Mar  5 22:45:48 2014
> New Revision: 1574710
>
> URL: http://svn.apache.org/r1574710
> Log:
> Kick off work on pkg-config support (issue #738, and also #4435).
[...]

> Modified: subversion/trunk/configure.ac
> URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1574710&r1=1574709&r2=1574710&view=diff
> ==============================================================================
> --- subversion/trunk/configure.ac (original)
> +++ subversion/trunk/configure.ac Wed Mar  5 22:45:48 2014
> @@ -109,11 +109,14 @@ if test `expr $apr_version : 2` -ne 0; t
>    AC_SUBST(SVN_APRUTIL_INCLUDES)
>    AC_SUBST(SVN_APRUTIL_CONFIG, ["$apu_config"])
>    AC_SUBST(SVN_APRUTIL_LIBS)
> +  SVN_APR_MAJOR_VERSION=2
>  else
>    svn_lib_ver=0
>    APU_VER_REGEXES=["1\.[345]\."]
>    SVN_LIB_APRUTIL($APU_VER_REGEXES)
> +  SVN_APR_MAJOR_VERSION=1
>  fi
> +AC_SUBST(SVN_APR_MAJOR_VERSION)
>  SVN_LT_SOVERSION="-version-info $svn_lib_ver"
>  AC_SUBST(SVN_LT_SOVERSION)
>  AC_DEFINE_UNQUOTED(SVN_SOVERSION, $svn_lib_ver,
> @@ -1539,6 +1542,12 @@ AC_CONFIG_COMMANDS([svn_private_config.h
>                      SVN_DB_HEADER="$SVN_DB_HEADER"])
>  AC_CONFIG_FILES([Makefile])
>  
> +# Create pkg-config .pc files from .pc.in files
> +for pc_in_file in subversion/libsvn_*/*.pc.in; do
> +  pc_file="`echo ${pc_in_file} | $SED -e 's/.in$//'`"
> +  AC_CONFIG_FILES([${pc_file}])
> +done

This breaks out-of-tree builds. Should be looking in $abs_srcdir.

-- Brane


-- 
Branko Čibej | Director of Subversion
WANdisco // Non-Stop Data
e. brane@wandisco.com