diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-06-23 20:39:27 +0200 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-06-23 20:39:27 +0200 |
commit | 2d81d6d8217b9aa08139bd66d14c597705568920 (patch) | |
tree | 197017d2b8498a79700ef6e00160b80ae749222e /src/Makefile.am | |
parent | ad5b64d8ef992d7281501297b547095569d8f0fb (diff) | |
parent | d7547ab18052726a69ee088876389a18798e03a8 (diff) | |
download | gnunet-2d81d6d8217b9aa08139bd66d14c597705568920.tar.gz gnunet-2d81d6d8217b9aa08139bd66d14c597705568920.zip |
Merge remote-tracking branch 'origin/master' into credentials
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 4a1d909ed..e4d7d8924 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -11,9 +11,9 @@ endif | |||
11 | 11 | ||
12 | if HAVE_EXPERIMENTAL | 12 | if HAVE_EXPERIMENTAL |
13 | EXP_DIR = \ | 13 | EXP_DIR = \ |
14 | dv \ | ||
15 | rps | 14 | rps |
16 | endif | 15 | endif |
16 | # dv (FTBFS) | ||
17 | 17 | ||
18 | if HAVE_JSON | 18 | if HAVE_JSON |
19 | if HAVE_MHD | 19 | if HAVE_MHD |
@@ -49,7 +49,7 @@ if HAVE_MYSQL | |||
49 | endif | 49 | endif |
50 | 50 | ||
51 | if HAVE_POSTGRESQL | 51 | if HAVE_POSTGRESQL |
52 | POSTGRES_DIR = pq postgres | 52 | POSTGRES_DIR = pq |
53 | endif | 53 | endif |
54 | 54 | ||
55 | if HAVE_MHD | 55 | if HAVE_MHD |