Author: rhuijben
Date: Thu Sep 5 15:43:36 2019
New Revision: 1866476
URL: http://svn.apache.org/viewvc?rev=1866476&view=rev
Log:
* SConstruct: Following up on r1861036, also fix finding apu_version.h
Modified:
serf/trunk/SConstruct
Modified: serf/trunk/SConstruct
URL:
http://svn.apache.org/viewvc/serf/trunk/SConstruct?rev=1866476&r1=1866475&r2=1866476&view=diff
==============================================================================
--- serf/trunk/SConstruct (original)
+++ serf/trunk/SConstruct Thu Sep 5 15:43:36 2019
@@ -356,6 +356,9 @@ if sys.platform == 'win32':
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 sys.platform == 'win32':
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'])
