← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

Replaced regex lib with pcre. Reworked mysqltest to use it. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
579
579
AC_CHECK_LIB(pthread, pthread_create, [], [AC_MSG_ERROR(could not find libpthread)])
580
580
 
581
581
#--------------------------------------------------------------------
 
582
# Check for libpcre
 
583
#--------------------------------------------------------------------
 
584
 
 
585
AC_PATH_PROG(PKG_CONFIG, pkg-config, AC_MSG_ERROR([pkg-config wasn't found.]))
 
586
PKG_CHECK_MODULES(PCRE, [libpcrecpp >= 3], [
 
587
  ac_cv_have_libpcre=yes
 
588
  AC_DEFINE([HAVE_PCRE], [1], [Perl Compatible Regex Lib for mysqltest])
 
589
  ],[
 
590
  ac_cv_have_libpcre=no
 
591
  AC_MSG_WARN([PCRE not found - mysqltest will not be built])
 
592
  ])
 
593
AM_CONDITIONAL(BUILD_MYSQLTEST, test "x$ac_cv_have_libpcre" = "xyes")
 
594
AC_SUBST(PCRE_LIBS)
 
595
AC_SUBST(PCRE_CFLAGS)
 
596
 
 
597
#--------------------------------------------------------------------
582
598
# Check for system libraries. Adds the library to $LIBS
583
599
# and defines HAVE_LIBM etc
584
600
#--------------------------------------------------------------------
1192
1208
AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
1193
1209
 
1194
1210
AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile mysys/tests/Makefile dnl
1195
 
 strings/Makefile strings/tests/Makefile regex/Makefile storage/Makefile dnl
 
1211
 strings/Makefile strings/tests/Makefile storage/Makefile dnl
1196
1212
 vio/Makefile dnl
1197
1213
 libmysql/Makefile client/Makefile dnl
1198
1214
 sql/Makefile sql/share/Makefile dnl