Merge slimey's Solaris compatibility (with small mods) (bug #2740)

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

3 files changed, 13 insertions, 2 deletions

diff --git a/agi/Makefile b/agi/Makefile
index 2f87df5f8..0d8a35922 100755
--- a/agi/Makefile
+++ b/agi/Makefile
@@ -15,6 +15,11 @@ AGIS=agi-test.agi eagi-test eagi-sphinx-test
 
 CFLAGS+=
 
+LIBS=
+ifeq ($(OSARCH),SunOS)
+LIBS=-lsocket -lnsl ../strcompat.o
+endif
+
 all: depend $(AGIS)
 
 install: all
@@ -22,10 +27,10 @@ install: all
 	for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
 
 eagi-test: eagi-test.o
-	$(CC) $(CFLAGS) -o eagi-test eagi-test.o
+	$(CC) $(CFLAGS) -o eagi-test eagi-test.o $(LIBS)
 
 eagi-sphinx-test: eagi-sphinx-test.o
-	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o
+	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o $(LIBS) 
 
 clean:
 	rm -f *.so *.o look .depend eagi-test eagi-sphinx-test
diff --git a/agi/eagi-sphinx-test.c b/agi/eagi-sphinx-test.c
index 3015b730b..72bd93fd4 100755
--- a/agi/eagi-sphinx-test.c
+++ b/agi/eagi-sphinx-test.c
@@ -17,6 +17,9 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#ifdef SOLARIS
+#include <solaris-compat/compat.h>
+#endif
 
 #define AUDIO_FILENO (STDERR_FILENO + 1)
 
diff --git a/agi/eagi-test.c b/agi/eagi-test.c
index aa498cb88..360fd4222 100755
--- a/agi/eagi-test.c
+++ b/agi/eagi-test.c
@@ -11,6 +11,9 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/select.h>
+#ifdef SOLARIS
+#include <solaris-compat/compat.h>
+#endif
 
 #define AUDIO_FILENO (STDERR_FILENO + 1)