|
Lines 223-234
env.Append(RPATH=libdir,
Link Here
|
| 223 |
|
223 |
|
| 224 |
if sys.platform == 'darwin': |
224 |
if sys.platform == 'darwin': |
| 225 |
# linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,)) |
225 |
# linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,)) |
| 226 |
env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)) |
226 |
env.Append(LINKFLAGS=['-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)]) |
| 227 |
|
227 |
|
| 228 |
if sys.platform != 'win32': |
228 |
if sys.platform != 'win32': |
| 229 |
### gcc only. figure out appropriate test / better way to check these |
229 |
### gcc only. figure out appropriate test / better way to check these |
| 230 |
### flags, and check for gcc. |
230 |
### flags, and check for gcc. |
| 231 |
env.Append(CFLAGS='-std=c89') |
231 |
env.Append(CFLAGS=['-std=c89']) |
| 232 |
|
232 |
|
| 233 |
### These warnings are not available on Solaris |
233 |
### These warnings are not available on Solaris |
| 234 |
if sys.platform != 'sunos5': |
234 |
if sys.platform != 'sunos5': |
|
Lines 237-253
if sys.platform != 'win32':
Link Here
|
| 237 |
'-Wall']) |
237 |
'-Wall']) |
| 238 |
|
238 |
|
| 239 |
if debug: |
239 |
if debug: |
| 240 |
env.Append(CCFLAGS='-g') |
240 |
env.Append(CCFLAGS=['-g']) |
| 241 |
env.Append(CPPDEFINES=['DEBUG', '_DEBUG']) |
241 |
env.Append(CPPDEFINES=['DEBUG', '_DEBUG']) |
| 242 |
else: |
242 |
else: |
| 243 |
env.Append(CCFLAGS='-O2') |
243 |
env.Append(CCFLAGS=['-O2']) |
| 244 |
env.Append(CPPDEFINES='NDEBUG') |
244 |
env.Append(CPPDEFINES=['NDEBUG']) |
| 245 |
|
245 |
|
| 246 |
### works for Mac OS. probably needs to change |
246 |
### works for Mac OS. probably needs to change |
| 247 |
env.Append(LIBS=['ssl', 'crypto', 'z', ]) |
247 |
env.Append(LIBS=['ssl', 'crypto', 'z', ]) |
| 248 |
|
248 |
|
| 249 |
if sys.platform == 'sunos5': |
249 |
if sys.platform == 'sunos5': |
| 250 |
env.Append(LIBS='m') |
250 |
env.Append(LIBS=['m']) |
| 251 |
else: |
251 |
else: |
| 252 |
# Warning level 4, no unused argument warnings |
252 |
# Warning level 4, no unused argument warnings |
| 253 |
env.Append(CCFLAGS=['/W4', '/wd4100']) |
253 |
env.Append(CCFLAGS=['/W4', '/wd4100']) |
|
Lines 260-267
else:
Link Here
|
| 260 |
else: |
260 |
else: |
| 261 |
# Optimize for speed, use DLL runtime |
261 |
# Optimize for speed, use DLL runtime |
| 262 |
env.Append(CCFLAGS=['/O2', '/MD']) |
262 |
env.Append(CCFLAGS=['/O2', '/MD']) |
| 263 |
env.Append(CPPDEFINES='NDEBUG') |
263 |
env.Append(CPPDEFINES=['NDEBUG']) |
| 264 |
env.Append(LINKFLAGS='/RELEASE') |
264 |
env.Append(LINKFLAGS=['/RELEASE']) |
| 265 |
|
265 |
|
| 266 |
# PLAN THE BUILD |
266 |
# PLAN THE BUILD |
| 267 |
SHARED_SOURCES = [] |
267 |
SHARED_SOURCES = [] |
|
Lines 309-331
if sys.platform == 'win32':
Link Here
|
| 309 |
# zlib |
309 |
# zlib |
| 310 |
env.Append(LIBS='zlib.lib') |
310 |
env.Append(LIBS='zlib.lib') |
| 311 |
if not env.get('SOURCE_LAYOUT', None): |
311 |
if not env.get('SOURCE_LAYOUT', None): |
| 312 |
env.Append(CPPPATH='$ZLIB/include', |
312 |
env.Append(CPPPATH=['$ZLIB/include'], |
| 313 |
LIBPATH='$ZLIB/lib') |
313 |
LIBPATH=['$ZLIB/lib']) |
| 314 |
else: |
314 |
else: |
| 315 |
env.Append(CPPPATH='$ZLIB', |
315 |
env.Append(CPPPATH=['$ZLIB'], |
| 316 |
LIBPATH='$ZLIB') |
316 |
LIBPATH=['$ZLIB']) |
| 317 |
|
317 |
|
| 318 |
# openssl |
318 |
# openssl |
| 319 |
env.Append(LIBS=['libeay32.lib', 'ssleay32.lib']) |
319 |
env.Append(LIBS=['libeay32.lib', 'ssleay32.lib']) |
| 320 |
if not env.get('SOURCE_LAYOUT', None): |
320 |
if not env.get('SOURCE_LAYOUT', None): |
| 321 |
env.Append(CPPPATH='$OPENSSL/include/openssl', |
321 |
env.Append(CPPPATH=['$OPENSSL/include/openssl'], |
| 322 |
LIBPATH='$OPENSSL/lib') |
322 |
LIBPATH=['$OPENSSL/lib']) |
| 323 |
elif 0: # opensslstatic: |
323 |
elif 0: # opensslstatic: |
| 324 |
env.Append(CPPPATH='$OPENSSL/inc32', |
324 |
env.Append(CPPPATH=['$OPENSSL/inc32'], |
| 325 |
LIBPATH='$OPENSSL/out32') |
325 |
LIBPATH=['$OPENSSL/out32']) |
| 326 |
else: |
326 |
else: |
| 327 |
env.Append(CPPPATH='$OPENSSL/inc32', |
327 |
env.Append(CPPPATH=['$OPENSSL/inc32'], |
| 328 |
LIBPATH='$OPENSSL/out32dll') |
328 |
LIBPATH=['$OPENSSL/out32dll']) |
| 329 |
else: |
329 |
else: |
| 330 |
if os.path.isdir(apr): |
330 |
if os.path.isdir(apr): |
| 331 |
apr = os.path.join(apr, 'bin', 'apr-1-config') |
331 |
apr = os.path.join(apr, 'bin', 'apr-1-config') |
|
Lines 351-358
else:
Link Here
|
| 351 |
apr_libs = '' |
351 |
apr_libs = '' |
| 352 |
apu_libs = '' |
352 |
apu_libs = '' |
| 353 |
|
353 |
|
| 354 |
env.Append(CPPPATH='$OPENSSL/include') |
354 |
env.Append(CPPPATH=['$OPENSSL/include']) |
| 355 |
env.Append(LIBPATH='$OPENSSL/lib') |
355 |
env.Append(LIBPATH=['$OPENSSL/lib']) |
| 356 |
|
356 |
|
| 357 |
|
357 |
|
| 358 |
# If build with gssapi, get its information and define SERF_HAVE_GSSAPI |
358 |
# If build with gssapi, get its information and define SERF_HAVE_GSSAPI |
|
Lines 362-368
if gssapi and CALLOUT_OKAY:
Link Here
|
| 362 |
env['GSSAPI_LIBS'] = cmd.strip() |
362 |
env['GSSAPI_LIBS'] = cmd.strip() |
| 363 |
return env.MergeFlags(cmd, unique) |
363 |
return env.MergeFlags(cmd, unique) |
| 364 |
env.ParseConfig('$GSSAPI --libs gssapi', parse_libs) |
364 |
env.ParseConfig('$GSSAPI --libs gssapi', parse_libs) |
| 365 |
env.Append(CPPDEFINES='SERF_HAVE_GSSAPI') |
365 |
env.Append(CPPDEFINES=['SERF_HAVE_GSSAPI']) |
| 366 |
if sys.platform == 'win32': |
366 |
if sys.platform == 'win32': |
| 367 |
env.Append(CPPDEFINES=['SERF_HAVE_SSPI']) |
367 |
env.Append(CPPDEFINES=['SERF_HAVE_SSPI']) |
| 368 |
|
368 |
|
