Changeset 699 for pjproject/trunk/aconfigure.ac

Timestamp:

Sep 10, 2006 4:33:48 PM (18 years ago)

Author:

bennylp

Message:

Fixed autoconf in mingw

File:

• pjproject/trunk/aconfigure.ac (modified) (6 diffs)

pjproject/trunk/aconfigure.ac

@@ -18 +18 @@
 
 AC_CHECK_LIB(pthread,pthread_create)
+AC_CHECK_LIB(wsock32,puts)
+AC_CHECK_LIB(ws2_32,puts)
+AC_CHECK_LIB(ole32,puts)
+AC_CHECK_LIB(winmm,puts)
+AC_CHECK_LIB(socket,puts)
+AC_CHECK_LIB(rt,puts)
+AC_CHECK_LIB(nsl,puts)
 
 AC_MSG_RESULT([Setting PJ_M_NAME to $target_cpu])
 AC_DEFINE_UNQUOTED(PJ_M_NAME,["$target_cpu"])
 
-dnl # Endianness detection
+dnl
+dnl Endianness detection
+dnl
 AC_C_BIGENDIAN
+
+dnl
+dnl Legacy macros
+dnl
+case $target in
+    *mingw* | *cygw* | *win32* | *w32* )
+        AC_DEFINE(PJ_WIN32,1)
+        AC_DEFINE(PJ_WIN32_WINNT,0x0400)
+        AC_DEFINE(WIN32_LEAN_AND_MEAN)
+        ;;
+    *darwin*)
+        AC_DEFINE(PJ_DARWINOS,1)
+        ;;
+    *linux*)
+        AC_DEFINE(PJ_LINUX,1)
+        ;;
+    *rtems*)
+        AC_DEFINE(PJ_RTEMS,1)
+        ;;
+    *sunos* | *solaris* )
+        AC_DEFINE(PJ_SUNOS,1)
+        ;;
+    *)
+        ;;
+esac
+
+
+
 
 dnl # --disable-floating-point option
@@ -43 +80 @@
 AC_CHECK_HEADER(assert.h,[AC_DEFINE(PJ_HAS_ASSERT_H,1)])
 AC_CHECK_HEADER(ctype.h,[AC_DEFINE(PJ_HAS_CTYPE_H,1)])
-AC_CHECK_HEADER(errno.h,[AC_DEFINE(PJ_HAS_ERRNO_H,1)])
+
+case $target in
+    *mingw* | *cygw* | *win32* | *w32* )
+        AC_DEFINE(PJ_HAS_ERRNO_H,0)
+        ;;
+    *)
+        AC_CHECK_HEADER(errno.h,[AC_DEFINE(PJ_HAS_ERRNO_H,1)])
+        ;;
+esac
+
 AC_CHECK_HEADER(linux/socket.h,[AC_DEFINE(PJ_HAS_LINUX_SOCKET_H,1)])
 AC_CHECK_HEADER(malloc.h,[AC_DEFINE(PJ_HAS_MALLOC_H,1)])
@@ -113 +159 @@
 dnl # Determine if SO_ERROR is available
 AC_MSG_CHECKING([if SO_ERROR is available])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-                                     #include <sys/socket.h>
-                                     #include <netinet/in.h>
-                                     #include <arpa/inet.h>]],
-                                  [int i=SO_ERROR;])],
-                  [AC_DEFINE(PJ_HAS_SO_ERROR,1)
-                   AC_MSG_RESULT(yes)],
-                  AC_MSG_RESULT(no))
+case $target in
+    *mingw* | *cygw* | *win32* | *w32* )
+        AC_DEFINE(PJ_HAS_SO_ERROR,1)
+        AC_MSG_RESULT(yes)
+        ;;
+    *)
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+                                             #include <sys/socket.h>
+                                             #include <netinet/in.h>
+                                             #include <arpa/inet.h>]],
+                                          [int i=SO_ERROR;])],
+                          [AC_DEFINE(PJ_HAS_SO_ERROR,1)
+                           AC_MSG_RESULT(yes)],
+                          AC_MSG_RESULT(no))
+        ;;
+esac
+
 
 dnl # Determine if RW-mutex is available
@@ -131 +186 @@
                    AC_MSG_RESULT(no)])
 
+AC_SUBST(ac_os_objs)
+case $target in
+  *mingw* | *cygw* | *win32* | *w32* )
+        ac_os_objs="os_core_win32.o os_error_win32.o os_time_win32.o os_timestamp_win32.o guid_win32.o ioqueue_select.o"
+        ;;
+  *)
+        ac_os_objs="os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_simple.o ioqueue_select.o"
+        ;;
+esac
+
 
 dnl ##########################################
@@ -315 +380 @@
 dnl # socket recv() can not return immediate data.
 case $target in
+  *mingw* | *cygw* | *win32* | *w32* )
+        AC_DEFINE(PJ_BLOCKING_ERROR_VAL,WSAEWOULDBLOCK)
+        ;;
   *) AC_DEFINE(PJ_BLOCKING_ERROR_VAL,EAGAIN)
      AC_MSG_RESULT([** Setting non-blocking recv() retval to EAGAIN (please check)])
@@ -323 +391 @@
 dnl # socket connect() can not get connected immediately.
 case $target in
+  *mingw* | *cygw* | *win32* | *w32* )
+        AC_DEFINE(PJ_BLOCKING_CONNECT_ERROR_VAL,WSAEWOULDBLOCK)
+        ;;
   *) AC_DEFINE(PJ_BLOCKING_CONNECT_ERROR_VAL,EINPROGRESS)
      AC_MSG_RESULT([** Setting non-blocking connect() retval to EINPROGRESS (please check)])