diff options
author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-02-15 18:40:45 +0100 |
---|---|---|
committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-02-15 18:40:45 +0100 |
commit | a32f8bbd641afd21a27309c6a8e80a7869118aef (patch) | |
tree | 1318907e19af88a5adec4178242dab0620208e65 /configure.ac | |
parent | 2d62433bee7894d6b3d7b06a8f8dc29a6a813e22 (diff) | |
parent | 57e59c69c1196ae882f02f2b9747cdae52491549 (diff) | |
download | merchant-a32f8bbd641afd21a27309c6a8e80a7869118aef.tar.gz merchant-a32f8bbd641afd21a27309c6a8e80a7869118aef.tar.bz2 merchant-a32f8bbd641afd21a27309c6a8e80a7869118aef.zip |
Merge branch 'master' of ssh://taler.net/var/git/merchant
Conflicts:
src/frontend/index.php
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 67d5450c..d7ef722d 100644 --- a/configure.ac +++ b/configure.ac @@ -74,12 +74,12 @@ AS_CASE([$with_mint], CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" LDFLAGS="$LDFLAGS -L/usr/local/lib" -AC_CHECK_HEADERS([taler/taler_pq_lib.h], - [AC_CHECK_LIB([talerpq], [TALER_PQ_exec_prepared], libtalerpq=1)], +AC_CHECK_HEADERS([gnunet/gnunet_pq_lib.h], + [AC_CHECK_LIB([gnunetpq], [GNUNET_PQ_exec_prepared], libgnunetpq=1)], [], [#ifdef HAVE_GNUNET_PLATFORM_H #include <gnunet/platform.h> #endif]) -AM_CONDITIONAL(HAVE_TALERPQ, test x$libtalerpq = x1) +AM_CONDITIONAL(HAVE_GNUNETPQ, test x$libgnunetpq = x1) # check for libmicrohttpd |