[Freeswitch-svn] [commit] r7729 - in freeswitch/trunk: . libs/js libs/js/nsprpub libs/udns

[Freeswitch SVN]

Author: mikej
Date: Fri Feb 22 19:26:21 2008
New Revision: 7729

Modified:
   freeswitch/trunk/Makefile.am
   freeswitch/trunk/libs/js/Makefile.in
   freeswitch/trunk/libs/js/nsprpub/configure.in
   freeswitch/trunk/libs/udns/udns_rr_a.c

Log:
openbsd tweak

Modified: freeswitch/trunk/Makefile.am
==============================================================================
--- freeswitch/trunk/Makefile.am	(original)
+++ freeswitch/trunk/Makefile.am	Fri Feb 22 19:26:21 2008
@@ -151,6 +151,10 @@
 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

Modified: freeswitch/trunk/libs/js/Makefile.in
==============================================================================
--- freeswitch/trunk/libs/js/Makefile.in	(original)
+++ freeswitch/trunk/libs/js/Makefile.in	Fri Feb 22 19:26:21 2008
@@ -172,7 +172,7 @@
 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

Modified: freeswitch/trunk/libs/js/nsprpub/configure.in
==============================================================================
--- freeswitch/trunk/libs/js/nsprpub/configure.in	(original)
+++ freeswitch/trunk/libs/js/nsprpub/configure.in	Fri Feb 22 19:26:21 2008
@@ -1729,6 +1729,8 @@
     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

Modified: freeswitch/trunk/libs/udns/udns_rr_a.c
==============================================================================
--- freeswitch/trunk/libs/udns/udns_rr_a.c	(original)
+++ freeswitch/trunk/libs/udns/udns_rr_a.c	Fri Feb 22 19:26:21 2008
@@ -80,7 +80,9 @@
 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);
 }