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...

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59574 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/acinclude.m4 b/acinclude.m4
index ca82c7a9fbccc1f80c65fd126640e36166d62585..cc1f61e76940d242dadb07b66c29ae2f74cc851e 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -568,7 +568,7 @@ else
 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
       ;;

diff --git a/configure b/configure
index 7b1cbb86a376619e1e788a923a17fb5456745bfd..00dcbd3a419299c94e0c932eb7c1f46ebf70a925 100755 (executable)
--- a/configure
+++ b/configure
@@ -12821,7 +12821,7 @@ else
 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
       ;;

diff --git a/main/Makefile b/main/Makefile
index 7d05ebfb09531bf0c55e91ed464d0c3834f1d2e8..9e0f6f23566318bc1aa22200165ad5cd27c8cb1f 100644 (file)
--- a/main/Makefile
+++ b/main/Makefile
@@ -54,7 +54,7 @@ ifeq ($(wildcard /usr/include/dlfcn.h),)
   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