diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 50 |
1 files changed, 5 insertions, 45 deletions
diff --git a/configure.ac b/configure.ac index 16a4cf686..59d236d4f 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -175,34 +175,6 @@ AS_CASE(["$host_os"], | |||
175 | DLLDIR=lib | 175 | DLLDIR=lib |
176 | UNIXONLY="#" | 176 | UNIXONLY="#" |
177 | ], | 177 | ], |
178 | [*cygwin*],[ | ||
179 | AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system]) | ||
180 | AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) | ||
181 | AC_CHECK_LIB(intl, gettext) | ||
182 | CFLAGS="-mms-bitfields $CFLAGS" | ||
183 | build_target="cygwin" | ||
184 | LIBPREFIX=lib | ||
185 | DLLDIR=bin | ||
186 | AC_PROG_CXX | ||
187 | UNIXONLY="" | ||
188 | ], | ||
189 | [*mingw*],[ | ||
190 | AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system]) | ||
191 | AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system]) | ||
192 | AC_DEFINE_UNQUOTED(_WIN32,1,[This is a Windows system]) | ||
193 | AC_CHECK_LIB(intl, gettext) | ||
194 | LDFLAGS="$LDFLAGS -Wl,--export-all-symbols" | ||
195 | LIBS="$LIBS -lws2_32 -lgnurx -lole32" | ||
196 | CFLAGS="-mms-bitfields $CFLAGS" | ||
197 | CPPFLAGS="-D_WIN32_WINNT=0x0501 -DHAVE_STAT64=1 -D__USE_MINGW_ANSI_STDIO=1 $CPPFLAGS" | ||
198 | build_target="mingw" | ||
199 | AC_PROG_CXX | ||
200 | LIBPREFIX=lib | ||
201 | DLLDIR=bin | ||
202 | UNIXONLY="" | ||
203 | funcstocheck="" | ||
204 | native_srcdir=$(cd $srcdir; pwd -W) | ||
205 | ], | ||
206 | [gnu*],[ | 178 | [gnu*],[ |
207 | AC_DEFINE_UNQUOTED(GNU,1,[This is a GNU system]) | 179 | AC_DEFINE_UNQUOTED(GNU,1,[This is a GNU system]) |
208 | build_target="gnu" | 180 | build_target="gnu" |
@@ -223,8 +195,6 @@ AC_SUBST(UNIXONLY) | |||
223 | 195 | ||
224 | AC_MSG_CHECKING([for build target]) | 196 | AC_MSG_CHECKING([for build target]) |
225 | AM_CONDITIONAL(DARWIN, test "$build_target" = "darwin") | 197 | AM_CONDITIONAL(DARWIN, test "$build_target" = "darwin") |
226 | AM_CONDITIONAL(CYGWIN, test "$build_target" = "cygwin") | ||
227 | AM_CONDITIONAL(MINGW, test "$build_target" = "mingw") | ||
228 | AM_CONDITIONAL(SOLARIS, test "$build_target" = "solaris") | 198 | AM_CONDITIONAL(SOLARIS, test "$build_target" = "solaris") |
229 | AM_CONDITIONAL(XFREEBSD, test "$build_target" = "freebsd") | 199 | AM_CONDITIONAL(XFREEBSD, test "$build_target" = "freebsd") |
230 | AM_CONDITIONAL(OPENBSD, test "$build_target" = "openbsd") | 200 | AM_CONDITIONAL(OPENBSD, test "$build_target" = "openbsd") |
@@ -289,7 +259,7 @@ AS_IF([test x"$VAR_IP6TABLES_BINARY" = x"false"], | |||
289 | [VAR_IP6TABLES_BINARY="/sbin/ip6tables"], | 259 | [VAR_IP6TABLES_BINARY="/sbin/ip6tables"], |
290 | [AS_IF([test -x "/usr/sbin/ip6tables"], | 260 | [AS_IF([test -x "/usr/sbin/ip6tables"], |
291 | [VAR_IP6TABLES_BINARY="/usr/sbin/ip6tables"])])]) | 261 | [VAR_IP6TABLES_BINARY="/usr/sbin/ip6tables"])])]) |
292 | 262 | ||
293 | 263 | ||
294 | AS_IF([test x"$VAR_IP6TABLES_BINARY" != x"false"], | 264 | AS_IF([test x"$VAR_IP6TABLES_BINARY" != x"false"], |
295 | [AC_DEFINE_UNQUOTED([IP6TABLES], "$VAR_IP6TABLES_BINARY", [Path to ip6tables])], | 265 | [AC_DEFINE_UNQUOTED([IP6TABLES], "$VAR_IP6TABLES_BINARY", [Path to ip6tables])], |
@@ -364,13 +334,6 @@ AC_CHECK_LIB(anl, | |||
364 | AM_CONDITIONAL(HAVE_GETADDRINFO_A, | 334 | AM_CONDITIONAL(HAVE_GETADDRINFO_A, |
365 | [test "$have_addrinfo_a" = 1]) | 335 | [test "$have_addrinfo_a" = 1]) |
366 | 336 | ||
367 | # tests only run on Windows | ||
368 | AS_IF([test "x$build_target" = "xmingw"], | ||
369 | [AC_CHECK_LIB(gnurx, | ||
370 | regexec, | ||
371 | [], | ||
372 | [AC_MSG_ERROR([GNUnet requires libgnurx on Windows])])]) | ||
373 | |||
374 | # libgcrypt | 337 | # libgcrypt |
375 | gcrypt=0 | 338 | gcrypt=0 |
376 | NEED_LIBGCRYPT_API=1 | 339 | NEED_LIBGCRYPT_API=1 |
@@ -1185,9 +1148,6 @@ CPPFLAGS=$SAVE_CPPFLAGS | |||
1185 | AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>]) | 1148 | AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>]) |
1186 | AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>]) | 1149 | AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>]) |
1187 | 1150 | ||
1188 | AS_IF([test "$build_target" = "mingw"] | ||
1189 | [CYGWIN_MYSQL_MAGIC="#include <mysql/my_global.h>"]) | ||
1190 | |||
1191 | # test for mysql | 1151 | # test for mysql |
1192 | mysql=false | 1152 | mysql=false |
1193 | mysqlfail=false | 1153 | mysqlfail=false |
@@ -1202,7 +1162,7 @@ AC_ARG_WITH(mysql, | |||
1202 | [yes|""],[ | 1162 | [yes|""],[ |
1203 | AC_CHECK_HEADERS(mysql/mysql.h, | 1163 | AC_CHECK_HEADERS(mysql/mysql.h, |
1204 | AC_CHECK_LIB(mysqlclient, mysql_init, | 1164 | AC_CHECK_LIB(mysqlclient, mysql_init, |
1205 | mysql=true), [], [$CYGWIN_MYSQL_MAGIC]) | 1165 | mysql=true), [], []) |
1206 | ],[ | 1166 | ],[ |
1207 | LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS" | 1167 | LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS" |
1208 | CPPFLAGS="-I$with_mysql/include $CPPFLAGS" | 1168 | CPPFLAGS="-I$with_mysql/include $CPPFLAGS" |
@@ -1211,7 +1171,7 @@ AC_ARG_WITH(mysql, | |||
1211 | MYSQL_LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql" | 1171 | MYSQL_LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql" |
1212 | MYSQL_CPPFLAGS="-I$with_mysql/include" | 1172 | MYSQL_CPPFLAGS="-I$with_mysql/include" |
1213 | 1173 | ||
1214 | mysql=true), [], [$CYGWIN_MYSQL_MAGIC]) | 1174 | mysql=true), [], []) |
1215 | ]) | 1175 | ]) |
1216 | ], | 1176 | ], |
1217 | [AC_MSG_RESULT([--with-mysql not specified]) | 1177 | [AC_MSG_RESULT([--with-mysql not specified]) |
@@ -1228,7 +1188,7 @@ AC_ARG_WITH(mysql, | |||
1228 | MYSQL_LDFLAGS="-L$MYSQL_LIBDIR" | 1188 | MYSQL_LDFLAGS="-L$MYSQL_LIBDIR" |
1229 | mysql=true | 1189 | mysql=true |
1230 | 1190 | ||
1231 | , [], [$CYGWIN_MYSQL_MAGIC])]) | 1191 | , [], [])]) |
1232 | ]) | 1192 | ]) |
1233 | 1193 | ||
1234 | AC_SUBST(MYSQL_LDFLAGS) | 1194 | AC_SUBST(MYSQL_LDFLAGS) |
@@ -1240,7 +1200,7 @@ AS_IF([test "$mysql" = "true" -a "x$enable_mysql_version_check" = "xyes"], | |||
1240 | [ | 1200 | [ |
1241 | AC_MSG_CHECKING(mysql version) | 1201 | AC_MSG_CHECKING(mysql version) |
1242 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM( | 1202 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM( |
1243 | [[$CYGWIN_MYSQL_MAGIC | 1203 | [[ |
1244 | #include <mysql/mysql.h>]], | 1204 | #include <mysql/mysql.h>]], |
1245 | [[ | 1205 | [[ |
1246 | #if (MYSQL_VERSION_ID < 40100) | 1206 | #if (MYSQL_VERSION_ID < 40100) |