* SConstruct: Following up on r1866470, also fix finding apu_version.h
[but introduce another bug. Fixed in r1866477]
git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1866476 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/SConstruct b/SConstruct
index f4f1208..99c9b48 100644
--- a/SConstruct
+++ b/SConstruct
@@ -356,6 +356,9 @@
else:
expat_lib_name = 'xml.lib'
apuversion = os.path.join(apu, 'include', 'apu_version.h')
+ if not os.path.isfile(apuversion):
+ apuversion = os.path.join(apu, 'include', 'apu-1','apu_version.h')
+
if os.path.isfile(apuversion):
apu_major = 0
apu_minor = 0
@@ -391,7 +394,7 @@
if not env.get('SOURCE_LAYOUT', None):
env.Append(LIBPATH=['$APR/lib', '$APU/lib'],
CPPPATH=['$APR/include', '$APR/include/apr-1',
- '$APU/include', '$APU/include/apr-1'])
+ '$APU/include', '$APU/include/apu-1'])
elif aprstatic:
env.Append(LIBPATH=['$APR/LibR','$APU/LibR'],
CPPPATH=['$APR/include', '$APU/include'])
