1 --- configure 2009-09-23 20:05:36.124131000 -0700 |
|
2 +++ configure 2009-09-23 21:45:10.895445310 -0700 |
|
3 @@ -5097,11 +5097,11 @@ |
|
4 test "$svn_allowed_neon" = "any"; then |
|
5 svn_allowed_neon_on_system="yes" |
|
6 if test "$NEON_PKG_CONFIG" = "yes"; then |
|
7 - SVN_NEON_INCLUDES=`$PKG_CONFIG neon --cflags | sed -e 's/-D[^ ]*//g'` |
|
8 - CFLAGS="$CFLAGS `$PKG_CONFIG neon --cflags | sed -e 's/-I[^ ]*//g'`" |
|
9 + SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon |
|
10 + CFLAGS="$CFLAGS" |
|
11 old_CFLAGS="$CFLAGS" |
|
12 old_LIBS="$LIBS" |
|
13 - NEON_LIBS=`$PKG_CONFIG neon --libs` |
|
14 + NEON_LIBS="-L${ROOT}/lib -lneon" |
|
15 CFLAGS="$CFLAGS $SVN_NEON_INCLUDES" |
|
16 LIBS="$LIBS $NEON_LIBS" |
|
17 neon_test_code=" |
|
18 @@ -5188,9 +5188,9 @@ |
|
19 CFLAGS="$old_CFLAGS" |
|
20 LIBS="$old_LIBS" |
|
21 else |
|
22 - SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'` |
|
23 - CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`" |
|
24 - NEON_LIBS=`$neon_config --libs` |
|
25 + SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon |
|
26 + CFLAGS="$CFLAGS" |
|
27 + NEON_LIBS="-L${ROOT}/lib -lneon" |
|
28 fi |
|
29 svn_lib_neon="yes" |
|
30 break |
|
31 @@ -5578,11 +5578,11 @@ |
|
32 test "$svn_allowed_neon" = "any"; then |
|
33 svn_allowed_neon_on_system="yes" |
|
34 if test "$NEON_PKG_CONFIG" = "yes"; then |
|
35 - SVN_NEON_INCLUDES=`$PKG_CONFIG neon --cflags | sed -e 's/-D[^ ]*//g'` |
|
36 - CFLAGS="$CFLAGS `$PKG_CONFIG neon --cflags | sed -e 's/-I[^ ]*//g'`" |
|
37 + SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon |
|
38 + CFLAGS="$CFLAGS" |
|
39 old_CFLAGS="$CFLAGS" |
|
40 old_LIBS="$LIBS" |
|
41 - NEON_LIBS=`$PKG_CONFIG neon --libs` |
|
42 + NEON_LIBS="-L${ROOT}/lib -lneon" |
|
43 CFLAGS="$CFLAGS $SVN_NEON_INCLUDES" |
|
44 LIBS="$LIBS $NEON_LIBS" |
|
45 neon_test_code=" |
|
46 @@ -5669,9 +5669,9 @@ |
|
47 CFLAGS="$old_CFLAGS" |
|
48 LIBS="$old_LIBS" |
|
49 else |
|
50 - SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'` |
|
51 - CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`" |
|
52 - NEON_LIBS=`$neon_config --libs` |
|
53 + SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon |
|
54 + CFLAGS="$CFLAGS" |
|
55 + NEON_LIBS="-L${ROOT}/lib -lneon" |
|
56 fi |
|
57 svn_lib_neon="yes" |
|
58 break |
|
59 --- Makefile.in 2009-02-16 08:10:48.000000000 -0800 |
|
60 +++ Makefile.in 2009-09-23 21:35:11.885785150 -0700 |
|
61 @@ -76,8 +76,8 @@ |
|
62 swig_rb_libdir = @libdir@ |
|
63 |
|
64 ### these possibly need further discussion |
|
65 -swig_pydir = @libdir@/svn-python/libsvn |
|
66 -swig_pydir_extra = @libdir@/svn-python/svn |
|
67 +swig_pydir = /usr/lib/python2.6/vendor-packages/libsvn |
|
68 +swig_pydir_extra = /usr/lib/python2.6/vendor-packages/svn |
|
69 swig_pldir = @libdir@/svn-perl |
|
70 swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext |
|
71 contribdir = @bindir@/svn-contrib |
|