[svn-commits] qwell: trunk r59574 - in /trunk: ./ acinclude.m4 configure main/Makefile

[svn-commits at lists.digium.com]

Author: qwell
Date: Fri Mar 30 17:54:01 2007
New Revision: 59574

URL: http://svn.digium.com/view/asterisk?view=rev&rev=59574
Log:
Merged revisions 59573 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59573 | qwell | 2007-03-30 17:50:31 -0500 (Fri, 30 Mar 2007) | 2 lines

Add linux-uclibc host arch..."thingy".  Sorry, I don't know what it's called...

........

Modified:
    trunk/   (props changed)
    trunk/acinclude.m4
    trunk/configure
    trunk/main/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/acinclude.m4
URL: http://svn.digium.com/view/asterisk/trunk/acinclude.m4?view=diff&rev=59574&r1=59573&r2=59574
==============================================================================
--- trunk/acinclude.m4 (original)
+++ trunk/acinclude.m4 Fri Mar 30 17:54:01 2007
@@ -568,7 +568,7 @@
 fi
 if test "x$ac_cv_func_fork_works" = xcross; then
   case $host in
-    *-*-amigaos* | *-*-msdosdjgpp* | *-*-uclinux* )
+    *-*-amigaos* | *-*-msdosdjgpp* | *-*-uclinux* | *-*-linux-uclibc* )
       # Override, as these systems have only a dummy fork() stub
       ac_cv_func_fork_works=no
       ;;

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?view=diff&rev=59574&r1=59573&r2=59574
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Fri Mar 30 17:54:01 2007
@@ -12821,7 +12821,7 @@
 fi
 if test "x$ac_cv_func_fork_works" = xcross; then
   case $host in
-    *-*-amigaos* | *-*-msdosdjgpp* | *-*-uclinux* )
+    *-*-amigaos* | *-*-msdosdjgpp* | *-*-uclinux* | *-*-linux-uclibc* )
       # Override, as these systems have only a dummy fork() stub
       ac_cv_func_fork_works=no
       ;;

Modified: trunk/main/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/main/Makefile?view=diff&rev=59574&r1=59573&r2=59574
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Fri Mar 30 17:54:01 2007
@@ -54,7 +54,7 @@
   OBJS+=dlfcn.o
 endif
 
-ifneq ($(findstring $(OSARCH), linux-gnu uclinux ),)
+ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc ),)
   ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
   AST_LIBS+=-ldl
   endif