[netperf-dev] netperf4 commit notice r34 - in trunk: . doc
raj at netperf.org
raj at netperf.org
Fri Dec 9 14:50:09 PST 2005
Author: raj
Date: 2005-12-09 14:50:05 -0800 (Fri, 09 Dec 2005)
New Revision: 34
Added:
trunk/netperf-config.in
Modified:
trunk/Makefile.am
trunk/Makefile.in
trunk/configure
trunk/configure.ac
trunk/doc/netperf4.pdf
Log:
Add a netperf-config script a la curl and libxml2 for use by people
building netperf test suites outside of a netperf source tree and the
like. Also, update a mime-type on a pdf file.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2005-12-09 19:20:17 UTC (rev 33)
+++ trunk/Makefile.am 2005-12-09 22:50:05 UTC (rev 34)
@@ -1,2 +1,4 @@
SUBDIRS = src doc
-EXTRA_DIST = m4/ README.* Release_Notes inet_ntop.c
+EXTRA_DIST = m4/ README.* Release_Notes inet_ntop.c netperf-config.in
+
+bin_SCRIPTS = netperf-config
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2005-12-09 19:20:17 UTC (rev 33)
+++ trunk/Makefile.in 2005-12-09 22:50:05 UTC (rev 34)
@@ -137,12 +137,16 @@
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-config.in
+
+bin_SCRIPTS = netperf-config
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = netperf-config
+SCRIPTS = $(bin_SCRIPTS)
+
DIST_SOURCES =
RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
@@ -153,7 +157,8 @@
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 ltmain.sh missing mkinstalldirs
+ depcomp install-sh ltmain.sh missing mkinstalldirs \
+ netperf-config.in
DIST_SUBDIRS = $(SUBDIRS)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -192,7 +197,29 @@
distclean-hdr:
-rm -f config.h stamp-h1
+netperf-config: $(top_builddir)/config.status netperf-config.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
+ $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
+ else :; fi; \
+ done
+uninstall-binSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+ rm -f $(DESTDIR)$(bindir)/$$f; \
+ done
+
mostlyclean-libtool:
-rm -f *.lo
@@ -343,6 +370,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
+ $(mkinstalldirs) $(distdir)/.
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -453,9 +481,10 @@
exit 1; } >&2
check-am: all-am
check: check-recursive
-all-am: Makefile config.h
+all-am: Makefile $(SCRIPTS) config.h
installdirs: installdirs-recursive
installdirs-am:
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
install: install-recursive
install-exec: install-exec-recursive
@@ -501,7 +530,7 @@
install-data-am:
-install-exec-am:
+install-exec-am: install-binSCRIPTS
install-info: install-info-recursive
@@ -527,7 +556,7 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-binSCRIPTS uninstall-info-am
uninstall-info: uninstall-info-recursive
@@ -537,16 +566,17 @@
distclean-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am dvi-recursive info info-am \
- info-recursive install install-am install-data install-data-am \
- install-data-recursive install-exec install-exec-am \
- install-exec-recursive install-info install-info-am \
- install-info-recursive install-man install-recursive \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am installdirs-recursive maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive mostlyclean \
- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
- pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
- tags-recursive uninstall uninstall-am uninstall-info-am \
+ info-recursive install install-am install-binSCRIPTS \
+ install-data install-data-am install-data-recursive \
+ install-exec install-exec-am install-exec-recursive \
+ install-info install-info-am install-info-recursive install-man \
+ install-recursive install-strip installcheck installcheck-am \
+ installdirs installdirs-am installdirs-recursive \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+ uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am \
uninstall-info-recursive uninstall-recursive
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Modified: trunk/configure
===================================================================
--- trunk/configure 2005-12-09 19:20:17 UTC (rev 33)
+++ trunk/configure 2005-12-09 22:50:05 UTC (rev 34)
@@ -25381,7 +25381,7 @@
# now spit it all out
- ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile"
+ ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile netperf-config"
@@ -25951,6 +25951,7 @@
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+ "netperf-config" ) CONFIG_FILES="$CONFIG_FILES netperf-config" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2005-12-09 19:20:17 UTC (rev 33)
+++ trunk/configure.ac 2005-12-09 22:50:05 UTC (rev 34)
@@ -550,7 +550,8 @@
# now spit it all out
AC_CONFIG_FILES([Makefile
src/Makefile
- doc/Makefile])
+ doc/Makefile
+ netperf-config])
AC_OUTPUT
Property changes on: trunk/doc/netperf4.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/pdf
Added: trunk/netperf-config.in
===================================================================
--- trunk/netperf-config.in 2005-12-09 19:20:17 UTC (rev 33)
+++ trunk/netperf-config.in 2005-12-09 22:50:05 UTC (rev 34)
@@ -0,0 +1,88 @@
+#! /bin/sh
+#
+# The idea to this kind of setup info script was stolen from numerous
+# other packages, such as neon, libxml, gnome and curl.
+#
+# $Id$
+#
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+includedir=@includedir@
+libdir=@libdir@
+
+usage()
+{
+ cat <<EOF
+Usage: netperf-config [OPTION]
+
+Known values for OPTION are:
+
+ --exec-prefix display netperf exec prefix
+ --libs print library linking information
+ --cc display the compiler used
+ --cflags print pre-processor and compiler flags
+ --modules module support enabled (TBD)
+ --help display this help and exit
+ --version output version information
+EOF
+
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1
+fi
+
+cflags=false
+libs=false
+
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case "$1" in
+ --cc)
+ echo "@CC@"
+ ;;
+
+ --prefix)
+ echo $prefix
+ ;;
+
+ --exec-prefix)
+ echo $exec_prefix
+ ;;
+
+ --version)
+ echo @VERSION@
+ exit 0
+ ;;
+
+ --help)
+ usage 0
+ ;;
+
+ --cflags)
+ echo -I at includedir@ @CFLAGS@
+ ;;
+
+ --modules)
+ echo @WITH_MODULES@
+ ;;
+
+ --libs)
+ echo -L at libdir@ @LDFLAGS@ @LIBS@
+ ;;
+
+ *)
+ usage
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+exit 0
More information about the netperf-dev
mailing list