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 /src/backenddb/Makefile.am | |
| 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 'src/backenddb/Makefile.am')
| -rw-r--r-- | src/backenddb/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am index e70ad206..08adf296 100644 --- a/src/backenddb/Makefile.am +++ b/src/backenddb/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include plugindir = $(libdir)/taler if HAVE_POSTGRESQL -if HAVE_TALERPQ +if HAVE_GNUNETPQ plugin_LTLIBRARIES = \ libtaler_plugin_merchantdb_postgres.la endif @@ -32,7 +32,7 @@ libtaler_plugin_merchantdb_postgres_la_LIBADD = \ $(LTLIBINTL) libtaler_plugin_merchantdb_postgres_la_LDFLAGS = \ $(TALER_PLUGIN_LDFLAGS) \ - -ltalerpq \ + -lgnunetpq \ -ltalerutil \ -lpq \ -lgnunetpostgres \ |