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

[raj at netperf.org]

Author: raj
Date: 2009-09-04 09:50:45 -0700 (Fri, 04 Sep 2009)
New Revision: 311

Modified:
   trunk/AUTHORS
   trunk/configure
   trunk/configure.ac
   trunk/src/nettest_omni.c
Log:
more fixes from Jose

Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS	2009-09-03 20:32:12 UTC (rev 310)
+++ trunk/AUTHORS	2009-09-04 16:50:45 UTC (rev 311)
@@ -237,7 +237,9 @@
 Fixes to supply some missing fprintf format statements.
 
 Jose  Pedro Oliveira
-Linux compilation fixes when SCTP and DCCP are enabled.
+Linux compilation fixes when SCTP and DCCP are enabled. Changes to
+configure.ac to allow it to inherit compiler flags from environment
+variables.
 
 Pal Baranyai
 Typo in nettest_dlpi.c
\ No newline at end of file

Modified: trunk/configure
===================================================================
--- trunk/configure	2009-09-03 20:32:12 UTC (rev 310)
+++ trunk/configure	2009-09-04 16:50:45 UTC (rev 311)
@@ -1775,6 +1775,11 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+
+# Inherit compiler flags from the environment...
+CFLAGS="${CFLAGS:=}"
+CXXFLAGS="${CXXFLAGS:=}"
+
 # use the target version rather than host - one day we may want cross-compile
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-09-03 20:32:12 UTC (rev 310)
+++ trunk/configure.ac	2009-09-04 16:50:45 UTC (rev 311)
@@ -7,6 +7,11 @@
 
 AC_PREREQ(2.59)
 AC_INIT(netperf, 2.4.5)
+
+# Inherit compiler flags from the environment...
+CFLAGS="${CFLAGS:=}"
+CXXFLAGS="${CXXFLAGS:=}"
+
 # use the target version rather than host - one day we may want cross-compile
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([src/hist.h])

Modified: trunk/src/nettest_omni.c
===================================================================
--- trunk/src/nettest_omni.c	2009-09-03 20:32:12 UTC (rev 310)
+++ trunk/src/nettest_omni.c	2009-09-04 16:50:45 UTC (rev 311)
@@ -64,10 +64,6 @@
 #include <malloc.h>
 #endif /* NOSTDLIBH */
 
-#ifdef WANT_SCTP
-#include <netinet/sctp.h>
-#endif
-
 #ifndef WIN32
 #if !defined(__VMS)
 #include <sys/ipc.h>
@@ -75,6 +71,11 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/tcp.h>
+
+#ifdef WANT_SCTP
+#include <netinet/sctp.h>
+#endif
+
 #include <arpa/inet.h>
 #include <netdb.h>
 #else /* WIN32 */