diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-08 11:29:31 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-08 11:29:31 +0000 |
commit | 1daca591dd32df7e810fe279c75296cac437dfa8 (patch) | |
tree | 3819b15ee086b57e6a21aecd04109121bcfc4c13 /meta/packages/subversion/subversion-1.5.5/neon-detection.patch | |
parent | 9602318b9d662cd888c9e4d8cd382c6706be4eb1 (diff) | |
download | openembedded-core-1daca591dd32df7e810fe279c75296cac437dfa8.tar.gz openembedded-core-1daca591dd32df7e810fe279c75296cac437dfa8.tar.bz2 openembedded-core-1daca591dd32df7e810fe279c75296cac437dfa8.tar.xz openembedded-core-1daca591dd32df7e810fe279c75296cac437dfa8.zip |
subversion 1.4.5 -> 1.5.5
Diffstat (limited to 'meta/packages/subversion/subversion-1.5.5/neon-detection.patch')
-rw-r--r-- | meta/packages/subversion/subversion-1.5.5/neon-detection.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/packages/subversion/subversion-1.5.5/neon-detection.patch b/meta/packages/subversion/subversion-1.5.5/neon-detection.patch new file mode 100644 index 000000000..b567d5c05 --- /dev/null +++ b/meta/packages/subversion/subversion-1.5.5/neon-detection.patch @@ -0,0 +1,36 @@ +diff --git a/build/ac-macros/neon.m4 b/build/ac-macros/neon.m4 +index 9fcf859..8d964f3 100644 +--- a/build/ac-macros/neon.m4 ++++ b/build/ac-macros/neon.m4 +@@ -38,7 +38,7 @@ AC_DEFUN(SVN_LIB_NEON, + if test "$withval" = "yes" ; then + AC_MSG_ERROR([--with-neon requires an argument.]) + else +- neon_config="$withval/bin/neon-config" ++ neon_config="env env PKG_CONFIG_PATH=${withval}:${PKG_CONFIG_PATH} pkg-config neon" + fi + + SVN_NEON_CONFIG() +@@ -117,10 +117,10 @@ dnl SVN_NEON_CONFIG() + dnl neon-config found, gather relevant information from it + AC_DEFUN(SVN_NEON_CONFIG, + [ +- if test -f "$neon_config"; then +- if test "$neon_config" != ""; then ++ if true; then ++ if true; then + AC_MSG_CHECKING([neon library version]) +- NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'` ++ NEON_VERSION=`$neon_config --modversion | sed -e 's/^neon //'` + AC_MSG_RESULT([$NEON_VERSION]) + + if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then +@@ -133,7 +133,7 @@ AC_DEFUN(SVN_NEON_CONFIG, + test "$svn_allowed_neon" = "any"; then + svn_allowed_neon_on_system="yes" + SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`] +- NEON_LIBS=`$neon_config --la-file` ++ NEON_LIBS=`$neon_config --libs` + CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"] + svn_lib_neon="yes" + break |