3
0
Fork 0
forked from mirrors/nixpkgs

Remove PATHS from find-svn.patch

svn path=/nixpkgs/trunk/; revision=31605
This commit is contained in:
Yury G. Kudryashov 2012-01-17 16:27:57 +00:00
parent dc9830111b
commit 3aa99d803e

View file

@ -12,7 +12,7 @@ index 59bcb96..2eac05d 100644
if(SVNCONFIG_EXECUTABLE)
@@ -56,15 +59,9 @@ else(SVNCONFIG_EXECUTABLE)
@@ -56,15 +59,8 @@ else(SVNCONFIG_EXECUTABLE)
set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
else(APRCONFIG_EXECUTABLE)
FIND_PATH(_INCLUDES apr_pools.h
@ -26,12 +26,11 @@ index 59bcb96..2eac05d 100644
- /usr/local/include/apr-1/
- /usr/local/include/apr-1.0/
+ HINTS ${SVN_INCLUDES}
+ PATHS /usr /usr/local
+ SUFFIXES apr-0 apr-1 apr-1.0
)
if(_INCLUDES)
set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES})
@@ -72,6 +69,25 @@ else(SVNCONFIG_EXECUTABLE)
@@ -72,6 +69,24 @@ else(SVNCONFIG_EXECUTABLE)
set(SVN_FOUND FALSE) # no apr == can't compile!
endif(_INCLUDES)
endif(APRCONFIG_EXECUTABLE)
@ -45,7 +44,6 @@ index 59bcb96..2eac05d 100644
+ else(APUCONFIG_EXECUTABLE)
+ FIND_PATH(_INCLUDES apu.h
+ HINTS ${SVN_INCLUDES}
+ PATHS /usr /usr/local
+ SUFFIXES apr-0 apr-1 apr-1.0
+ )
+ if(_INCLUDES)