[netperf-dev] netperf4 commit notice r117 - in
branches/glib_migration: . doc src
raj at netperf.org
raj at netperf.org
Thu Mar 30 15:37:52 PST 2006
Author: raj
Date: 2006-03-30 15:37:50 -0800 (Thu, 30 Mar 2006)
New Revision: 117
Modified:
branches/glib_migration/Makefile.in
branches/glib_migration/README
branches/glib_migration/README.hpux
branches/glib_migration/config.h.in
branches/glib_migration/configure
branches/glib_migration/configure.ac
branches/glib_migration/doc/Makefile.in
branches/glib_migration/src/Makefile.in
branches/glib_migration/src/netlib.c
branches/glib_migration/src/netlib.h
Log:
Further configure file cleanup, and some updates to a few README files.
Modified: branches/glib_migration/Makefile.in
===================================================================
--- branches/glib_migration/Makefile.in 2006-03-30 22:12:07 UTC (rev 116)
+++ branches/glib_migration/Makefile.in 2006-03-30 23:37:50 UTC (rev 117)
@@ -114,7 +114,6 @@
build_vendor = @build_vendor@
datadir = @datadir@
exec_prefix = @exec_prefix@
-have_libxml2 = @have_libxml2@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: branches/glib_migration/README
===================================================================
--- branches/glib_migration/README 2006-03-30 22:12:07 UTC (rev 116)
+++ branches/glib_migration/README 2006-03-30 23:37:50 UTC (rev 117)
@@ -15,14 +15,26 @@
Pointers:
-The netperf4 benchmark depends on libxml2. You must have libxml2 and
-its development environment and utilities (eg xmlcatalog) installed
-prior to building netperf4.
+The netperf4 benchmark depends on libxml2 (aka libxml-2.0). You must
+have libxml2 and its development environment and utilities (eg
+xmlcatalog) installed prior to building netperf4.
+The netperf4 benchmark also depends on several components of glib-2.0.
+You must have glib-2.0 and its development environment installed prior
+to building netperf4.
+Further, netperf4 depends on the pkg-config utility. You must have
+pkg-config installed prior to building netperf4.
+
+In the future, netperf4 may add gtk+2.0 as a dependency.
+
+If your platform does not have one or more of these dependencies best
+start getting them ported somehow. If that is not possible, consider
+using netperf2 rather than netperf4.
+
There is a COPYRIGHT file included. It is called COPYING because that
-is what autosomethingorother wanted. Netperf4 is covered by version
-2 of the GNU Public License with an exception granted to link netperf4
+is what autosomethingorother wanted. Netperf4 is covered by version 2
+of the GNU Public License with an exception granted to link netperf4
with OpenSSL. If there are other useful libraries with issues similar
to OpenSSL (whatever they may be, the HP Legal Eagles said I needed an
exception for OpenSSL...) it is likely an exception will be added for
@@ -34,7 +46,7 @@
which people can submit results.
There is an Internet mailing list devoted to netperf. Both netperf4
-and netperf2 (ie the original netperf) are discussed there. It is
+and netperf2 (ie the original netperf) are discussed there. It is
called netperf-talk and it is hosted on netperf.org. Subscription
requests are handled via
@@ -47,9 +59,9 @@
If you run into severe difficulties, or are just feeling chatty,
please feel free to drop some email to me - Rick Jones
-<rick.jones2 at hp.com>. Be sure to include a meaningful subject lines
-and as much context (including cutting and pasting actual error
-messages) as you can.
+<rick.jones2 at hp.com>. Be sure to include a meaningful subject lines
+(including netperf in the subject is helpful) and as much context
+(including cutting and pasting *actual* error messages) as you can.
happy benchmarking,
rick jones
Modified: branches/glib_migration/README.hpux
===================================================================
--- branches/glib_migration/README.hpux 2006-03-30 22:12:07 UTC (rev 116)
+++ branches/glib_migration/README.hpux 2006-03-30 23:37:50 UTC (rev 117)
@@ -1,12 +1,45 @@
-The configure script will try to use a command called xml2-config to
-get the appropriate compiler and linker switches to include libxml2.
-Often this is in /usr/local/bin and /usr/local/bin is not always in
-one's PATH variable. So, it may be necessary to include
+This version of netperf4 depends on libxml-2.0, glib-2.0 and
+pkg-config, and their dependencies. Feel free to grab them from their
+respective homes and compile them on your system, or if you do not
+feel like spending the better part of a day compiling stuff, you can
+grab depots from http://hpux.connect.org.uk/ Be sure to grab all the
+dependencies.
+
+If you do not feel like spending an hour or so downloading individual
+depots from http://hpux.connect.org.uk/ and installing them piecemiel,
+as a convenience, a gzipped tar file of a directory depot with all the
+netperf4 dependencies, and their dependencies can be retrieved via:
+
+ftp://ftp.netperf.org/netperf/netperf4_hpux_dependencies.tar.gz
+
+or
+
+ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/netperf4_hpux_dependencies.tar.gz
+
+You should unzip the tar file and extract it - a directory called
+netperf4_hpoux_dependencies will be created. From swinstall, select
+the full path to that directory as the source and install everything.
+
+The versions in those tar files are "known to work" but you should
+feel free to try newer versions if you so choose. However, the
+maintainers of netperf4 reserve the right to ask you to try
+back-reving those packages if you run into problems :)
+
+You will notice that a "libgcc" is one of the dependencies. This
+stems from the folks at http://hpux.connect.org.uk/ deciding to
+compile the packages with gcc rather than HP ANSI C. However, thanks
+to some workarounds in the neperf4 configure script, you can still use
+HP ANSI C to compile netperf4. In fact, that is what is done inside
+HP. Afterall, "portable" code is code that can be compiled by more
+than one compiler...
+
+If you consider it "odd" that software being ported to HP-UX would be
+compiled with gcc rather than the HP compilers, feel free to voice
+that to the librarian at http://hpux.connect.org.uk/
+
+The configure script will try to use a command called pkg-config to
+get the appropriate compiler and linker switches to include libxml2
+and glib. Often this is in /usr/local/bin and /usr/local/bin is not
+always in one's PATH variable. So, it may be necessary to include
/usr/local/lib in the PATH variable before running the configure
-script.
-
-If you want to grab the precompiled libxml2 bits from
-http://hpux.connect.org.uk/ you should grab the 2.6.18 version of
-libxml2. The 2.6.20 and 2.6.22 versions have had troubles with
-unresolved symbols on the systems on which we've tested. (don't forget
-to retrieve the dependencies :)
+script.
\ No newline at end of file
Modified: branches/glib_migration/config.h.in
===================================================================
--- branches/glib_migration/config.h.in 2006-03-30 22:12:07 UTC (rev 116)
+++ branches/glib_migration/config.h.in 2006-03-30 23:37:50 UTC (rev 117)
@@ -15,9 +15,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define to 1 if you have the `dlopen' function. */
-#undef HAVE_DLOPEN
-
/* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H
@@ -27,33 +24,18 @@
/* Define to 1 if you have the <float.h> header file. */
#undef HAVE_FLOAT_H
-/* Define to 1 if you have the `fork' function. */
-#undef HAVE_FORK
-
/* Define to 1 if you have the `getaddrinfo' function. */
#undef HAVE_GETADDRINFO
-/* Define to 1 if you have the `gethostbyname' function. */
-#undef HAVE_GETHOSTBYNAME
-
/* Define to 1 if you have the `gethrtime' function. */
#undef HAVE_GETHRTIME
/* Define to 1 if you have the `getnameinfo' function. */
#undef HAVE_GETNAMEINFO
-/* Define to 1 if you have the `getopt_long' function. */
-#undef HAVE_GETOPT_LONG
-
-/* Define to 1 if you have the `getpagesize' function. */
-#undef HAVE_GETPAGESIZE
-
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
-/* Define to 1 if you have the `get_expiration_time' function. */
-#undef HAVE_GET_EXPIRATION_TIME
-
/* Define to one to include ICSC-EXS tests. */
#undef HAVE_ICSC_EXS
@@ -66,9 +48,6 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-/* Define to 1 if you have the `dl' library (-ldl). */
-#undef HAVE_LIBDL
-
/* Define to 1 if you have the `exs' library (-lexs). */
#undef HAVE_LIBEXS
@@ -114,9 +93,6 @@
/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
-/* Define to 1 if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
/* Define to 1 if you have the `mpctl' function. */
#undef HAVE_MPCTL
@@ -231,9 +207,6 @@
/* Define to 1 if you have the <sys/uio.h> header file. */
#undef HAVE_SYS_UIO_H
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
/* Define to 1 if you have the `uname' function. */
#undef HAVE_UNAME
@@ -243,18 +216,6 @@
/* Define to 1 if you have the <values.h> header file. */
#undef HAVE_VALUES_H
-/* Define to 1 if you have the `vfork' function. */
-#undef HAVE_VFORK
-
-/* Define to 1 if you have the <vfork.h> header file. */
-#undef HAVE_VFORK_H
-
-/* Define to 1 if `fork' works. */
-#undef HAVE_WORKING_FORK
-
-/* Define to 1 if `vfork' works. */
-#undef HAVE_WORKING_VFORK
-
/* Define to 1 if the system has the type `_Bool'. */
#undef HAVE__BOOL
@@ -279,9 +240,6 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
/* Define to the type of arg 1 for `select'. */
#undef SELECT_TYPE_ARG1
@@ -291,9 +249,6 @@
/* Define to the type of arg 5 for `select'. */
#undef SELECT_TYPE_ARG5
-/* Define to 1 if the `setpgrp' function takes no argument. */
-#undef SETPGRP_VOID
-
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
@@ -354,11 +309,5 @@
/* Define to `long' if <sys/types.h> does not define. */
#undef off_t
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
-
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
-
-/* Define as `fork' if `vfork' does not work. */
-#undef vfork
Modified: branches/glib_migration/configure
===================================================================
--- branches/glib_migration/configure 2006-03-30 22:12:07 UTC (rev 116)
+++ branches/glib_migration/configure 2006-03-30 23:37:50 UTC (rev 117)
@@ -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 have_libxml2 PKG_CONFIG ac_pt_PKG_CONFIG 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 NETSYS_SOURCE LIBOJBS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1058,8 +1058,7 @@
both]
--with-tags[=TAGS]
include additional configurations [automatic]
- --with-glib attempt to use glib's thread abstractionsrather than
- direct pthreads
+ --with-glib in the future will show where/how to include glib
Some influential environment variables:
CC C compiler command
@@ -3658,7 +3657,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3661 "configure"' > conftest.$ac_ext
+ echo '#line 3660 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5222,7 +5221,7 @@
# Provide some information about the compiler.
-echo "$as_me:5225:" \
+echo "$as_me:5224:" \
"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
@@ -6318,11 +6317,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:6321: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6320: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6325: \$? = $ac_status" >&5
+ echo "$as_me:6324: \$? = $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.
@@ -6580,11 +6579,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:6583: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6582: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6587: \$? = $ac_status" >&5
+ echo "$as_me:6586: \$? = $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.
@@ -6642,11 +6641,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:6645: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6644: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6649: \$? = $ac_status" >&5
+ echo "$as_me:6648: \$? = $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
@@ -8894,7 +8893,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8897 "configure"
+#line 8896 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8992,7 +8991,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8995 "configure"
+#line 8994 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11245,11 +11244,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:11248: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11247: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11252: \$? = $ac_status" >&5
+ echo "$as_me:11251: \$? = $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.
@@ -11307,11 +11306,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:11310: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11309: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11314: \$? = $ac_status" >&5
+ echo "$as_me:11313: \$? = $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
@@ -12692,7 +12691,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12695 "configure"
+#line 12694 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12790,7 +12789,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12793 "configure"
+#line 12792 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13675,11 +13674,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:13678: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13677: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13682: \$? = $ac_status" >&5
+ echo "$as_me:13681: \$? = $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.
@@ -13737,11 +13736,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:13740: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13739: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13744: \$? = $ac_status" >&5
+ echo "$as_me:13743: \$? = $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
@@ -15878,11 +15877,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:15881: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15880: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15885: \$? = $ac_status" >&5
+ echo "$as_me:15884: \$? = $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.
@@ -16140,11 +16139,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:16143: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16142: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16147: \$? = $ac_status" >&5
+ echo "$as_me:16146: \$? = $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.
@@ -16202,11 +16201,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:16205: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16204: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16209: \$? = $ac_status" >&5
+ echo "$as_me:16208: \$? = $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
@@ -18454,7 +18453,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18457 "configure"
+#line 18456 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18552,7 +18551,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18555 "configure"
+#line 18554 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -20624,76 +20623,9 @@
fi
ac_cv_lib_m=ac_cv_lib_m_main
+# AC_HAVE_LIBRARY(dl)
-echo "$as_me:$LINENO: checking for main in -ldl" >&5
-echo $ECHO_N "checking for main in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-
-int
-main ()
-{
-main ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_dl_main=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_main" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_main" >&6
-if test $ac_cv_lib_dl_main = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
-
- LIBS="-ldl $LIBS"
-
-fi
-ac_cv_lib_dl=ac_cv_lib_dl_main
-
-
-# Checks for header files. the check for pthread.h has been move to
+# Checks for header files.
# where we decide if we are using glib or not
echo "$as_me:$LINENO: checking for ANSI C header files" >&5
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
@@ -20860,75 +20792,11 @@
fi
-echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
-if test "${ac_cv_header_sys_wait_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/wait.h>
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-#endif
+# AC_HEADER_SYS_WAIT
-int
-main ()
-{
- int s;
- wait (&s);
- s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_header_sys_wait_h=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_sys_wait_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
-if test $ac_cv_header_sys_wait_h = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_WAIT_H 1
-_ACEOF
-fi
@@ -20962,13 +20830,7 @@
-
-
-
-
-
-
-for ac_header in arpa/inet.h arpa/nameser.h arpa/nameser_compat.h dlfcn.h errno.h fcntl.h float.h inttypes.h limits.h malloc.h math.h memory.h netdb.h netinet/in.h netinet/tcp.h poll.h pwd.h pthread.h resolv.h sched.h signal.h stdint.h stdio.h stdlib.h string.h strings.h sys/dk.h sys/ioctl.h sys/param.h sys/pstat.h sys/resource.h sys/socket.h sys/stat.h sys/time.h sys/types.h sys/uio.h unistd.h values.h
+for ac_header in arpa/inet.h arpa/nameser.h arpa/nameser_compat.h errno.h fcntl.h float.h inttypes.h limits.h malloc.h math.h memory.h netdb.h netinet/in.h netinet/tcp.h poll.h pwd.h pthread.h resolv.h sched.h signal.h stdint.h stdio.h stdlib.h string.h strings.h sys/dk.h sys/ioctl.h sys/param.h sys/pstat.h sys/resource.h sys/socket.h sys/stat.h sys/time.h sys/types.h sys/uio.h unistd.h values.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -22007,983 +21869,11 @@
# Checks for library functions.
# AC_FUNC_ERROR_AT_LINE
-echo "$as_me:$LINENO: checking for pid_t" >&5
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
-if test "${ac_cv_type_pid_t+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if ((pid_t *) 0)
- return 0;
-if (sizeof (pid_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_type_pid_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_pid_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6
-if test $ac_cv_type_pid_t = yes; then
- :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
-
-fi
-
-
-
-for ac_header in unistd.h vfork.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ---------------------------------- ##
-## Report this to the netperf lists. ##
-## ---------------------------------- ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_func in fork vfork
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-if test "x$ac_cv_func_fork" = xyes; then
- echo "$as_me:$LINENO: checking for working fork" >&5
-echo $ECHO_N "checking for working fork... $ECHO_C" >&6
-if test "${ac_cv_func_fork_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_func_fork_works=cross
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* By Ruediger Kuhlmann. */
- #include <sys/types.h>
- #if HAVE_UNISTD_H
- # include <unistd.h>
- #endif
- /* Some systems only have a dummy stub for fork() */
- int main ()
- {
- if (fork() < 0)
- exit (1);
- exit (0);
- }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_fork_works=yes
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_fork_works=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5
-echo "${ECHO_T}$ac_cv_func_fork_works" >&6
-
-else
- ac_cv_func_fork_works=$ac_cv_func_fork
-fi
-if test "x$ac_cv_func_fork_works" = xcross; then
- case $host in
- *-*-amigaos* | *-*-msdosdjgpp*)
- # Override, as these systems have only a dummy fork() stub
- ac_cv_func_fork_works=no
- ;;
- *)
- ac_cv_func_fork_works=yes
- ;;
- esac
- { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
-echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
-fi
-ac_cv_func_vfork_works=$ac_cv_func_vfork
-if test "x$ac_cv_func_vfork" = xyes; then
- echo "$as_me:$LINENO: checking for working vfork" >&5
-echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
-if test "${ac_cv_func_vfork_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_func_vfork_works=cross
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Thanks to Paul Eggert for this test. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#if HAVE_VFORK_H
-# include <vfork.h>
-#endif
-/* On some sparc systems, changes by the child to local and incoming
- argument registers are propagated back to the parent. The compiler
- is told about this with #include <vfork.h>, but some compilers
- (e.g. gcc -O) don't grok <vfork.h>. Test for this by using a
- static variable whose address is put into a register that is
- clobbered by the vfork. */
-static void
-#ifdef __cplusplus
-sparc_address_test (int arg)
-# else
-sparc_address_test (arg) int arg;
-#endif
-{
- static pid_t child;
- if (!child) {
- child = vfork ();
- if (child < 0) {
- perror ("vfork");
- _exit(2);
- }
- if (!child) {
- arg = getpid();
- write(-1, "", 0);
- _exit (arg);
- }
- }
-}
-
-int
-main ()
-{
- pid_t parent = getpid ();
- pid_t child;
-
- sparc_address_test (0);
-
- child = vfork ();
-
- if (child == 0) {
- /* Here is another test for sparc vfork register problems. This
- test uses lots of local variables, at least as many local
- variables as main has allocated so far including compiler
- temporaries. 4 locals are enough for gcc 1.40.3 on a Solaris
- 4.1.3 sparc, but we use 8 to be safe. A buggy compiler should
- reuse the register of parent for one of the local variables,
- since it will think that parent can't possibly be used any more
- in this routine. Assigning to the local variable will thus
- munge parent in the parent process. */
- pid_t
- p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
- p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
- /* Convince the compiler that p..p7 are live; otherwise, it might
- use the same hardware register for all 8 local variables. */
- if (p != p1 || p != p2 || p != p3 || p != p4
- || p != p5 || p != p6 || p != p7)
- _exit(1);
-
- /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
- from child file descriptors. If the child closes a descriptor
- before it execs or exits, this munges the parent's descriptor
- as well. Test for this by closing stdout in the child. */
- _exit(close(fileno(stdout)) != 0);
- } else {
- int status;
- struct stat st;
-
- while (wait(&status) != child)
- ;
- exit(
- /* Was there some problem with vforking? */
- child < 0
-
- /* Did the child fail? (This shouldn't happen.) */
- || status
-
- /* Did the vfork/compiler bug occur? */
- || parent != getpid()
-
- /* Did the file descriptor bug occur? */
- || fstat(fileno(stdout), &st) != 0
- );
- }
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_vfork_works=yes
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_vfork_works=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5
-echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
-
-fi;
-if test "x$ac_cv_func_fork_works" = xcross; then
- ac_cv_func_vfork_works=$ac_cv_func_vfork
- { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
-echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
-fi
-
-if test "x$ac_cv_func_vfork_works" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WORKING_VFORK 1
-_ACEOF
-
-else
-
-cat >>confdefs.h <<\_ACEOF
-#define vfork fork
-_ACEOF
-
-fi
-if test "x$ac_cv_func_fork_works" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WORKING_FORK 1
-_ACEOF
-
-fi
-
+# AC_FUNC_FORK
# AC_FUNC_MALLOC
+# AC_FUNC_MMAP
-for ac_header in stdlib.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ---------------------------------- ##
-## Report this to the netperf lists. ##
-## ---------------------------------- ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_func in getpagesize
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-echo "$as_me:$LINENO: checking for working mmap" >&5
-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_func_mmap_fixed_mapped=no
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-/* malloc might have been renamed as rpl_malloc. */
-#undef malloc
-
-/* Thanks to Mike Haertel and Jim Avera for this test.
- Here is a matrix of mmap possibilities:
- mmap private not fixed
- mmap private fixed at somewhere currently unmapped
- mmap private fixed at somewhere already mapped
- mmap shared not fixed
- mmap shared fixed at somewhere currently unmapped
- mmap shared fixed at somewhere already mapped
- For private mappings, we should verify that changes cannot be read()
- back from the file, nor mmap's back from the file at a different
- address. (There have been systems where private was not correctly
- implemented like the infamous i386 svr4.0, and systems where the
- VM page cache was not coherent with the file system buffer cache
- like early versions of FreeBSD and possibly contemporary NetBSD.)
- For shared mappings, we should conversely verify that changes get
- propagated back to all the places they're supposed to be.
-
- Grep wants private fixed already mapped.
- The main things grep needs to know about mmap are:
- * does it exist and is it safe to write into the mmap'd area
- * how to use it (BSD variants) */
-
-#include <fcntl.h>
-#include <sys/mman.h>
-
-#if !STDC_HEADERS && !HAVE_STDLIB_H
-char *malloc ();
-#endif
-
-/* This mess was copied from the GNU getpagesize.h. */
-#if !HAVE_GETPAGESIZE
-/* Assume that all systems that can run configure have sys/param.h. */
-# if !HAVE_SYS_PARAM_H
-# define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-# define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-# if HAVE_SYS_PARAM_H
-# include <sys/param.h>
-# ifdef EXEC_PAGESIZE
-# define getpagesize() EXEC_PAGESIZE
-# else /* no EXEC_PAGESIZE */
-# ifdef NBPG
-# define getpagesize() NBPG * CLSIZE
-# ifndef CLSIZE
-# define CLSIZE 1
-# endif /* no CLSIZE */
-# else /* no NBPG */
-# ifdef NBPC
-# define getpagesize() NBPC
-# else /* no NBPC */
-# ifdef PAGESIZE
-# define getpagesize() PAGESIZE
-# endif /* PAGESIZE */
-# endif /* no NBPC */
-# endif /* no NBPG */
-# endif /* no EXEC_PAGESIZE */
-# else /* no HAVE_SYS_PARAM_H */
-# define getpagesize() 8192 /* punt totally */
-# endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
-
-int
-main ()
-{
- char *data, *data2, *data3;
- int i, pagesize;
- int fd;
-
- pagesize = getpagesize ();
-
- /* First, make a file with some known garbage in it. */
- data = (char *) malloc (pagesize);
- if (!data)
- exit (1);
- for (i = 0; i < pagesize; ++i)
- *(data + i) = rand ();
- umask (0);
- fd = creat ("conftest.mmap", 0600);
- if (fd < 0)
- exit (1);
- if (write (fd, data, pagesize) != pagesize)
- exit (1);
- close (fd);
-
- /* Next, try to mmap the file at a fixed address which already has
- something else allocated at it. If we can, also make sure that
- we see the same garbage. */
- fd = open ("conftest.mmap", O_RDWR);
- if (fd < 0)
- exit (1);
- data2 = (char *) malloc (2 * pagesize);
- if (!data2)
- exit (1);
- data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_FIXED, fd, 0L))
- exit (1);
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data2 + i))
- exit (1);
-
- /* Finally, make sure that changes to the mapped area do not
- percolate back to the file as seen by read(). (This is a bug on
- some variants of i386 svr4.0.) */
- for (i = 0; i < pagesize; ++i)
- *(data2 + i) = *(data2 + i) + 1;
- data3 = (char *) malloc (pagesize);
- if (!data3)
- exit (1);
- if (read (fd, data3, pagesize) != pagesize)
- exit (1);
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data3 + i))
- exit (1);
- close (fd);
- exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_mmap_fixed_mapped=yes
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_mmap_fixed_mapped=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MMAP 1
-_ACEOF
-
-fi
-rm -f conftest.mmap
-
-
-
for ac_header in sys/select.h sys/socket.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -23222,138 +22112,8 @@
rm -f conftest*
-echo "$as_me:$LINENO: checking whether setpgrp takes no argument" >&5
-echo $ECHO_N "checking whether setpgrp takes no argument... $ECHO_C" >&6
-if test "${ac_cv_func_setpgrp_void+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot check setpgrp when cross compiling" >&5
-echo "$as_me: error: cannot check setpgrp when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-int
-main ()
-{
-/* If this system has a BSD-style setpgrp which takes arguments,
- setpgrp(1, 1) will fail with ESRCH and return -1, in that case
- exit successfully. */
- exit (setpgrp (1,1) == -1 ? 0 : 1);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_setpgrp_void=no
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_setpgrp_void=yes
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_setpgrp_void" >&5
-echo "${ECHO_T}$ac_cv_func_setpgrp_void" >&6
-if test $ac_cv_func_setpgrp_void = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define SETPGRP_VOID 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-if test "${ac_cv_type_signal+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <signal.h>
-#ifdef signal
-# undef signal
-#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
-#endif
-
-int
-main ()
-{
-int i;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_type_signal=void
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_signal=int
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
+# AC_FUNC_SETPGRP
+# AC_TYPE_SIGNAL
# AC_FUNC_STAT
# remove pstat_getdynamic (at least for now) since we don't do
# anything conditional with the check anyway...
@@ -23369,9 +22129,8 @@
-
-
-for ac_func in dlopen gethostbyname gethrtime gettimeofday inet_ntoa memset memcpy socket sqrt strcasecmp strchr strstr strtoul uname
+for ac_func in gethrtime gettimeofday inet_ntoa memset memcpy socket \
+ sqrt strcasecmp strchr strstr strtoul uname
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -23478,8 +22237,7 @@
-
-for ac_func in getnameinfo getaddrinfo inet_ntop getopt_long
+for ac_func in getnameinfo getaddrinfo inet_ntop
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -23606,142 +22364,8 @@
esac
fi
-if test "$ac_cv_func_getopt_long" != yes ; then
- { echo "$as_me:$LINENO: Requesting replacement getopt/getopt_long" >&5
-echo "$as_me: Requesting replacement getopt/getopt_long" >&6;}
- case $LIBOBJS in
- "missing/getopt.$ac_objext" | \
- *" missing/getopt.$ac_objext" | \
- "missing/getopt.$ac_objext "* | \
- *" missing/getopt.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS missing/getopt.$ac_objext" ;;
-esac
- case $LIBOBJS in
- "missing/getopt1.$ac_objext" | \
- *" missing/getopt1.$ac_objext" | \
- "missing/getopt1.$ac_objext "* | \
- *" missing/getopt1.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS missing/getopt1.$ac_objext" ;;
-esac
-fi
-
-
-for ac_func in get_expiration_time
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-if test "$ac_cv_func_get_expiration_time" != yes ; then
- { echo "$as_me:$LINENO: Requesting replacement get_expiration_time" >&5
-echo "$as_me: Requesting replacement get_expiration_time" >&6;}
- case $LIBOBJS in
- "missing/get_expiration_time.$ac_objext" | \
- *" missing/get_expiration_time.$ac_objext" | \
- "missing/get_expiration_time.$ac_objext "* | \
- *" missing/get_expiration_time.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS missing/get_expiration_time.$ac_objext" ;;
-esac
-
-fi
-
-
for ac_func in sendfile
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -23948,60 +22572,26 @@
done
-# Extract the first word of "xml2-config", so it can be a program name with args.
-set dummy xml2-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_have_libxml2+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$have_libxml2"; then
- ac_cv_prog_have_libxml2="$have_libxml2" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_have_libxml2=""yes""
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
+# since we are going to depend on pkg-config for glib, might as well
+# use it for libxml2 as well
- test -z "$ac_cv_prog_have_libxml2" && ac_cv_prog_have_libxml2=""no" "
-fi
-fi
-have_libxml2=$ac_cv_prog_have_libxml2
-if test -n "$have_libxml2"; then
- echo "$as_me:$LINENO: result: $have_libxml2" >&5
-echo "${ECHO_T}$have_libxml2" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
+#AC_CHECK_PROG(have_libxml2, xml2-config, "yes", "no" )
+#if test "x$have_libxml2"="xyes"; then
+# libxml2_cflags=`xml2-config --cflags`
+# libxml2_libs=`xml2-config --libs`
+#else
+# AC_MSG_ERROR(Cannot find xml2-config.)
+#fi
-if test "x$have_libxml2"="xyes"; then
- libxml2_cflags=`xml2-config --cflags`
- libxml2_libs=`xml2-config --libs`
-else
- { { echo "$as_me:$LINENO: error: Cannot find xml2-config." >&5
-echo "$as_me: error: Cannot find xml2-config." >&2;}
- { (exit 1); exit 1; }; }
-fi
-
# Check whether --with-glib or --without-glib was given.
if test "${with_glib+set}" = set; then
withval="$with_glib"
fi;
-glib_cflags=""
-glib_libs=""
+pkg_config_cflags=""
+pkg_config_libs=""
@@ -24109,8 +22699,10 @@
fi
- glib_cflags=`$PKG_CONFIG --cflags-only-I glib-2.0 gmodule-2.0 gthread-2.0`
- glib_libs=`$PKG_CONFIG --libs-only-l --libs-only-L glib-2.0 gmodule-2.0 gthread-2.0`
+ pkg_config_cflags=`$PKG_CONFIG --cflags-only-I \
+ libxml-2.0 glib-2.0 gmodule-2.0 gthread-2.0`
+ pkg_config_libs=`$PKG_CONFIG --libs-only-l --libs-only-L \
+ libxml-2.0 glib-2.0 gmodule-2.0 gthread-2.0`
# see if we should be enabling histogram support
@@ -25236,38 +23828,38 @@
# i386-pc-solaris2.10
# guess it automagically in a nice big case statement
case $target in
- *-*-linux*)
- use_cpuutil=true
+ *-*-linux*)
+ use_cpuutil=true
cat >>confdefs.h <<\_ACEOF
#define USE_PROC_STAT
_ACEOF
- enable_cpuutil="procstat - auto"
- NETSYS_SOURCE="linux"
- ;;
- *-*-hpux11.23 | *-*-hpux11.31)
- use_cpuutil=true
+ enable_cpuutil="procstat - auto"
+ NETSYS_SOURCE="linux"
+ ;;
+ *-*-hpux11.23 | *-*-hpux11.31)
+ use_cpuutil=true
cat >>confdefs.h <<\_ACEOF
#define USE_PSTAT
_ACEOF
- enable_cpuutil="pstatnew - auto"
- NETSYS_SOURCE="hpux"
- ;;
- *-*-hpux11* | *-*-hpux10*)
- use_cpuutil=true
+ enable_cpuutil="pstatnew - auto"
+ NETSYS_SOURCE="hpux"
+ ;;
+ *-*-hpux11* | *-*-hpux10*)
+ use_cpuutil=true
cat >>confdefs.h <<\_ACEOF
#define USE_PSTAT
_ACEOF
- enable_cpuutil="pstat - auto"
- NETSYS_SOURCE="pstat"
- ;;
- *-*-aix5.*)
- use_puutil=true
+ enable_cpuutil="pstat - auto"
+ NETSYS_SOURCE="pstat"
+ ;;
+ *-*-aix5.*)
+ use_cpuutil=true
cat >>confdefs.h <<\_ACEOF
#define USE_PERFSTAT
@@ -25341,11 +23933,11 @@
fi
ac_cv_lib_perfstat=ac_cv_lib_perfstat_main
- enable_cpuutil="perfstat - auto"
- NETSYS_SOURCE="perfstat"
- ;;
- *-*-solaris2.10)
- use_cpuutil=true
+ enable_cpuutil="perfstat - auto"
+ NETSYS_SOURCE="perfstat"
+ ;;
+ *-*-solaris2.10 | *-*-solaris2.11)
+ use_cpuutil=true
cat >>confdefs.h <<\_ACEOF
#define USE_KSTAT
@@ -25419,11 +24011,11 @@
fi
ac_cv_lib_kstat=ac_cv_lib_kstat_main
- enable_cpuutil="kstat10 - auto"
- NETSYS_SOURCE="kstat10"
- ;;
- *-*-solaris2.*)
- use_cpuutil=true
+ enable_cpuutil="kstat10 - auto"
+ NETSYS_SOURCE="kstat10"
+ ;;
+ *-*-solaris2.*)
+ use_cpuutil=true
cat >>confdefs.h <<\_ACEOF
#define USE_KSTAT
@@ -25497,24 +24089,24 @@
fi
ac_cv_lib_kstat=ac_cv_lib_kstat_main
- enable_cpuutil="kstat - auto"
- NETSYS_SOURCE="kstat"
- ;;
- *-*-freebsd4.*)
- use_cpuutil=true
+ enable_cpuutil="kstat - auto"
+ NETSYS_SOURCE="kstat"
+ ;;
+ *-*-freebsd4.* | *-*-freebsd5.* | *-*-freebsd6.*)
+ use_cpuutil=true
cat >>confdefs.h <<\_ACEOF
#define USE_SYSCTL
_ACEOF
- enable_cpuutil="sysctl - auto"
- NETSYS_SOURCE="sysctl"
- ;;
- *)
- use_cpuutil=false
- NETSYS_SOURCE="none"
- enable_cpuutil="none. Consider teaching configure about your platform."
- ;;
+ enable_cpuutil="sysctl - auto"
+ NETSYS_SOURCE="sysctl"
+ ;;
+ *)
+ use_cpuutil=false
+ NETSYS_SOURCE="none"
+ enable_cpuutil="none. Consider teaching configure about your platform."
+ ;;
esac
;;
none)
@@ -25545,12 +24137,12 @@
case $GCC in
yes)
- CFLAGS="$CFLAGS -pthread $libxml2_cflags $glib_cflags"
- LIBS="$LIBS -pthread $libxml2_libs $glib_libs"
+ CFLAGS="$CFLAGS -pthread $libxml2_cflags $pkg_config_cflags"
+ LIBS="$LIBS -pthread $libxml2_libs $pkg_config_libs"
;;
*)
- CFLAGS="$CLFAGS $libxml2_cflags $glib_cflags "
- LIBS="$LIBS $libxml2_libs $glib_libs "
+ CFLAGS="$CLFAGS $libxml2_cflags $pkg_config_cflags "
+ LIBS="$LIBS $libxml2_libs $pkg_config_libs "
;;
esac
@@ -26285,7 +24877,6 @@
s, at ac_ct_F77@,$ac_ct_F77,;t t
s, at LIBTOOL@,$LIBTOOL,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
-s, at have_libxml2@,$have_libxml2,;t t
s, at PKG_CONFIG@,$PKG_CONFIG,;t t
s, at ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
s, at NETSYS_SOURCE@,$NETSYS_SOURCE,;t t
Modified: branches/glib_migration/configure.ac
===================================================================
--- branches/glib_migration/configure.ac 2006-03-30 22:12:07 UTC (rev 116)
+++ branches/glib_migration/configure.ac 2006-03-30 23:37:50 UTC (rev 117)
@@ -43,13 +43,13 @@
# Checks for libraries. the check for pthread has been moved to where
# we decide if we are using glib or not.
AC_HAVE_LIBRARY(m)
-AC_HAVE_LIBRARY(dl)
+# AC_HAVE_LIBRARY(dl)
-# Checks for header files. the check for pthread.h has been move to
+# Checks for header files.
# where we decide if we are using glib or not
AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([arpa/inet.h arpa/nameser.h arpa/nameser_compat.h dlfcn.h errno.h fcntl.h float.h inttypes.h limits.h malloc.h math.h memory.h netdb.h netinet/in.h netinet/tcp.h poll.h pwd.h pthread.h resolv.h sched.h signal.h stdint.h stdio.h stdlib.h string.h strings.h sys/dk.h sys/ioctl.h sys/param.h sys/pstat.h sys/resource.h sys/socket.h sys/stat.h sys/time.h sys/types.h sys/uio.h unistd.h values.h ])
+# AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS([arpa/inet.h arpa/nameser.h arpa/nameser_compat.h errno.h fcntl.h float.h inttypes.h limits.h malloc.h math.h memory.h netdb.h netinet/in.h netinet/tcp.h poll.h pwd.h pthread.h resolv.h sched.h signal.h stdint.h stdio.h stdlib.h string.h strings.h sys/dk.h sys/ioctl.h sys/param.h sys/pstat.h sys/resource.h sys/socket.h sys/stat.h sys/time.h sys/types.h sys/uio.h unistd.h values.h ])
# Some platforms require these. There may be a better way.
AC_HAVE_LIBRARY(socket)
@@ -76,21 +76,22 @@
# Checks for library functions.
# AC_FUNC_ERROR_AT_LINE
-AC_FUNC_FORK
+# AC_FUNC_FORK
# AC_FUNC_MALLOC
-AC_FUNC_MMAP
+# AC_FUNC_MMAP
AC_FUNC_SELECT_ARGTYPES
-AC_FUNC_SETPGRP
-AC_TYPE_SIGNAL
+# AC_FUNC_SETPGRP
+# AC_TYPE_SIGNAL
# AC_FUNC_STAT
# remove pstat_getdynamic (at least for now) since we don't do
# anything conditional with the check anyway...
-AC_CHECK_FUNCS([dlopen gethostbyname gethrtime gettimeofday inet_ntoa memset memcpy socket sqrt strcasecmp strchr strstr strtoul uname])
+AC_CHECK_FUNCS([gethrtime gettimeofday inet_ntoa memset memcpy socket \
+ sqrt strcasecmp strchr strstr strtoul uname])
#AC_CONFIG_SUBDIRS(src/missing)
# does this platform need the replacement getaddrinfo or other
-AC_CHECK_FUNCS([getnameinfo getaddrinfo inet_ntop getopt_long])
+AC_CHECK_FUNCS([getnameinfo getaddrinfo inet_ntop])
# AC_REPLACE_FUNCS([getaddrinfo])
@@ -102,47 +103,43 @@
AC_MSG_NOTICE([Requesting replacement inet_ntop])
AC_LIBOBJ(missing/inet_ntop)
fi
-if test "$ac_cv_func_getopt_long" != yes ; then
- AC_MSG_NOTICE([Requesting replacement getopt/getopt_long])
- AC_LIBOBJ(missing/getopt)
- AC_LIBOBJ(missing/getopt1)
-fi
-AC_CHECK_FUNCS([get_expiration_time])
-if test "$ac_cv_func_get_expiration_time" != yes ; then
- AC_MSG_NOTICE([Requesting replacement get_expiration_time])
- AC_LIBOBJ(missing/get_expiration_time)
-fi
-
AC_CHECK_FUNCS(sendfile)
AC_CHECK_FUNCS(mpctl processor_bind sched_setaffinity bind_to_cpu_id)
-AC_CHECK_PROG(have_libxml2, xml2-config, "yes", "no" )
-if test "x$have_libxml2"="xyes"; then
- libxml2_cflags=`xml2-config --cflags`
- libxml2_libs=`xml2-config --libs`
-else
- AC_MSG_ERROR(Cannot find xml2-config.)
-fi
+# since we are going to depend on pkg-config for glib, might as well
+# use it for libxml2 as well
+#AC_CHECK_PROG(have_libxml2, xml2-config, "yes", "no" )
+#if test "x$have_libxml2"="xyes"; then
+# libxml2_cflags=`xml2-config --cflags`
+# libxml2_libs=`xml2-config --libs`
+#else
+# AC_MSG_ERROR(Cannot find xml2-config.)
+#fi
+
AC_ARG_WITH(glib,
- [AS_HELP_STRING([--with-glib],[attempt to use glib's thread abstractionsrather than direct pthreads])])
+ [AS_HELP_STRING([--with-glib],
+ [in the future will show where/how to include glib])])
-glib_cflags=""
-glib_libs=""
+pkg_config_cflags=""
+pkg_config_libs=""
PKG_PROG_PKG_CONFIG()
- glib_cflags=`$PKG_CONFIG --cflags-only-I glib-2.0 gmodule-2.0 gthread-2.0`
- glib_libs=`$PKG_CONFIG --libs-only-l --libs-only-L glib-2.0 gmodule-2.0 gthread-2.0`
+ pkg_config_cflags=`$PKG_CONFIG --cflags-only-I \
+ libxml-2.0 glib-2.0 gmodule-2.0 gthread-2.0`
+ pkg_config_libs=`$PKG_CONFIG --libs-only-l --libs-only-L \
+ libxml-2.0 glib-2.0 gmodule-2.0 gthread-2.0`
# see if we should be enabling histogram support
AC_MSG_CHECKING(whether to include histogram support)
AC_ARG_ENABLE(histogram,
- [AS_HELP_STRING([--enable-histogram],[include individual op timing, may affect result]) ])
+ [AS_HELP_STRING([--enable-histogram],
+ [include individual op timing, may affect result]) ])
case "$enable_histogram" in
yes)
@@ -169,7 +166,8 @@
if $use_histogram
then
- AC_DEFINE([WANT_HISTOGRAM],,[Define to one to enable histogram support. May affect results.])
+ AC_DEFINE([WANT_HISTOGRAM],,
+ [Define to one to enable histogram support. May affect results.])
fi
# see if we should be enabling demo support
@@ -204,7 +202,8 @@
if $use_demo
then
- AC_DEFINE([WANT_DEMO],,[Define to one to enable demo support. May affect results.])
+ AC_DEFINE([WANT_DEMO],,
+ [Define to one to enable demo support. May affect results.])
fi
# see if we should be including the AF_UNIX tests
@@ -238,7 +237,8 @@
if $use_unixdomain
then
- AC_DEFINE([WANT_UNIX],,[Define to one to include Unix Domain socket tests.])
+ AC_DEFINE([WANT_UNIX],,
+ [Define to one to include Unix Domain socket tests.])
fi
# see if we should be including the DLPI tests
@@ -420,7 +420,8 @@
if $use_intervals
then
- AC_DEFINE([WANT_INTERVALS],,[Define to one to enable paced operation support. May affect results.])
+ AC_DEFINE([WANT_INTERVALS],,
+ [Define to one to enable paced operation support. May affect results.])
fi
# see if we should be enabling initial request bursts
@@ -454,7 +455,8 @@
if $use_burst
then
- AC_DEFINE([WANT_FIRST_BURST],,[Define to one to enable initial _RR burst support. May affect results.])
+ AC_DEFINE([WANT_FIRST_BURST],,
+[Define to one to enable initial _RR burst support. May affect results.])
fi
# time to see about CPU utilization measurements
@@ -468,34 +470,41 @@
case "$enable_cpuutil" in
pstat)
use_cpuutil=true
- AC_DEFINE([USE_PSTAT],,[Use HP-UX's pstat interface to measure CPU util.])
+ AC_DEFINE([USE_PSTAT],,
+ [Use HP-UX's pstat interface to measure CPU util.])
;;
pstatnew)
use_cpuutil=true
- AC_DEFINE([USE_PSTAT],,[Use HP-UX's pstat interface to measure CPU util.])
+ AC_DEFINE([USE_PSTAT],,
+ [Use HP-UX's pstat interface to measure CPU util.])
;;
perfstat)
use_cpuutil=true
- AC_DEFINE([USE_PERFSTAT],,[Use AIX's perfstat interface to measure CPU util.])
+ AC_DEFINE([USE_PERFSTAT],,
+ [Use AIX's perfstat interface to measure CPU util.])
AC_HAVE_LIBRARY(perfstat)
;;
looper)
use_cpuutil=true
- AC_DEFINE([USE_LOOPER],,[Use looper/soaker processes to measure CPU util.])
+ AC_DEFINE([USE_LOOPER],,
+ [Use looper/soaker processes to measure CPU util.])
;;
procstat)
use_cpuutil=true
- AC_DEFINE([USE_PROC_STAT],,[Use Linux's procstat interface to measure CPU util.])
+ AC_DEFINE([USE_PROC_STAT],,
+ [Use Linux's procstat interface to measure CPU util.])
;;
kstat)
use_cpuutil=true
- AC_DEFINE([USE_KSTAT],,[Use Solaris's kstat interface to measure CPU util.])
+ AC_DEFINE([USE_KSTAT],,
+ [Use Solaris's kstat interface to measure CPU util.])
AC_HAVE_LIBRARY(kstat)
;;
kstat10)
use_cpuutil=true
- AC_DEFINE([USE_KSTAT],,[Use Solaris's kstat interface to measure CPU util.])
+ AC_DEFINE([USE_KSTAT],,
+ [Use Solaris's kstat interface to measure CPU util.])
AC_HAVE_LIBRARY(kstat)
;;
'')
@@ -503,56 +512,63 @@
# i386-pc-solaris2.10
# guess it automagically in a nice big case statement
case $target in
- *-*-linux*)
- use_cpuutil=true
- AC_DEFINE([USE_PROC_STAT],,[Use Linux's procstat interface to measure CPU util.])
- enable_cpuutil="procstat - auto"
- NETSYS_SOURCE="linux"
- ;;
- *-*-hpux11.23 | *-*-hpux11.31)
- use_cpuutil=true
- AC_DEFINE([USE_PSTAT],,[Use HP-UX's pstat interface to measure CPU util.])
- enable_cpuutil="pstatnew - auto"
- NETSYS_SOURCE="hpux"
- ;;
- *-*-hpux11* | *-*-hpux10*)
- use_cpuutil=true
- AC_DEFINE([USE_PSTAT],,[Use HP-UX's pstat interface to measure CPU util.])
- enable_cpuutil="pstat - auto"
- NETSYS_SOURCE="pstat"
- ;;
- *-*-aix5.*)
- use_puutil=true
- AC_DEFINE([USE_PERFSTAT],,[Use AIX's perfstat interface to measure CPU util.])
- AC_HAVE_LIBRARY(perfstat)
- enable_cpuutil="perfstat - auto"
- NETSYS_SOURCE="perfstat"
- ;;
- *-*-solaris2.10)
- use_cpuutil=true
- AC_DEFINE([USE_KSTAT],,[Use Solaris's kstat interface to measure CPU util.])
- AC_HAVE_LIBRARY(kstat)
- enable_cpuutil="kstat10 - auto"
- NETSYS_SOURCE="kstat10"
- ;;
- *-*-solaris2.*)
- use_cpuutil=true
- AC_DEFINE([USE_KSTAT],,[Use Solaris's kstat interface to measure CPU util.])
- AC_HAVE_LIBRARY(kstat)
- enable_cpuutil="kstat - auto"
- NETSYS_SOURCE="kstat"
- ;;
- *-*-freebsd4.*)
- use_cpuutil=true
- AC_DEFINE([USE_SYSCTL],,[Use FreeBSD's sysctl interface to measure CPU util.])
- enable_cpuutil="sysctl - auto"
- NETSYS_SOURCE="sysctl"
- ;;
- *)
- use_cpuutil=false
- NETSYS_SOURCE="none"
- enable_cpuutil="none. Consider teaching configure about your platform."
- ;;
+ *-*-linux*)
+ use_cpuutil=true
+ AC_DEFINE([USE_PROC_STAT],,
+ [Use Linux's procstat interface to measure CPU util.])
+ enable_cpuutil="procstat - auto"
+ NETSYS_SOURCE="linux"
+ ;;
+ *-*-hpux11.23 | *-*-hpux11.31)
+ use_cpuutil=true
+ AC_DEFINE([USE_PSTAT],,
+ [Use HP-UX's pstat interface to measure CPU util.])
+ enable_cpuutil="pstatnew - auto"
+ NETSYS_SOURCE="hpux"
+ ;;
+ *-*-hpux11* | *-*-hpux10*)
+ use_cpuutil=true
+ AC_DEFINE([USE_PSTAT],,
+ [Use HP-UX's pstat interface to measure CPU util.])
+ enable_cpuutil="pstat - auto"
+ NETSYS_SOURCE="pstat"
+ ;;
+ *-*-aix5.*)
+ use_cpuutil=true
+ AC_DEFINE([USE_PERFSTAT],,
+ [Use AIX's perfstat interface to measure CPU util.])
+ AC_HAVE_LIBRARY(perfstat)
+ enable_cpuutil="perfstat - auto"
+ NETSYS_SOURCE="perfstat"
+ ;;
+ *-*-solaris2.10 | *-*-solaris2.11)
+ use_cpuutil=true
+ AC_DEFINE([USE_KSTAT],,
+ [Use Solaris's kstat interface to measure CPU util.])
+ AC_HAVE_LIBRARY(kstat)
+ enable_cpuutil="kstat10 - auto"
+ NETSYS_SOURCE="kstat10"
+ ;;
+ *-*-solaris2.*)
+ use_cpuutil=true
+ AC_DEFINE([USE_KSTAT],,
+ [Use Solaris's kstat interface to measure CPU util.])
+ AC_HAVE_LIBRARY(kstat)
+ enable_cpuutil="kstat - auto"
+ NETSYS_SOURCE="kstat"
+ ;;
+ *-*-freebsd4.* | *-*-freebsd5.* | *-*-freebsd6.*)
+ use_cpuutil=true
+ AC_DEFINE([USE_SYSCTL],,
+ [Use FreeBSD's sysctl interface to measure CPU util.])
+ enable_cpuutil="sysctl - auto"
+ NETSYS_SOURCE="sysctl"
+ ;;
+ *)
+ use_cpuutil=false
+ NETSYS_SOURCE="none"
+ enable_cpuutil="none. Consider teaching configure about your platform."
+ ;;
esac
;;
none)
@@ -580,12 +596,12 @@
case $GCC in
yes)
- CFLAGS="$CFLAGS -pthread $libxml2_cflags $glib_cflags"
- LIBS="$LIBS -pthread $libxml2_libs $glib_libs"
+ CFLAGS="$CFLAGS -pthread $libxml2_cflags $pkg_config_cflags"
+ LIBS="$LIBS -pthread $libxml2_libs $pkg_config_libs"
;;
*)
- CFLAGS="$CLFAGS $libxml2_cflags $glib_cflags "
- LIBS="$LIBS $libxml2_libs $glib_libs "
+ CFLAGS="$CLFAGS $libxml2_cflags $pkg_config_cflags "
+ LIBS="$LIBS $libxml2_libs $pkg_config_libs "
;;
esac
Modified: branches/glib_migration/doc/Makefile.in
===================================================================
--- branches/glib_migration/doc/Makefile.in 2006-03-30 22:12:07 UTC (rev 116)
+++ branches/glib_migration/doc/Makefile.in 2006-03-30 23:37:50 UTC (rev 117)
@@ -114,7 +114,6 @@
build_vendor = @build_vendor@
datadir = @datadir@
exec_prefix = @exec_prefix@
-have_libxml2 = @have_libxml2@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
Modified: branches/glib_migration/src/Makefile.in
===================================================================
--- branches/glib_migration/src/Makefile.in 2006-03-30 22:12:07 UTC (rev 116)
+++ branches/glib_migration/src/Makefile.in 2006-03-30 23:37:50 UTC (rev 117)
@@ -116,7 +116,6 @@
build_vendor = @build_vendor@
datadir = @datadir@
exec_prefix = @exec_prefix@
-have_libxml2 = @have_libxml2@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -229,10 +228,7 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = $(DEPDIR)/missing/get_expiration_time.Po \
- at AMDEP_TRUE@ $(DEPDIR)/missing/getaddrinfo.Po \
- at AMDEP_TRUE@ $(DEPDIR)/missing/getopt.Po \
- at AMDEP_TRUE@ $(DEPDIR)/missing/getopt1.Po \
+ at AMDEP_TRUE@DEP_FILES = $(DEPDIR)/missing/getaddrinfo.Po \
@AMDEP_TRUE@ $(DEPDIR)/missing/inet_ntop.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/netconfidence.Po ./$(DEPDIR)/netlib.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/netlib_ at NETSYS_SOURCE@.Po \
@@ -258,8 +254,7 @@
HEADERS = $(include_HEADERS)
DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in Makefile.am \
- missing/get_expiration_time.c missing/getaddrinfo.c \
- missing/getopt.c missing/getopt1.c missing/inet_ntop.c
+ missing/getaddrinfo.c missing/inet_ntop.c
SOURCES = $(netsysstats_la_SOURCES) $(nettest_bsd_la_SOURCES) $(nettest_dns_la_SOURCES) $(nettest_vst_la_SOURCES) $(netperf_SOURCES) $(netserver_SOURCES)
all: all-am
@@ -349,10 +344,7 @@
distclean-compile:
-rm -f *.tab.c
- at AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/missing/get_expiration_time.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/missing/getaddrinfo.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/missing/getopt.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/missing/getopt1.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/missing/inet_ntop.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/netconfidence.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/netlib.Po at am__quote@
Modified: branches/glib_migration/src/netlib.c
===================================================================
--- branches/glib_migration/src/netlib.c 2006-03-30 22:12:07 UTC (rev 116)
+++ branches/glib_migration/src/netlib.c 2006-03-30 23:37:50 UTC (rev 117)
@@ -99,10 +99,6 @@
#include <sys/resource.h>
#endif
-#ifdef HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
# include <glib.h>
# include <gmodule.h>
Modified: branches/glib_migration/src/netlib.h
===================================================================
--- branches/glib_migration/src/netlib.h 2006-03-30 22:12:07 UTC (rev 116)
+++ branches/glib_migration/src/netlib.h 2006-03-30 23:37:50 UTC (rev 117)
@@ -110,11 +110,6 @@
extern int parse_address_family(char family_string[]);
extern int establish_listen(char *hostname, char *service,
int af, netperf_socklen_t *addrlenp);
-#ifndef HAVE_GET_EXPIRATION_TIME
-/* we need a proto since we are providing the fuction ourselves */
-extern int get_expiration_time(struct timespec *delta,
- struct timespec *abstime );
-#endif
extern int netperf_complete_filename(char *name, char *full, int fulllen);
extern gboolean read_from_control_connection(GIOChannel *source, GIOCondition condition, gpointer data);
More information about the netperf-dev
mailing list