unstick r1866477

Revision 1866477

Date:
2019/09/05 15:51:35
Author:
rhuijben
Revision Log:
* SConstruct: Following up on r1833230,r1866470,r1866476 really fix finding apu_version.h
Files:

Legend:

 
Added
 
Removed
 
Modified
  • serf/trunk/SConstruct

     
    357 357 expat_lib_name = 'xml.lib'
    358 358 apuversion = os.path.join(apu, 'include', 'apu_version.h')
    359 359 if not os.path.isfile(apuversion):
    360 apuversion = os.path.join(apu, 'include', 'apu-1','apu_version.h')
    360 apuversion = os.path.join(apu, 'include', 'apr-1', 'apu_version.h')
    361 361
    362 362 if os.path.isfile(apuversion):
    363 363 apu_major = 0
     
    394 394 if not env.get('SOURCE_LAYOUT', None):
    395 395 env.Append(LIBPATH=['$APR/lib', '$APU/lib'],
    396 396 CPPPATH=['$APR/include', '$APR/include/apr-1',
    397 '$APU/include', '$APU/include/apu-1'])
    397 '$APU/include', '$APU/include/apr-1'])
    398 398 elif aprstatic:
    399 399 env.Append(LIBPATH=['$APR/LibR','$APU/LibR'],
    400 400 CPPPATH=['$APR/include', '$APU/include'])