← 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-02-10 02:29:23 UTC
  • mto: This revision was merged to the branch mainline in revision 871.
  • Revision ID: mordred@inaugust.com-20090210022923-hvdcg0hg6gs14ysz
Fix for multi-versions of PCRE thing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
494
494
then
495
495
  save_LIBS="${LIBS}"
496
496
  AC_LIB_HAVE_LINKFLAGS(pcre,, [#include <pcre.h>], [pcre *re= NULL])
497
 
  AS_IF([test "x$ac_cv_libpcre" = "xno"],
498
 
        AC_MSG_ERROR([libpcre is required for Drizzle]))
 
497
  AS_IF([test "x$ac_cv_libpcre" = "xno"],[
 
498
    AC_LIB_HAVE_LINKFLAGS(pcre,, [#include <pcre/pcre.h>], [pcre *re= NULL])
 
499
      AS_IF([test "x$ac_cv_libpcre" = "xno"],
 
500
            [AC_MSG_ERROR([libpcre is required for Drizzle])]
 
501
            [AC_DEFINE(PCRE_HEADER,[<pcre/pcre.h>],[Location of pcre header])])
 
502
    ],[
 
503
      AC_DEFINE(PCRE_HEADER,[<pcre.h>],[Location of pcre header])
 
504
    ])
499
505
  PCRE_LIBS="${LTLIBPCRE}"
500
506
  LIBS="${save_LIBS}"
 
507
else
 
508
  AC_DEFINE(PCRE_HEADER,[<pcre.h>],[Location of pcre header])
501
509
fi
502
510
AC_SUBST(PCRE_LIBS)
503
511
AC_SUBST(PCRE_CFLAGS)