From 6c20f553d2805ee9cfa8c979e9815084e233c6b0 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Sat, 23 Feb 2008 00:26:21 +0000
Subject: [PATCH] openbsd tweak

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7729 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 Makefile.am                  | 4 ++++
 libs/js/Makefile.in          | 2 +-
 libs/js/nsprpub/configure.in | 2 ++
 libs/udns/udns_rr_a.c        | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index fdd2740263..838adb1b2d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,6 +151,10 @@ nodist_freeswitch_SOURCES = src/include/switch_version.h
 freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS)
 freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir)
 freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la
+if ADD_LIBEDIT
+freeswitch_CFLAGS    += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT
+freeswitch_LDADD      += libs/libedit/src/.libs/libedit.a
+endif
 
 
 if ADD_LIBEDIT
diff --git a/libs/js/Makefile.in b/libs/js/Makefile.in
index ae8a32de70..91e42159e3 100644
--- a/libs/js/Makefile.in
+++ b/libs/js/Makefile.in
@@ -172,7 +172,7 @@ src/jsautocfg.h: jscpucfg
 jscpucfg.o: src/jscpucfg.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
 jscpucfg: jscpucfg.o
-	@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -o jscpucfg jscpucfg.o $(LIBS)
+	@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -o jscpucfg jscpucfg.o $(LIBS) $(CLI_LIBS)
 src/jsopcode.h src/jsopcode.c: src/jsopcode.tbl
 
 .PHONY: install
diff --git a/libs/js/nsprpub/configure.in b/libs/js/nsprpub/configure.in
index ae6cbb5872..91920c7e6b 100644
--- a/libs/js/nsprpub/configure.in
+++ b/libs/js/nsprpub/configure.in
@@ -1729,6 +1729,8 @@ mips-sony-newsos*)
     AC_DEFINE(OPENBSD)
     AC_DEFINE(HAVE_BSD_FLOCK)
     AC_DEFINE(HAVE_SOCKLEN_T)
+    AC_DEFINE(_PR_HAVE_GETPROTO_R)
+    AC_DEFINE(_PR_HAVE_GETPROTO_R_INT)
     CFLAGS="$CFLAGS -ansi -Wall"
     CXXFLAGS="$CXXFLAGS -ansi -Wall"
     DLL_SUFFIX=so.1.0
diff --git a/libs/udns/udns_rr_a.c b/libs/udns/udns_rr_a.c
index 2266252614..c45897323a 100644
--- a/libs/udns/udns_rr_a.c
+++ b/libs/udns/udns_rr_a.c
@@ -80,7 +80,9 @@ dns_parse_a(dnscc_t *qdn, dnscc_t *pkt, dnscc_t *cur, dnscc_t *end,
 int
 dns_parse_a4(dnscc_t *qdn, dnscc_t *pkt, dnscc_t *cur, dnscc_t *end,
              void **result) {
+#ifndef __OpenBSD__ /* Openbsd likes to patch compilers to bitch about stupid things */
   assert(sizeof(struct in_addr) == 4);
+#endif
   assert(dns_get16(cur+2) == DNS_C_IN && dns_get16(cur+0) == DNS_T_A);
   return dns_parse_a(qdn, pkt, cur, end, result, 4);
 }