~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Brian Aker
  • Date: 2008-07-08 21:42:24 UTC
  • mfrom: (77.1.36 codestyle)
  • Revision ID: brian@tangent.org-20080708214224-sxz2lmylc2jw8t4h
Merge up from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
584
584
 
585
585
AC_PATH_PROG(PKG_CONFIG, pkg-config, AC_MSG_ERROR([pkg-config wasn't found.]))
586
586
PKG_CHECK_MODULES(PCRE, [libpcrecpp >= 3], [
587
 
  ac_cv_have_libpcre=yes
588
587
  AC_DEFINE([HAVE_PCRE], [1], [Perl Compatible Regex Lib for mysqltest])
589
588
  ],[
590
 
  ac_cv_have_libpcre=no
 
589
  AC_CHECK_LIB(pcrecpp, [DoMatch], AC_MSG_ERROR([PCRE not found]))
591
590
  AC_MSG_WARN([PCRE not found - mysqltest will not be built])
592
591
  ])
593
 
AM_CONDITIONAL(BUILD_MYSQLTEST, test "x$ac_cv_have_libpcre" = "xyes")
594
592
AC_SUBST(PCRE_LIBS)
595
593
AC_SUBST(PCRE_CFLAGS)
596
594