← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Monty Taylor
  • Date: 2009-01-09 18:38:02 UTC
  • mto: (779.1.4 devel)
  • mto: This revision was merged to the branch mainline in revision 784.
  • Revision ID: mordred@inaugust.com-20090109183802-ub8g1zbodarqb0p7
Put back in pkg-config check- pcre.h is in /usr/include for older versions and
in /usr/include/pcre for newer versions. I'd force us to use newer - but FFS, it's just for drizzletest right now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
486
486
# Check for libpcre
487
487
#--------------------------------------------------------------------
488
488
 
489
 
AC_LIB_HAVE_LINKFLAGS(pcre,, [#include <pcre.h>], [pcre *re= NULL])
490
 
AS_IF([test "x$ac_cv_libpcre" = "xno"],
491
 
      AC_MSG_ERROR([libpcre is required for Drizzle]))
 
489
AC_PATH_PROG(PKG_CONFIG, pkg-config, AC_MSG_ERROR([pkg-config wasn't found.]))
 
490
PKG_CHECK_MODULES(PCRE, [libpcre >= 3], [found_pcre="yes"],[found_pcre="no"])
 
491
 
 
492
if test "$found_pcre" = "no"
 
493
then
 
494
  save_LIBS="${LIBS}"
 
495
  AC_LIB_HAVE_LINKFLAGS(pcre,, [#include <pcre.h>], [pcre *re= NULL])
 
496
  AS_IF([test "x$ac_cv_libpcre" = "xno"],
 
497
        AC_MSG_ERROR([libpcre is required for Drizzle]))
 
498
  PCRE_LIBS="${LIBS}"
 
499
  LIBS="${save_LIBS}"
 
500
fi
 
501
AC_SUBST(PCRE_LIBS)
 
502
AC_SUBST(PCRE_CFLAGS)
 
503
 
492
504
 
493
505
dnl Find paths to some shell programs
494
506
AC_PATH_PROG(LN, ln, ln)