[netperf-dev] netperf4 commit notice r62 - in trunk: . src
raj at netperf.org
raj at netperf.org
Wed Feb 22 16:28:55 PST 2006
Author: raj
Date: 2006-02-22 16:28:54 -0800 (Wed, 22 Feb 2006)
New Revision: 62
Modified:
trunk/README
trunk/netperf-config.in
trunk/src/Makefile.am
trunk/src/Makefile.in
trunk/src/default_commands.xml
trunk/src/default_config.xml
trunk/src/netlib.c
Log:
a make install will now make sure there is a /etc/xml/catalog with the
netperf XML catalog entry in it for the DTD. This means we can and should
use SYSTEM "http://www.netperf.org/netperf_docs.dtd/1.0" as our DTD spec
and the catalog will map that to file://$(netperfdir)/netperf_docs.dtd
where $(netperfdir) is @datadir@/netperf (eg /usr/local/share/netperf)
further, add an "internal PATH" for finding the library files (.la) of
".:/usr/local/lib" - although in future that is something that should
be directed by configure and the makefile(s)
Modified: trunk/README
===================================================================
--- trunk/README 2006-02-22 23:07:59 UTC (rev 61)
+++ trunk/README 2006-02-23 00:28:54 UTC (rev 62)
@@ -16,7 +16,8 @@
Pointers:
The netperf4 benchmark depends on libxml2. You must have libxml2 and
-its development environment installed prior to building netperf4.
+its development environment and utilities (eg xmlcatalog) installed
+prior to building netperf4.
There is a COPYRIGHT file included. It is called COPYING because that
Modified: trunk/netperf-config.in
===================================================================
--- trunk/netperf-config.in 2006-02-22 23:07:59 UTC (rev 61)
+++ trunk/netperf-config.in 2006-02-23 00:28:54 UTC (rev 62)
@@ -18,12 +18,14 @@
Known values for OPTION are:
+ --cc display the compiler used
+ --cflags print pre-processor and compiler flags
--exec-prefix display netperf exec prefix
+ --help display this help and exit
+ --libdir display netperf's libdir
--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
+ --prefix display the netperf prefix
--version output version information
EOF
@@ -52,6 +54,10 @@
echo $prefix
;;
+ --libdir)
+ echo $libdir
+ ;;
+
--exec-prefix)
echo $exec_prefix
;;
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2006-02-22 23:07:59 UTC (rev 61)
+++ trunk/src/Makefile.am 2006-02-23 00:28:54 UTC (rev 62)
@@ -48,9 +48,9 @@
netserver_LDADD = @LIBOBJS@
# so far, it does not appear we need this in netserver
-netperf_LDFLAGS = -export-dynamic
+netperf_LDFLAGS = -rpath $(libdir) -export-dynamic
+netserver_LDFLAGS = -rpath $(libdir)
-
missing/getaddrinfo.o: $(srcdir)/missing/getaddrinfo.c
$(COMPILE) -o $@ -c $(srcdir)/missing/getaddrinfo.c
missing/inet_ntop.o: $(srcdir)/missing/inet_ntop.c
@@ -64,7 +64,7 @@
# with our entry in it. we really should provide some overrides in the
# configure script one of these days
install-data-local:
- if [ ! -d /etc/xml ]; then /usr/bin/mkdir /etc/xml; chmod 555 /etc/xml; fi
+ if [ ! -d /etc/xml ]; then mkdir /etc/xml; chmod 555 /etc/xml; fi
if [ ! -f /etc/xml/catalog ]; then xmlcatalog --create --noout /etc/xml/catalog;fi
xmlcatalog --noout --add "system" "http://www.netperf.org/netperf_docs.dtd/1.0" "file://$(netperfdir)/netperf_docs.dtd" /etc/xml/catalog
Modified: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in 2006-02-22 23:07:59 UTC (rev 61)
+++ trunk/src/Makefile.in 2006-02-23 00:28:54 UTC (rev 62)
@@ -187,7 +187,8 @@
netserver_LDADD = @LIBOBJS@
# so far, it does not appear we need this in netserver
-netperf_LDFLAGS = -export-dynamic
+netperf_LDFLAGS = -rpath $(libdir) -export-dynamic
+netserver_LDFLAGS = -rpath $(libdir)
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -221,7 +222,6 @@
$(am__objects_3)
netserver_OBJECTS = $(am_netserver_OBJECTS)
netserver_DEPENDENCIES = @LIBOBJS@
-netserver_LDFLAGS =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -642,7 +642,7 @@
# with our entry in it. we really should provide some overrides in the
# configure script one of these days
install-data-local:
- if [ ! -d /etc/xml ]; then /usr/bin/mkdir /etc/xml; chmod 555 /etc/xml; fi
+ if [ ! -d /etc/xml ]; then mkdir /etc/xml; chmod 555 /etc/xml; fi
if [ ! -f /etc/xml/catalog ]; then xmlcatalog --create --noout /etc/xml/catalog;fi
xmlcatalog --noout --add "system" "http://www.netperf.org/netperf_docs.dtd/1.0" "file://$(netperfdir)/netperf_docs.dtd" /etc/xml/catalog
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Modified: trunk/src/default_commands.xml
===================================================================
--- trunk/src/default_commands.xml 2006-02-22 23:07:59 UTC (rev 61)
+++ trunk/src/default_commands.xml 2006-02-23 00:28:54 UTC (rev 62)
@@ -1,5 +1,5 @@
<?xml version="1.0" standalone="no" ?>
-<!DOCTYPE commands SYSTEM "./netperf_docs.dtd" >
+<!DOCTYPE commands SYSTEM "http://www.netperf.org/netperf_docs.dtd/1.0" >
<commands xmlns="http://www.netperf.org/ns/netperf">
<!-- 20 second TCP_STREAM test
Modified: trunk/src/default_config.xml
===================================================================
--- trunk/src/default_config.xml 2006-02-22 23:07:59 UTC (rev 61)
+++ trunk/src/default_config.xml 2006-02-23 00:28:54 UTC (rev 62)
@@ -1,5 +1,5 @@
<?xml version="1.0" standalone="no" ?>
-<!DOCTYPE netperf SYSTEM "./netperf_docs.dtd" >
+<!DOCTYPE netperf SYSTEM "http://www.netperf.org/netperf_docs.dtd/1.0" >
<netperf xmlns="http://www.netperf.org/ns/netperf">
<!-- This is just another boring comment -->
<netserver nid="n1" >
Modified: trunk/src/netlib.c
===================================================================
--- trunk/src/netlib.c 2006-02-22 23:07:59 UTC (rev 61)
+++ trunk/src/netlib.c 2006-02-23 00:28:54 UTC (rev 62)
@@ -735,6 +735,12 @@
/* OK, there was no LD_LIBRARY_PATH, was there a SHLIB_PATH? I
wonder which if these should have precedence? */
temp = getenv("SHLIB_PATH");
+ if (NULL == temp) {
+ /* OK, there were no paths at all, lets do our own internal
+ path, which one day really aught to be based on $(libdir)
+ from the make environment. raj 2006-02-22 */
+ temp = ".:/usr/local/lib";
+ }
}
}
More information about the netperf-dev
mailing list