diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index c708be57..2154cc85 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -118,7 +118,7 @@ AC_CHECK_HEADERS([errno.h stdio.h unistd.h locale.h sys/stat.h sys/types.h langi | |||
118 | 118 | ||
119 | GNUNET_FS_APP="fs" | 119 | GNUNET_FS_APP="fs" |
120 | AC_ARG_ENABLE([fs-app], | 120 | AC_ARG_ENABLE([fs-app], |
121 | AS_HELP_STRING([--disable-fs-app],[Do not build gnunet-fs application])) | 121 | AS_HELP_STRING([--disable-fs-app],[Do not build gnunet-fs-gtk application])) |
122 | AS_IF([test "x$enable_fs_app" != "xno"], [ | 122 | AS_IF([test "x$enable_fs_app" != "xno"], [ |
123 | GNUNET_FS_APP="fs" | 123 | GNUNET_FS_APP="fs" |
124 | ]) | 124 | ]) |
@@ -132,6 +132,14 @@ AS_IF([test "x$enable_setup_app" != "xno"], [ | |||
132 | ]) | 132 | ]) |
133 | AC_SUBST(GNUNET_SETUP_APP) | 133 | AC_SUBST(GNUNET_SETUP_APP) |
134 | 134 | ||
135 | GNUNET_PEERINFO_APP="" | ||
136 | AC_ARG_ENABLE([peerinfo-app], | ||
137 | AS_HELP_STRING([--disable-peerinfo-app],[Do not build gnunet-peerinfo-gtk application])) | ||
138 | AS_IF([test "x$enable_peerinfo_app" != "xno"], [ | ||
139 | GNUNET_PEERINFO_APP="peerinfo" | ||
140 | ]) | ||
141 | AC_SUBST(GNUNET_PEERINFO_APP) | ||
142 | |||
135 | # test for libextractor | 143 | # test for libextractor |
136 | extractor=0 | 144 | extractor=0 |
137 | AC_MSG_CHECKING(for libextractor) | 145 | AC_MSG_CHECKING(for libextractor) |
@@ -152,14 +160,14 @@ AC_ARG_WITH(extractor, | |||
152 | ], | 160 | ], |
153 | [AC_MSG_RESULT([--with-extractor not specified]) | 161 | [AC_MSG_RESULT([--with-extractor not specified]) |
154 | AC_CHECK_HEADERS(extractor.h,extractor=1)]) | 162 | AC_CHECK_HEADERS(extractor.h,extractor=1)]) |
155 | if test "$extractor" != 1 | 163 | if test "$extractor" != 1 |
156 | then | 164 | then |
157 | AC_MSG_ERROR([gnunet-gtk requires libextractor headers]) | 165 | AC_MSG_ERROR([gnunet-gtk requires libextractor headers]) |
158 | fi | 166 | fi |
159 | 167 | ||
160 | # check for gtk >= 2.6.0 | 168 | # check for gtk >= 3.0.0 |
161 | AC_MSG_CHECKING(for gtk) | 169 | AC_MSG_CHECKING(for gtk) |
162 | AM_PATH_GTK_2_0(2.6.0,without_gtk=false,without_gtk=true) | 170 | AM_PATH_GTK_3_0(3.0.0,without_gtk=false,without_gtk=true) |
163 | AM_CONDITIONAL(HAVE_GTK, test x$without_gtk != xtrue) | 171 | AM_CONDITIONAL(HAVE_GTK, test x$without_gtk != xtrue) |
164 | if test $without_gtk != true | 172 | if test $without_gtk != true |
165 | then | 173 | then |