[asterisk-commits] rizzo: trunk r89373 - in /trunk: main/Makefile utils/Makefile utils/extconf.c

[SVN commits to the Asterisk project]

Author: rizzo
Date: Sat Nov 17 04:54:52 2007
New Revision: 89373

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89373
Log:
more cygwin/mingw32 compatibility fixes


Modified:
    trunk/main/Makefile
    trunk/utils/Makefile
    trunk/utils/extconf.c

Modified: trunk/main/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/main/Makefile?view=diff&rev=89373&r1=89372&r2=89373
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Sat Nov 17 04:54:52 2007
@@ -85,6 +85,10 @@
   AST_LIBS+=-lcrypto
 endif
 
+ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+  AST_LIBS+=-lminires -ldl
+  ASTLINK+= -shared -Wl,--out-implib,asterisk.dll
+endif
 ifeq ($(OSARCH),NetBSD)
   AST_LIBS+=-lpthread -lcrypto -lm -L/usr/pkg/lib $(EDITLINE_LIB)
 endif

Modified: trunk/utils/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/utils/Makefile?view=diff&rev=89373&r1=89372&r2=89373
==============================================================================
--- trunk/utils/Makefile (original)
+++ trunk/utils/Makefile Sat Nov 17 04:54:52 2007
@@ -28,6 +28,14 @@
 
 ifeq ($(OSARCH),OpenBSD)
   UTILS:=$(filter-out muted,$(UTILS))
+endif
+
+ifeq ($(OSARCH),cygwin)
+  UTILS:=$(filter-out muted,$(UTILS))
+endif
+
+ifeq ($(OSARCH),mingw32)
+  UTILS:=
 endif
 
 ifneq ($(findstring darwin,$(OSARCH)),)

Modified: trunk/utils/extconf.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/extconf.c?view=diff&rev=89373&r1=89372&r2=89373
==============================================================================
--- trunk/utils/extconf.c (original)
+++ trunk/utils/extconf.c Sat Nov 17 04:54:52 2007
@@ -1146,7 +1146,7 @@
 
 /* Asterisk REQUIRES recursive (not error checking) mutexes
    and will not run without them. */
-#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
+#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP) && defined(PTHREAD_MUTEX_RECURSIVE_NP)
 #define PTHREAD_MUTEX_INIT_VALUE	PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
 #define AST_MUTEX_KIND			PTHREAD_MUTEX_RECURSIVE_NP
 #else