X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=configure.ac;h=48694a700786cb791919f1737908232374d5f49f;hp=364884999cdf12005f99f50872bd4c94b0603726;hb=HEAD;hpb=b052a89622c02b5888c0ca61e52b19e9dbec29c8

diff --git a/configure.ac b/configure.ac
index 36488499..022bba7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.61)
+AC_PREREQ(2.69)
 AC_INIT([MeshLink], [0.1])
 DX_PS_FEATURE(OFF)
 DX_INIT_DOXYGEN([MeshLink], [$(top_srcdir)/Doxyfile])
@@ -15,16 +15,18 @@ AM_SILENT_RULES([yes])
 AC_USE_SYSTEM_EXTENSIONS
 AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions])
 AC_DEFINE([_POSIX_C_SOURCE], 200809L, [Enable POSIX features])
+AC_DEFINE([_DARWIN_C_SOURCE], 1, [Enable Darwin features])
 
 dnl Checks for programs.
 AM_PROG_CC_C_O
 AM_PROG_AR
+AC_PROG_CC
 AC_PROG_CC_C99
 AC_PROG_CXX
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
-AC_PROG_LIBTOOL
+LT_INIT
 AX_PTHREAD
 
 dnl Check and set OS
@@ -41,6 +43,9 @@ case $host_os in
     AC_DEFINE(HAVE_MINGW, 1, [MinGW])
     LIBS="$LIBS -lws2_32 -lgdi32 -lcrypt32"
   ;;
+  *darwin* | *ios*)
+    LIBS="$LIBS -framework Foundation -framework SystemConfiguration"
+  ;;
 esac
 
 AM_CONDITIONAL(LINUX, test "$linux" = true)
@@ -82,14 +87,6 @@ AS_IF([test "x$enable_hardening" != "xno"],
   ]
 );
 
-dnl Allow building without Catta
-AC_ARG_ENABLE([catta], AS_HELP_STRING([--disable-catta], [disable linking with the Catta library]))
-AS_IF([test "x$enable_catta" != "xno"],
-  AC_DEFINE(HAVE_CATTA, 1, [Link with Catta])
-  AC_CONFIG_SUBDIRS([catta])
-)
-AM_CONDITIONAL(CATTA, test "x$enable_catta" != "xno")
-
 dnl UTCP debug flags
 AC_ARG_ENABLE([utcp_debug], AS_HELP_STRING([--enable-utcp-debug], [compile utcp with debug output]))
 AS_IF([test "x$enable_utcp_debug" = "xyes"],
@@ -131,7 +128,6 @@ MeshLink_ATTRIBUTE(__malloc__)
 MeshLink_ATTRIBUTE(__warn_unused_result__)
 
 dnl Checks for library functions.
-AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([asprintf fchmod fork gettimeofday random pselect select setns strdup usleep getifaddrs freeifaddrs],
   [], [], [#include "$srcdir/src/have.h"]
 )