[netperf-dev] netperf4 commit notice r167 - in
branches/glib_migration: . suites suites/disc
raj at netperf.org
raj at netperf.org
Tue Apr 18 17:11:53 PDT 2006
Author: raj
Date: 2006-04-18 17:11:52 -0700 (Tue, 18 Apr 2006)
New Revision: 167
Added:
branches/glib_migration/suites/disc/Makefile.am
Modified:
branches/glib_migration/configure
branches/glib_migration/suites/Makefile.am
branches/glib_migration/suites/Makefile.in
Log:
more of the restructuring
Modified: branches/glib_migration/configure
===================================================================
--- branches/glib_migration/configure 2006-04-19 00:09:40 UTC (rev 166)
+++ branches/glib_migration/configure 2006-04-19 00:11:52 UTC (rev 167)
@@ -463,7 +463,7 @@
#endif"
ac_config_libobj_dir=src/missing
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PKG_CONFIG ac_pt_PKG_CONFIG WANT_DNS_TRUE WANT_DNS_FALSE NETSYS_SOURCE LIBOJBS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PKG_CONFIG ac_pt_PKG_CONFIG WANT_DNS_TRUE WANT_DNS_FALSE WANT_DISK_TRUE WANT_DISK_FALSE NETSYS_SOURCE LIBOJBS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1041,6 +1041,7 @@
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-histogram include individual op timing, may affect result
--enable-dns build the DNS performance test suite
+ --enable-disk build the DISK performance test suite
--enable-demo emit interim results during the run. May affect results.
--enable-unixdomain include Unix Domain socket tests
--enable-dlpi include Unix Domain socket tests
@@ -3672,7 +3673,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3675 "configure"' > conftest.$ac_ext
+ echo '#line 3676 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5256,7 +5257,7 @@
# Provide some information about the compiler.
-echo "$as_me:5259:" \
+echo "$as_me:5260:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6317,11 +6318,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6320: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6321: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6324: \$? = $ac_status" >&5
+ echo "$as_me:6325: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6585,11 +6586,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6588: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6589: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6592: \$? = $ac_status" >&5
+ echo "$as_me:6593: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6689,11 +6690,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6692: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6693: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6696: \$? = $ac_status" >&5
+ echo "$as_me:6697: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9014,7 +9015,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9017 "configure"
+#line 9018 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9114,7 +9115,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9117 "configure"
+#line 9118 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11452,11 +11453,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11455: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11456: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11459: \$? = $ac_status" >&5
+ echo "$as_me:11460: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11556,11 +11557,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11559: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11560: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11563: \$? = $ac_status" >&5
+ echo "$as_me:11564: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13117,11 +13118,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13120: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13121: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13124: \$? = $ac_status" >&5
+ echo "$as_me:13125: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13221,11 +13222,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13224: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13225: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13228: \$? = $ac_status" >&5
+ echo "$as_me:13229: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15411,11 +15412,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15414: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15415: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15418: \$? = $ac_status" >&5
+ echo "$as_me:15419: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15679,11 +15680,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15682: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15683: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15686: \$? = $ac_status" >&5
+ echo "$as_me:15687: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15783,11 +15784,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15786: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15787: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15790: \$? = $ac_status" >&5
+ echo "$as_me:15791: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21657,7 +21658,55 @@
WANT_DNS_FALSE=
fi
+# see if we should be enabling dns support
+echo "$as_me:$LINENO: checking whether to include disk support" >&5
+echo $ECHO_N "checking whether to include disk support... $ECHO_C" >&6
+
+# Check whether --enable-disk or --disable-disk was given.
+if test "${enable_disk+set}" = set; then
+ enableval="$enable_disk"
+
+fi;
+
+case "$enable_disk" in
+ yes)
+ use_disk=true
+ ;;
+ no)
+ use_disk=false
+ ;;
+ '')
+ # whatever
+ use_disk=false
+ ;;
+ *)
+ { { echo "$as_me:$LINENO: error: --enable-disk takes yes or no" >&5
+echo "$as_me: error: --enable-disk takes yes or no" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+esac
+
+if $use_disk
+then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+
+if test "$use_disk" = true; then
+ WANT_DISK_TRUE=
+ WANT_DISK_FALSE='#'
+else
+ WANT_DISK_TRUE='#'
+ WANT_DISK_FALSE=
+fi
+
+
# see if we should be enabling demo support
echo "$as_me:$LINENO: checking whether to include demo support" >&5
@@ -23060,7 +23109,7 @@
# now spit it all out
- ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile doc/Makefile suites/Makefile suites/dns/Makefile netperf-config"
+ ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile doc/Makefile suites/Makefile suites/dns/Makefile suites/disk/Makefile netperf-config"
cat >confcache <<\_ACEOF
@@ -23189,6 +23238,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${WANT_DISK_TRUE}" && test -z "${WANT_DISK_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WANT_DISK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WANT_DISK\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -23639,6 +23695,7 @@
"doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"suites/Makefile" ) CONFIG_FILES="$CONFIG_FILES suites/Makefile" ;;
"suites/dns/Makefile" ) CONFIG_FILES="$CONFIG_FILES suites/dns/Makefile" ;;
+ "suites/disk/Makefile" ) CONFIG_FILES="$CONFIG_FILES suites/disk/Makefile" ;;
"netperf-config" ) CONFIG_FILES="$CONFIG_FILES netperf-config" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
@@ -23798,6 +23855,8 @@
s, at ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
s, at WANT_DNS_TRUE@,$WANT_DNS_TRUE,;t t
s, at WANT_DNS_FALSE@,$WANT_DNS_FALSE,;t t
+s, at WANT_DISK_TRUE@,$WANT_DISK_TRUE,;t t
+s, at WANT_DISK_FALSE@,$WANT_DISK_FALSE,;t t
s, at NETSYS_SOURCE@,$NETSYS_SOURCE,;t t
s, at LIBOJBS@,$LIBOJBS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
Modified: branches/glib_migration/suites/Makefile.am
===================================================================
--- branches/glib_migration/suites/Makefile.am 2006-04-19 00:09:40 UTC (rev 166)
+++ branches/glib_migration/suites/Makefile.am 2006-04-19 00:11:52 UTC (rev 167)
@@ -2,7 +2,7 @@
DNS_OPT = dns
endif
if WANT_DISK
- DISK_OPT = disk
+ DISK_OPT = disc
endif
SUBDIRS = $(DNS_OPT) $(DISK_OPT)
Modified: branches/glib_migration/suites/Makefile.in
===================================================================
--- branches/glib_migration/suites/Makefile.in 2006-04-19 00:09:40 UTC (rev 166)
+++ branches/glib_migration/suites/Makefile.in 2006-04-19 00:11:52 UTC (rev 167)
@@ -142,7 +142,7 @@
target_os = @target_os@
target_vendor = @target_vendor@
@WANT_DNS_TRUE at DNS_OPT = dns
- at WANT_DISK_TRUE@DISK_OPT = disk
+ at WANT_DISK_TRUE@DISK_OPT = disc
SUBDIRS = $(DNS_OPT) $(DISK_OPT)
subdir = suites
@@ -158,7 +158,7 @@
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = dns disk
+DIST_SUBDIRS = dns disc
all: all-recursive
.SUFFIXES:
Added: branches/glib_migration/suites/disc/Makefile.am
===================================================================
--- branches/glib_migration/suites/disc/Makefile.am 2006-04-19 00:09:40 UTC (rev 166)
+++ branches/glib_migration/suites/disc/Makefile.am 2006-04-19 00:11:52 UTC (rev 167)
@@ -0,0 +1,7 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include
+
+# in theory, the stuff below should deal with creating the requisite libs
+lib_LTLIBRARIES = nettest_disk.la
+
+nettest_dns_la_SOURCES = disktest.c disktest.h
+nettest_dns_la_LDFLAGS = -module
More information about the netperf-dev
mailing list