[netperf-dev] netperf2 commit notice r117 - in trunk: . doc src

[raj at netperf.org]

Author: raj
Date: 2007-05-16 09:43:28 -0700 (Wed, 16 May 2007)
New Revision: 117

Modified:
   trunk/Makefile.in
   trunk/configure
   trunk/configure.ac
   trunk/doc/Makefile.in
   trunk/src/Makefile.in
   trunk/src/nettest_sctp.c
Log:
more fixes from Kouhei

Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in	2007-05-16 00:49:35 UTC (rev 116)
+++ trunk/Makefile.in	2007-05-16 16:43:28 UTC (rev 117)
@@ -64,7 +64,6 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
-LIBOJBS = @LIBOJBS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@

Modified: trunk/configure
===================================================================
--- trunk/configure	2007-05-16 00:49:35 UTC (rev 116)
+++ trunk/configure	2007-05-16 16:43:28 UTC (rev 117)
@@ -705,7 +705,6 @@
 NEED_LIBCOMPAT_TRUE
 NEED_LIBCOMPAT_FALSE
 NETCPU_SOURCE
-LIBOJBS
 LTLIBOBJS'
 ac_subst_files=''
       ac_precious_vars='build_alias
@@ -8355,6 +8354,11 @@
 
 done
 
+		case "$host" in
+		*-*-freebsd7.*)
+			# FreeBSD 7.x SCTP support doesn't need -lsctp.
+			;;
+		*)
 
 { echo "$as_me:$LINENO: checking for main in -lsctp" >&5
 echo $ECHO_N "checking for main in -lsctp... $ECHO_C" >&6; }
@@ -8423,6 +8427,8 @@
 fi
 ac_cv_lib_sctp=ac_cv_lib_sctp_main
 
+			;;
+		esac
 		;;
 	no)
 		use_sctp=false
@@ -9183,7 +9189,6 @@
 
 
 
-
 # now spit it all out
 ac_config_files="$ac_config_files Makefile src/netperf_version.h src/Makefile src/missing/Makefile src/missing/m4/Makefile doc/Makefile doc/examples/Makefile netperf.spec"
 
@@ -9934,11 +9939,10 @@
 NEED_LIBCOMPAT_TRUE!$NEED_LIBCOMPAT_TRUE$ac_delim
 NEED_LIBCOMPAT_FALSE!$NEED_LIBCOMPAT_FALSE$ac_delim
 NETCPU_SOURCE!$NETCPU_SOURCE$ac_delim
-LIBOJBS!$LIBOJBS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 93; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-05-16 00:49:35 UTC (rev 116)
+++ trunk/configure.ac	2007-05-16 16:43:28 UTC (rev 117)
@@ -387,7 +387,14 @@
 [[
 #include <sys/socket.h>
 ]])
-		AC_HAVE_LIBRARY(sctp,,use_sctp=false)
+		case "$host" in
+		*-*-freebsd7.*)
+			# FreeBSD 7.x SCTP support doesn't need -lsctp.
+			;;
+		*)
+			AC_HAVE_LIBRARY(sctp,,use_sctp=false)
+			;;
+		esac
 		;;
 	no)
 		use_sctp=false
@@ -637,7 +644,6 @@
 	AC_MSG_RESULT("$enable_cpuutil")
 
 AC_SUBST(NETCPU_SOURCE)
-AC_SUBST(LIBOJBS)
 
 # now spit it all out
 AC_CONFIG_FILES([Makefile

Modified: trunk/doc/Makefile.in
===================================================================
--- trunk/doc/Makefile.in	2007-05-16 00:49:35 UTC (rev 116)
+++ trunk/doc/Makefile.in	2007-05-16 16:43:28 UTC (rev 117)
@@ -68,7 +68,6 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
-LIBOJBS = @LIBOJBS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@

Modified: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	2007-05-16 00:49:35 UTC (rev 116)
+++ trunk/src/Makefile.in	2007-05-16 16:43:28 UTC (rev 117)
@@ -64,7 +64,6 @@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
-LIBOJBS = @LIBOJBS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@

Modified: trunk/src/nettest_sctp.c
===================================================================
--- trunk/src/nettest_sctp.c	2007-05-16 00:49:35 UTC (rev 116)
+++ trunk/src/nettest_sctp.c	2007-05-16 16:43:28 UTC (rev 117)
@@ -84,7 +84,7 @@
 #endif /* WANT_HISTOGRAM */
 
 #ifdef WANT_FIRST_BURST
-int first_burst_size=0;
+extern int first_burst_size;
 #endif /* WANT_FIRST_BURST */
 
 
@@ -3954,7 +3954,7 @@
       for (j = 0; j < num_associations; j++) {
 	  for (i = 0; i < first_burst_size; i++) {
 	    if((len=sctp_sendmsg(send_socket[j],
-			 send_ring->buffer_ptr, send_size
+			 send_ring->buffer_ptr, send_size,
 			 remote_res->ai_addr,
 			 remote_res->ai_addrlen,
 			 0, 0, 0, 0, 0)) != req_size) {