← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Brian Aker
  • Date: 2009-05-30 20:14:43 UTC
  • mfrom: (1022.2.42 mordred)
  • Revision ID: brian@gaz-20090530201443-snmrokl1n7xkppb0
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
342
342
AC_LIB_PREFIX
343
343
 
344
344
#--------------------------------------------------------------------
 
345
# Check for libpthread
 
346
#--------------------------------------------------------------------
 
347
 
 
348
ACX_PTHREAD(,AC_MSG_ERROR(could not find libpthread))
 
349
LIBS="${PTHREAD_LIBS} ${LIBS}"
 
350
CFLAGS="${PTHREAD_CFLAGS} ${CFLAGS}"
 
351
CC="$PTHREAD_CC"
 
352
 
 
353
#--------------------------------------------------------------------
345
354
# Check for Google Proto Buffers
346
355
#--------------------------------------------------------------------
347
356
 
348
357
AC_LANG_PUSH([C++])
349
 
AC_LIB_HAVE_LINKFLAGS(protobuf,pthread,
 
358
AC_LIB_HAVE_LINKFLAGS(protobuf,,
350
359
[#include <google/protobuf/descriptor.h>
351
360
],
352
361
[google::protobuf::FileDescriptor* file;],system)
398
407
 
399
408
 
400
409
 
401
 
#--------------------------------------------------------------------
402
 
# Check for libpthread
403
 
#--------------------------------------------------------------------
404
 
 
405
 
ACX_PTHREAD(,AC_MSG_ERROR(could not find libpthread))
406
 
LIBS="$PTHREAD_LIBS $LIBS"
407
 
CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
408
 
CC="$PTHREAD_CC"
409
410
 
410
411
#--------------------------------------------------------------------
411
412
# Check for tcmalloc/mtmalloc