diff options
author | ng0 <ng0@n0.is> | 2019-09-11 12:42:35 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-09-11 12:42:35 +0000 |
commit | c4ae64d7988d03a10fd43cf8d0fa81399382fcb3 (patch) | |
tree | 021052c6001f6a7898735c0eef53b42848c667ce /configure.ac | |
parent | 41d6a90e337d6718d37855fb1e0a5537a319d122 (diff) | |
download | gnunet-c4ae64d7988d03a10fd43cf8d0fa81399382fcb3.tar.gz gnunet-c4ae64d7988d03a10fd43cf8d0fa81399382fcb3.zip |
configure: remove mingw conditions, replace one gcc with $CC.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index ef68f01ee..e11fee997 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -62,8 +62,9 @@ AC_FUNC_FSEEKO | |||
62 | 62 | ||
63 | 63 | ||
64 | CFLAGS="-Wall $CFLAGS" | 64 | CFLAGS="-Wall $CFLAGS" |
65 | AC_MSG_CHECKING(whether cc can use -fno-strict-aliasing) | ||
65 | # use '-fno-strict-aliasing', but only if the compiler can take it | 66 | # use '-fno-strict-aliasing', but only if the compiler can take it |
66 | AS_IF([gcc -fno-strict-aliasing -S -o /dev/null -xc /dev/null >/dev/null 2>&1], | 67 | AS_IF([$CC -fno-strict-aliasing -S -o /dev/null -xc /dev/null >/dev/null 2>&1], |
67 | [CFLAGS="-fno-strict-aliasing $CFLAGS"]) | 68 | [CFLAGS="-fno-strict-aliasing $CFLAGS"]) |
68 | 69 | ||
69 | # A helper which allows us to check cflags if compiler | 70 | # A helper which allows us to check cflags if compiler |
@@ -197,6 +198,7 @@ AC_SUBST(UNIXONLY) | |||
197 | AC_MSG_CHECKING([for build target]) | 198 | AC_MSG_CHECKING([for build target]) |
198 | AM_CONDITIONAL(DARWIN, test "$build_target" = "darwin") | 199 | AM_CONDITIONAL(DARWIN, test "$build_target" = "darwin") |
199 | AM_CONDITIONAL(SOLARIS, test "$build_target" = "solaris") | 200 | AM_CONDITIONAL(SOLARIS, test "$build_target" = "solaris") |
201 | AM_CONDITIONAL(XNETBSD, test "$build_target" = "netbsd") | ||
200 | AM_CONDITIONAL(XFREEBSD, test "$build_target" = "freebsd") | 202 | AM_CONDITIONAL(XFREEBSD, test "$build_target" = "freebsd") |
201 | AM_CONDITIONAL(OPENBSD, test "$build_target" = "openbsd") | 203 | AM_CONDITIONAL(OPENBSD, test "$build_target" = "openbsd") |
202 | AM_CONDITIONAL(LINUX, test "$build_target" = "linux") | 204 | AM_CONDITIONAL(LINUX, test "$build_target" = "linux") |
@@ -319,8 +321,6 @@ AC_CHECK_MEMBER(struct tm.tm_gmtoff, | |||
319 | , | 321 | , |
320 | [#include <time.h>]) | 322 | [#include <time.h>]) |
321 | 323 | ||
322 | AC_CHECK_DECLS([_stati64]) | ||
323 | |||
324 | # 'save' libs; only those libs found so far will be | 324 | # 'save' libs; only those libs found so far will be |
325 | # linked against _everywhere_. For the others, we | 325 | # linked against _everywhere_. For the others, we |
326 | # will be more selective! | 326 | # will be more selective! |
@@ -593,8 +593,6 @@ AC_LANG_POP(C) | |||
593 | # check for bluetooth library | 593 | # check for bluetooth library |
594 | bluetooth=0 | 594 | bluetooth=0 |
595 | CHECK_LIBHEADER(BLUETOOTH, bluetooth, ba2str, bluetooth/bluetooth.h,bluetooth=1,) | 595 | CHECK_LIBHEADER(BLUETOOTH, bluetooth, ba2str, bluetooth/bluetooth.h,bluetooth=1,) |
596 | AS_IF([test "$build_target" = "mingw"], | ||
597 | [bluetooth=1]) | ||
598 | AM_CONDITIONAL(HAVE_LIBBLUETOOTH, [test "$bluetooth" = 1]) | 596 | AM_CONDITIONAL(HAVE_LIBBLUETOOTH, [test "$bluetooth" = 1]) |
599 | AS_IF([test "$bluetooth" = 1], | 597 | AS_IF([test "$bluetooth" = 1], |
600 | [AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library])], | 598 | [AC_DEFINE([HAVE_LIBBLUETOOTH],[1],[Have bluetooth library])], |
@@ -657,8 +655,6 @@ AS_IF([test "x$jansson" = x1], | |||
657 | pulse=0 | 655 | pulse=0 |
658 | libpulse_msg="no" | 656 | libpulse_msg="no" |
659 | CHECK_LIBHEADER(LIBPULSE, pulse, pa_stream_peek, pulse/simple.h,pulse=1,) | 657 | CHECK_LIBHEADER(LIBPULSE, pulse, pa_stream_peek, pulse/simple.h,pulse=1,) |
660 | AS_IF([test "$build_target" = "mingw"], | ||
661 | [pulse=0]) | ||
662 | AS_IF([test "$pulse" = 1], | 658 | AS_IF([test "$pulse" = 1], |
663 | [AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library]) | 659 | [AC_DEFINE([HAVE_PULSE],[1],[Have libpulse(audio) library]) |
664 | libpulse_msg="yes"]) | 660 | libpulse_msg="yes"]) |
@@ -1916,7 +1912,7 @@ AC_SUBST(features_msg) | |||
1916 | # TODO: reduce the length of the last message block ("the message") | 1912 | # TODO: reduce the length of the last message block ("the message") |
1917 | 1913 | ||
1918 | AC_MSG_NOTICE([ | 1914 | AC_MSG_NOTICE([ |
1919 | GNUnet Configuration (incomplete!) | 1915 | GNUnet Configuration |
1920 | 1916 | ||
1921 | gnunet version: ${VERSION} | 1917 | gnunet version: ${VERSION} |
1922 | 1918 | ||