Fix compilation error caused by ACX_THREAD

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index cabd87bfdb8f48c0e7b6414c61a7e42662a22e87..d5de5e1f77edd1427295dffa19a2962c1f8f33c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,7 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_GCC_TRADITIONAL
+AX_PTHREAD(,AC_MSG_ERROR([Missing POSIX Threads support]))
 
 if test x"$ac_cv_prog_cc_c99" = x"no"; then
     AC_MSG_ERROR([C99 support is required])
@@ -66,6 +67,13 @@ AC_CHECK_MEMBER([struct in_pktinfo.ipi_spec_dst],
     [],
     [[#include <netinet/in.h>]])
 
+# iOS stuff
+AC_CHECK_DECL(__APPLE__)
+AM_CONDITIONAL([APPLE], [ test "x$ac_cv_have_decl___APPLE__" = "xyes" ])
+if test "x$ac_cv_have_decl___APPLE__" = "xyes" ; then
+    CPPFLAGS="$CPPFLAGS -I`pwd`/src/compat/ios/include"
+fi
+
 # -fstack-protector
 AC_ARG_ENABLE([stack-protector],
     [AS_HELP_STRING([--disable-stack-protector],
@@ -137,8 +145,6 @@ fi
 # libtool stuff
 LT_INIT([win32-dll])
 
-ACX_PTHREAD(,AC_MSG_ERROR([Missing POSIX Threads support]))
-
 #
 # Check for netlink.h
 #
@@ -254,7 +260,7 @@ test_gcc_flag() {
 # If using GCC specify some additional parameters
 if test "x$GCC" = "xyes" ; then
 
-    DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wformat -Wold-style-definition -Wdeclaration-after-statement -Wfloat-equal -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wshadow -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -fdiagnostics-show-option -Wno-cast-qual -fno-strict-aliasing"
+    DESIRED_FLAGS="-Wall -W -Wextra -pedantic -pipe -Wold-style-definition -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wshadow -Wbad-function-cast -Wwrite-strings -fdiagnostics-show-option -fno-strict-aliasing"
 
     # when compiling for MingW, -Wmissing-noreturn is triggered a bunch of
     # times from autogenerated libtool wrappers, so leave it out on Windows.
@@ -339,7 +345,6 @@ src/Makefile
 include/Makefile
 tests/Makefile
 examples/Makefile
-m4/Makefile
 ])
 AC_OUTPUT