diff options
Diffstat (limited to 'meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch')
-rw-r--r-- | meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch b/meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch deleted file mode 100644 index b567d5c050..0000000000 --- a/meta/recipes-devtools/subversion/subversion-1.5.5/neon-detection.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | diff --git a/build/ac-macros/neon.m4 b/build/ac-macros/neon.m4 | ||
2 | index 9fcf859..8d964f3 100644 | ||
3 | --- a/build/ac-macros/neon.m4 | ||
4 | +++ b/build/ac-macros/neon.m4 | ||
5 | @@ -38,7 +38,7 @@ AC_DEFUN(SVN_LIB_NEON, | ||
6 | if test "$withval" = "yes" ; then | ||
7 | AC_MSG_ERROR([--with-neon requires an argument.]) | ||
8 | else | ||
9 | - neon_config="$withval/bin/neon-config" | ||
10 | + neon_config="env env PKG_CONFIG_PATH=${withval}:${PKG_CONFIG_PATH} pkg-config neon" | ||
11 | fi | ||
12 | |||
13 | SVN_NEON_CONFIG() | ||
14 | @@ -117,10 +117,10 @@ dnl SVN_NEON_CONFIG() | ||
15 | dnl neon-config found, gather relevant information from it | ||
16 | AC_DEFUN(SVN_NEON_CONFIG, | ||
17 | [ | ||
18 | - if test -f "$neon_config"; then | ||
19 | - if test "$neon_config" != ""; then | ||
20 | + if true; then | ||
21 | + if true; then | ||
22 | AC_MSG_CHECKING([neon library version]) | ||
23 | - NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'` | ||
24 | + NEON_VERSION=`$neon_config --modversion | sed -e 's/^neon //'` | ||
25 | AC_MSG_RESULT([$NEON_VERSION]) | ||
26 | |||
27 | if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then | ||
28 | @@ -133,7 +133,7 @@ AC_DEFUN(SVN_NEON_CONFIG, | ||
29 | test "$svn_allowed_neon" = "any"; then | ||
30 | svn_allowed_neon_on_system="yes" | ||
31 | SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`] | ||
32 | - NEON_LIBS=`$neon_config --la-file` | ||
33 | + NEON_LIBS=`$neon_config --libs` | ||
34 | CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"] | ||
35 | svn_lib_neon="yes" | ||
36 | break | ||