[netperf-dev] netperf2 commit notice r76 - trunk
raj at netperf.org
raj at netperf.org
Tue Jun 20 15:56:09 PDT 2006
Author: raj
Date: 2006-06-20 15:56:07 -0700 (Tue, 20 Jun 2006)
New Revision: 76
Added:
trunk/netperf.spec.in
Modified:
trunk/AUTHORS
trunk/Makefile.am
trunk/Makefile.in
trunk/Release_Notes
trunk/aclocal.m4
trunk/configure
trunk/configure.ac
Log:
Add support for generating a spec file for RPM's
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2006-05-24 17:32:06 UTC (rev 75)
+++ trunk/AUTHORS 2006-06-20 22:56:07 UTC (rev 76)
@@ -179,3 +179,7 @@
Hans Blom
Improvements to closing/redirecting stdin/stdout/stderr in netserver
+
+Martin Brown
+RPM support in the form of netperf.spec.in and related configure.ac
+etc changes
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2006-05-24 17:32:06 UTC (rev 75)
+++ trunk/Makefile.am 2006-06-20 22:56:07 UTC (rev 76)
@@ -1,5 +1,5 @@
SUBDIRS = src doc
-EXTRA_DIST = m4/ README.* Release_Notes inet_ntop.c
+EXTRA_DIST = m4/ README.* Release_Notes inet_ntop.c netperf.spec*
dist-hook:
rm -rf `find $(distdir) -name .svn`
\ No newline at end of file
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2006-05-24 17:32:06 UTC (rev 75)
+++ trunk/Makefile.in 2006-06-20 22:56:07 UTC (rev 76)
@@ -119,7 +119,7 @@
target_os = @target_os@
target_vendor = @target_vendor@
SUBDIRS = src doc
-EXTRA_DIST = m4/ README.* Release_Notes inet_ntop.c
+EXTRA_DIST = m4/ README.* Release_Notes inet_ntop.c netperf.spec*
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -133,9 +133,9 @@
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 \
- config.guess config.h.in config.sub configure configure.ac \
- depcomp install-sh missing mkinstalldirs
+ COPYING ChangeLog INSTALL Makefile.am NEWS acinclude.m4 \
+ aclocal.m4 config.guess config.h.in config.sub configure \
+ configure.ac depcomp install-sh missing mkinstalldirs
DIST_SUBDIRS = $(SUBDIRS)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -155,7 +155,7 @@
$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): configure.ac
+$(ACLOCAL_M4): configure.ac acinclude.m4
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
Modified: trunk/Release_Notes
===================================================================
--- trunk/Release_Notes 2006-05-24 17:32:06 UTC (rev 75)
+++ trunk/Release_Notes 2006-06-20 22:56:07 UTC (rev 76)
@@ -8,6 +8,8 @@
*) Sendfile changes for Solaris courtesy of Andrew Gallatin.
+*) "spec" file support to generate RPMs courtesy of Martin Brown
+
These are the Release Notes for Revision 2.4.2 of netperf:
Things changed in this release:
Modified: trunk/aclocal.m4
===================================================================
--- trunk/aclocal.m4 2006-05-24 17:32:06 UTC (rev 75)
+++ trunk/aclocal.m4 2006-06-20 22:56:07 UTC (rev 76)
@@ -11,6 +11,192 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+dnl This comes from libcurl's acinclude.m4. it is not clear if this
+dnl is original libcurl code, or other code, so we include the libcurl
+dnl copyright here
+dnl
+dnl
+dnl Copyright (c) 1996 - 2005, Daniel Stenberg, <daniel at haxx.se>.
+dnl
+dnl All rights reserved.
+dnl
+dnl Permission to use, copy, modify, and distribute this software for any purpose
+dnl with or without fee is hereby granted, provided that the above copyright
+dnl notice and this permission notice appear in all copies.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+dnl NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+dnl DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+dnl OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+dnl OR OTHER DEALINGS IN THE SOFTWARE.
+dnl
+dnl Except as contained in this notice, the name of a copyright holder shall not
+dnl be used in advertising or otherwise to promote the sale, use or other dealings
+dnl in this Software without prior written authorization of the copyright holder.
+
+dnl Check for socklen_t: historically on BSD it is an int, and in
+dnl POSIX 1g it is a type of its own, but some platforms use different
+dnl types for the argument to getsockopt, getpeername, etc. So we
+dnl have to test to find something that will work.
+
+dnl Remove the AC_CHECK_TYPE - on HP-UX it would find a socklen_t, but the
+dnl function prototypes for getsockopt et al will not actually use
+dnl socklen_t args unless _XOPEN_SOURCE_EXTENDED is defined. so, the
+dnl AC_CHECK_TYPE will find a socklen_t and think all is happiness and
+dnl joy when you will really get warnings about mismatch types - type
+dnl mismatches that would be possibly Bad (tm) in a 64-bit compile.
+dnl raj 2005-05-11 this change may be redistributed at will
+
+dnl also, added "extern" to the "int getpeername" in an attempt to resolve
+dnl an issue with this code under Solaris 2.9. this too may be
+dnl redistributed at will
+
+AC_DEFUN([OLD_TYPE_SOCKLEN_T],
+[
+ AC_MSG_CHECKING([for socklen_t equivalent])
+ AC_CACHE_VAL([curl_cv_socklen_t_equiv],
+ [
+ # Systems have either "struct sockaddr *" or
+ # "void *" as the second argument to getpeername
+ curl_cv_socklen_t_equiv=
+ for arg2 in "struct sockaddr" void; do
+ for t in int size_t unsigned long "unsigned long" socklen_t; do
+ AC_TRY_COMPILE([
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+
+ extern int getpeername (int, $arg2 *, $t *);
+ ],[
+ $t len;
+ getpeername(0,0,&len);
+ ],[
+ curl_cv_socklen_t_equiv="$t"
+ break
+ ])
+ done
+ done
+
+ if test "x$curl_cv_socklen_t_equiv" = x; then
+ # take a wild guess
+ curl_cv_socklen_t_equiv="socklen_t"
+ AC_MSG_WARN([Cannot find a type to use in place of socklen_t, guessing socklen_t])
+ fi
+ ])
+ AC_MSG_RESULT($curl_cv_socklen_t_equiv)
+ AC_DEFINE_UNQUOTED(netperf_socklen_t, $curl_cv_socklen_t_equiv,
+ [type to use in place of socklen_t if not defined])
+])
+
+dnl *
+dnl * Copyright (c) 2001 Motoyuki Kasahara
+dnl *
+dnl * Redistribution and use in source and binary forms, with or without
+dnl * modification, are permitted provided that the following conditions
+dnl * are met:
+dnl * 1. Redistributions of source code must retain the above copyright
+dnl * notice, this list of conditions and the following disclaimer.
+dnl * 2. Redistributions in binary form must reproduce the above copyright
+dnl * notice, this list of conditions and the following disclaimer in the
+dnl * documentation and/or other materials provided with the distribution.
+dnl * 3. Neither the name of the project nor the names of its contributors
+dnl * may be used to endorse or promote products derived from this software
+dnl * without specific prior written permission.
+dnl *
+dnl * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+dnl * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+dnl * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+dnl * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORSBE
+dnl * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+dnl * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+dnl * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+dnl * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+dnl * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+dnl * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+dnl * THE POSSIBILITY OF SUCH DAMAGE.
+dnl *
+
+dnl *
+dnl * Check for h_errno.
+dnl *
+AC_DEFUN([AC_DECL_H_ERRNO],
+[AC_CACHE_CHECK(for h_errno declaration in netdb.h, ac_cv_decl_h_errno,
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <netdb.h>]], [[
+h_errno = 0;
+]])],[ac_cv_decl_h_errno=yes],[ac_cv_decl_h_errno=no])])
+if test "$ac_cv_decl_h_errno" = yes; then
+ AC_DEFINE(H_ERRNO_DECLARED, 1,
+[Define to 1 if `h_errno' is declared by <netdb.h>])
+fi])
+
+dnl *
+dnl * Copyright (c) 2001 Motoyuki Kasahara
+dnl *
+dnl * Redistribution and use in source and binary forms, with or without
+dnl * modification, are permitted provided that the following conditions
+dnl * are met:
+dnl * 1. Redistributions of source code must retain the above copyright
+dnl * notice, this list of conditions and the following disclaimer.
+dnl * 2. Redistributions in binary form must reproduce the above copyright
+dnl * notice, this list of conditions and the following disclaimer in the
+dnl * documentation and/or other materials provided with the distribution.
+dnl * 3. Neither the name of the project nor the names of its contributors
+dnl * may be used to endorse or promote products derived from this software
+dnl * without specific prior written permission.
+dnl *
+dnl * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+dnl * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+dnl * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+dnl * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORSBE
+dnl * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+dnl * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+dnl * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+dnl * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+dnl * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+dnl * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+dnl * THE POSSIBILITY OF SUCH DAMAGE.
+dnl *
+
+dnl *
+dnl * Check for struct sockaddr_in6
+dnl *
+AC_DEFUN([AC_STRUCT_SOCKADDR_IN6],
+[AC_CACHE_CHECK(for struct sockaddr_in6, ac_cv_struct_sockaddr_in6,
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>]], [[
+struct sockaddr_in6 address;
+]])],[ac_cv_struct_sockaddr_in6=yes],[ac_cv_struct_sockaddr_in6=no])])
+if test "$ac_cv_struct_sockaddr_in6" = yes; then
+ AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6, 1,
+[Define to 1 if <netinet/in.h> defines `struct sockaddr_in6'])
+fi])
+
+dnl *
+dnl * Check for struct sockaddr_storage
+dnl *
+AC_DEFUN([AC_STRUCT_SOCKADDR_STORAGE],
+[AC_CACHE_CHECK(for struct sockaddr_storage, ac_cv_struct_sockaddr_storage,
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>]], [[
+struct sockaddr_storage address;
+]])],[ac_cv_struct_sockaddr_storage=yes],[ac_cv_struct_sockaddr_storage=no])])
+if test "$ac_cv_struct_sockaddr_storage" = yes; then
+ AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1,
+[Define to 1 if <netinet/in.h> defines `struct sockaddr_storage'])
+fi])
+
+
+
# Do all the work for Automake. -*- Autoconf -*-
# This macro actually does too much some checks are only needed if
@@ -859,188 +1045,3 @@
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-dnl This comes from libcurl's acinclude.m4. it is not clear if this
-dnl is original libcurl code, or other code, so we include the libcurl
-dnl copyright here
-dnl
-dnl
-dnl Copyright (c) 1996 - 2005, Daniel Stenberg, <daniel at haxx.se>.
-dnl
-dnl All rights reserved.
-dnl
-dnl Permission to use, copy, modify, and distribute this software for any purpose
-dnl with or without fee is hereby granted, provided that the above copyright
-dnl notice and this permission notice appear in all copies.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
-dnl NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-dnl DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-dnl OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
-dnl OR OTHER DEALINGS IN THE SOFTWARE.
-dnl
-dnl Except as contained in this notice, the name of a copyright holder shall not
-dnl be used in advertising or otherwise to promote the sale, use or other dealings
-dnl in this Software without prior written authorization of the copyright holder.
-
-dnl Check for socklen_t: historically on BSD it is an int, and in
-dnl POSIX 1g it is a type of its own, but some platforms use different
-dnl types for the argument to getsockopt, getpeername, etc. So we
-dnl have to test to find something that will work.
-
-dnl Remove the AC_CHECK_TYPE - on HP-UX it would find a socklen_t, but the
-dnl function prototypes for getsockopt et al will not actually use
-dnl socklen_t args unless _XOPEN_SOURCE_EXTENDED is defined. so, the
-dnl AC_CHECK_TYPE will find a socklen_t and think all is happiness and
-dnl joy when you will really get warnings about mismatch types - type
-dnl mismatches that would be possibly Bad (tm) in a 64-bit compile.
-dnl raj 2005-05-11 this change may be redistributed at will
-
-dnl also, added "extern" to the "int getpeername" in an attempt to resolve
-dnl an issue with this code under Solaris 2.9. this too may be
-dnl redistributed at will
-
-AC_DEFUN([OLD_TYPE_SOCKLEN_T],
-[
- AC_MSG_CHECKING([for socklen_t equivalent])
- AC_CACHE_VAL([curl_cv_socklen_t_equiv],
- [
- # Systems have either "struct sockaddr *" or
- # "void *" as the second argument to getpeername
- curl_cv_socklen_t_equiv=
- for arg2 in "struct sockaddr" void; do
- for t in int size_t unsigned long "unsigned long" socklen_t; do
- AC_TRY_COMPILE([
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
-
- extern int getpeername (int, $arg2 *, $t *);
- ],[
- $t len;
- getpeername(0,0,&len);
- ],[
- curl_cv_socklen_t_equiv="$t"
- break
- ])
- done
- done
-
- if test "x$curl_cv_socklen_t_equiv" = x; then
- # take a wild guess
- curl_cv_socklen_t_equiv="socklen_t"
- AC_MSG_WARN([Cannot find a type to use in place of socklen_t, guessing socklen_t])
- fi
- ])
- AC_MSG_RESULT($curl_cv_socklen_t_equiv)
- AC_DEFINE_UNQUOTED(netperf_socklen_t, $curl_cv_socklen_t_equiv,
- [type to use in place of socklen_t if not defined])
-])
-
-dnl *
-dnl * Copyright (c) 2001 Motoyuki Kasahara
-dnl *
-dnl * Redistribution and use in source and binary forms, with or without
-dnl * modification, are permitted provided that the following conditions
-dnl * are met:
-dnl * 1. Redistributions of source code must retain the above copyright
-dnl * notice, this list of conditions and the following disclaimer.
-dnl * 2. Redistributions in binary form must reproduce the above copyright
-dnl * notice, this list of conditions and the following disclaimer in the
-dnl * documentation and/or other materials provided with the distribution.
-dnl * 3. Neither the name of the project nor the names of its contributors
-dnl * may be used to endorse or promote products derived from this software
-dnl * without specific prior written permission.
-dnl *
-dnl * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
-dnl * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-dnl * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-dnl * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORSBE
-dnl * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-dnl * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-dnl * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-dnl * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-dnl * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-dnl * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-dnl * THE POSSIBILITY OF SUCH DAMAGE.
-dnl *
-
-dnl *
-dnl * Check for h_errno.
-dnl *
-AC_DEFUN([AC_DECL_H_ERRNO],
-[AC_CACHE_CHECK(for h_errno declaration in netdb.h, ac_cv_decl_h_errno,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <netdb.h>]], [[
-h_errno = 0;
-]])],[ac_cv_decl_h_errno=yes],[ac_cv_decl_h_errno=no])])
-if test "$ac_cv_decl_h_errno" = yes; then
- AC_DEFINE(H_ERRNO_DECLARED, 1,
-[Define to 1 if `h_errno' is declared by <netdb.h>])
-fi])
-
-dnl *
-dnl * Copyright (c) 2001 Motoyuki Kasahara
-dnl *
-dnl * Redistribution and use in source and binary forms, with or without
-dnl * modification, are permitted provided that the following conditions
-dnl * are met:
-dnl * 1. Redistributions of source code must retain the above copyright
-dnl * notice, this list of conditions and the following disclaimer.
-dnl * 2. Redistributions in binary form must reproduce the above copyright
-dnl * notice, this list of conditions and the following disclaimer in the
-dnl * documentation and/or other materials provided with the distribution.
-dnl * 3. Neither the name of the project nor the names of its contributors
-dnl * may be used to endorse or promote products derived from this software
-dnl * without specific prior written permission.
-dnl *
-dnl * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
-dnl * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-dnl * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-dnl * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORSBE
-dnl * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-dnl * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-dnl * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-dnl * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-dnl * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-dnl * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-dnl * THE POSSIBILITY OF SUCH DAMAGE.
-dnl *
-
-dnl *
-dnl * Check for struct sockaddr_in6
-dnl *
-AC_DEFUN([AC_STRUCT_SOCKADDR_IN6],
-[AC_CACHE_CHECK(for struct sockaddr_in6, ac_cv_struct_sockaddr_in6,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>]], [[
-struct sockaddr_in6 address;
-]])],[ac_cv_struct_sockaddr_in6=yes],[ac_cv_struct_sockaddr_in6=no])])
-if test "$ac_cv_struct_sockaddr_in6" = yes; then
- AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6, 1,
-[Define to 1 if <netinet/in.h> defines `struct sockaddr_in6'])
-fi])
-
-dnl *
-dnl * Check for struct sockaddr_storage
-dnl *
-AC_DEFUN([AC_STRUCT_SOCKADDR_STORAGE],
-[AC_CACHE_CHECK(for struct sockaddr_storage, ac_cv_struct_sockaddr_storage,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>]], [[
-struct sockaddr_storage address;
-]])],[ac_cv_struct_sockaddr_storage=yes],[ac_cv_struct_sockaddr_storage=no])])
-if test "$ac_cv_struct_sockaddr_storage" = yes; then
- AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1,
-[Define to 1 if <netinet/in.h> defines `struct sockaddr_storage'])
-fi])
-
-
Modified: trunk/configure
===================================================================
--- trunk/configure 2006-05-24 17:32:06 UTC (rev 75)
+++ trunk/configure 2006-06-20 22:56:07 UTC (rev 76)
@@ -8492,6 +8492,7 @@
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -9884,6 +9885,7 @@
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+sed -e 's|@AC_PACKAGE_VERSION\@|2.4.2|g' netperf.spec.in > netperf.spec
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2006-05-24 17:32:06 UTC (rev 75)
+++ trunk/configure.ac 2006-06-20 22:56:07 UTC (rev 76)
@@ -604,5 +604,7 @@
src/Makefile
doc/Makefile])
+m4_pattern_allow([^AC_PACKAGE_VERSION])dnl
+AC_CONFIG_COMMANDS_POST(sed -e 's|@[[AC_PACKAGE_VERSION]]\@|AC_PACKAGE_VERSION|g' AC_PACKAGE_NAME.spec.in > AC_PACKAGE_NAME.spec)
AC_OUTPUT
Added: trunk/netperf.spec.in
===================================================================
--- trunk/netperf.spec.in 2006-05-24 17:32:06 UTC (rev 75)
+++ trunk/netperf.spec.in 2006-06-20 22:56:07 UTC (rev 76)
@@ -0,0 +1,55 @@
+Summary: Network Performance Testing Tool
+Name: netperf
+Version: @AC_PACKAGE_VERSION@
+Release: 1
+Copyright: Unknown
+Group: System Environment/Base
+URL: http://www.netperf.org/
+Packager: Martin A. Brown
+Source: ftp://ftp.netperf.org/netperf/%{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-root
+Prefix: /usr
+
+%description
+Many different network benchmarking tools are collected in this package,
+maintained by Rick Jones of HP.
+
+%prep
+%setup
+
+%build
+#%patch0 -p1
+./configure \
+ --prefix=%{_prefix} \
+ --mandir=%{_mandir} \
+ --infodir=%{_infodir}
+make
+
+%install
+test "$RPM_BUILD_ROOT" = "/" || rm -rf $RPM_BUILD_ROOT
+make DESTDIR=${RPM_BUILD_ROOT} install
+
+# -- .svn directory only needed by developers; blowing it away
+# in our BUILD/ directory, so that we do not package it
+#
+rm -rf doc/examples/.svn
+
+%clean
+test "$RPM_BUILD_ROOT" = "/" || rm -rf $RPM_BUILD_ROOT
+
+# %post
+
+%files
+%defattr(-,root,root)
+%doc README AUTHORS ChangeLog INSTALL COPYING
+%doc README.* Release_Notes
+%doc doc/examples
+%{_mandir}/man1/*
+%{_infodir}/*
+%{_bindir}/netperf
+%{_bindir}/netserver
+
+
+%changelog
+* Sat Jun 17 2006 Martin A. Brown <martin at linux-ip.net>
+- initial contributed specfile for netperf package (v2.4.2)
More information about the netperf-dev
mailing list