From e1b34d40d79b99b935abc1e93684823509e28ee8 Mon Sep 17 00:00:00 2001
From: gardners <paul@servalproject.org>
Date: Fri, 2 Dec 2011 05:44:32 +1030
Subject: [PATCH] Fixed some build issues for Asterisk application.

---
 asterisk_app.c | 8 ++++----
 configure.in   | 2 +-
 mphlr.h        | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/asterisk_app.c b/asterisk_app.c
index d110d695..a1d43919 100644
--- a/asterisk_app.c
+++ b/asterisk_app.c
@@ -103,8 +103,8 @@ static char *handle_cli_sdnagate(int fd, int argc, char *argv[])
    int len=0;
    int instance=0;
 
-   if (gatewayuri) free(gatewayuri);
-   gatewayuri=NULL;
+   if (gatewayspec) free(gatewayspec);
+   gatewayspec=NULL;
    if (argc == 3 ) {
        ast_cli(fd,"Serval DNA Gateway Function OFF.\n\n",len);
        return RESULT_SUCCESS;
@@ -114,9 +114,9 @@ static char *handle_cli_sdnagate(int fd, int argc, char *argv[])
         return RESULT_FAILURE;
     }
 
-   gatewayuri=strdup(argv[3]);
+   gatewayspec=strdup(argv[3]);
 
-   ast_cli(fd,"Serval DNA Gateway Function ON (trunk URI is %s/EXTENSION).\n\n",gatewayuri);
+   ast_cli(fd,"Serval DNA Gateway Function ON (trunk spec is %s).\n\n",gatewayspec);
    return RESULT_SUCCESS;
 }
 
diff --git a/configure.in b/configure.in
index 72f9dbbd..190ba081 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_PROG_CC
 
 AC_CHECK_LIB(c,srandomdev)
 
-AC_CHECK_HEADERS(stdio.h errno.h stdlib.h strings.h unistd.h string.h arpa/inet.h sys/socket.h sys/mman.h sys/time.h poll.h netdb.h linux/if.h linux/netlink.h linux/rtnetlink.h net/if.h netinet/in.h ifaddrs.h net/route.h)
+AC_CHECK_HEADERS(stdio.h errno.h stdlib.h strings.h unistd.h string.h arpa/inet.h sys/socket.h sys/mman.h sys/time.h poll.h netdb.h linux/if.h linux/netlink.h linux/rtnetlink.h net/if.h netinet/in.h ifaddrs.h net/route.h signal.h)
 
 echo "Fetching and building NaCl if required."
 echo "(this can take HOURS to build depending on your architecture,"
diff --git a/mphlr.h b/mphlr.h
index 47fa74e4..6ce92c33 100644
--- a/mphlr.h
+++ b/mphlr.h
@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <strings.h>
 #endif
 #include <string.h>
+#include <signal.h>
 
 #ifdef WIN32
 #include "win32/win32.h"