Files
poky/meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch
Richard Purdie 29d6678fd5 Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.

The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.

Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-08-27 15:29:45 +01:00

37 lines
1.4 KiB
Diff

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