|
|
|
diff -Naur wmnetload-1.3.orig/configure.in wmnetload-1.3/configure.in
|
|
|
|
--- a/configure.in 2003-02-23 10:07:39.000000000 +0100
|
|
|
|
+++ b/configure.in 2015-08-23 22:26:30.221448648 +0200
|
|
|
|
@@ -102,7 +102,6 @@
|
|
|
|
[inc_search_path=" -I $withval $inc_search_path"])
|
|
|
|
|
|
|
|
LIBRARY_SEARCH_PATH="$lib_search_path -L/usr/local/lib"
|
|
|
|
-LIBRARY_RPATH=`echo "$LIBRARY_SEARCH_PATH" | sed 's/[ *]-L[ *]/:/g'`
|
|
|
|
HEADER_SEARCH_PATH="$inc_search_path -I/usr/local/include"
|
|
|
|
|
|
|
|
AC_SUBST(LIBRARY_SEARCH_PATH)
|
|
|
|
@@ -122,12 +121,10 @@
|
|
|
|
;;
|
|
|
|
*netbsd*)
|
|
|
|
OS=netbsd
|
|
|
|
- LIBRARY_RPATH="$LIBRARY_RPATH:/usr/X11R6/lib"
|
|
|
|
LIBS="$LIBS -lkvm"
|
|
|
|
;;
|
|
|
|
*freebsd*)
|
|
|
|
OS=freebsd
|
|
|
|
- LIBRARY_RPATH="$LIBRARY_RPATH:/usr/X11R6/lib"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
echo ""
|
|
|
|
@@ -143,22 +140,6 @@
|
|
|
|
|
|
|
|
AC_PATH_XTRA
|
|
|
|
|
|
|
|
-dnl
|
|
|
|
-dnl Hack in rpath -- yes, this sucks, and it even has a hidden dependency
|
|
|
|
-dnl on the implementation of AC_PATH_XTRA. F@&* you, portability.
|
|
|
|
-dnl
|
|
|
|
-if test "$GCC" = yes; then
|
|
|
|
- if test "ac_R_space" = no; then
|
|
|
|
- RPATH="-Wl,\"-R$LIBRARY_RPATH\""
|
|
|
|
- else
|
|
|
|
- RPATH="-Wl,\"-R $LIBRARY_RPATH\""
|
|
|
|
- fi
|
|
|
|
-else
|
|
|
|
- RPATH=
|
|
|
|
- echo "WARNING: do not know how to set RPATH with this compiler"
|
|
|
|
-fi
|
|
|
|
-
|
|
|
|
-AC_SUBST(RPATH)
|
|
|
|
|
|
|
|
|
|
|
|
X_LIBRARY_PATH=$x_libraries
|
|
|
|
@@ -188,8 +169,8 @@
|
|
|
|
|
|
|
|
WN_CHECK_LIB(dockapp, DAInitialize, [$XLFLAGS $XLIBS -lXpm])
|
|
|
|
if test "x$ac_cv_lib_dockapp_DAInitialize" = xyes; then
|
|
|
|
- WN_CHECK_HEADER(dockapp.h, $XCFLAGS)
|
|
|
|
- if test "x$ac_cv_header_dockapp_h" != xyes; then
|
|
|
|
+ WN_CHECK_HEADER(libdockapp/dockapp.h, $XCFLAGS)
|
|
|
|
+ if test "x$ac_cv_header_libdockapp_dockapp_h" != xyes; then
|
|
|
|
echo "Cannot find required libdockapp headers."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
diff -Naur wmnetload-1.3.orig/src/Makefile.am wmnetload-1.3/src/Makefile.am
|
|
|
|
--- a/src/Makefile.am 2003-02-18 07:30:48.000000000 +0100
|
|
|
|
+++ b/src/Makefile.am 2015-08-23 22:20:16.599704945 +0200
|
|
|
|
@@ -25,8 +25,6 @@
|
|
|
|
EXTRA_wmnetload_SOURCES = ifstat_linux.c ifstat_netbsd.c ifstat_solaris.c \
|
|
|
|
ifstat_freebsd.c
|
|
|
|
|
|
|
|
-LDFLAGS = @RPATH@
|
|
|
|
-
|
|
|
|
LDADD = @LIBRARY_SEARCH_PATH@ @XLFLAGS@ @XLIBS@ -ldockapp -lXpm -lm
|
|
|
|
CPPFLAGS = @CPPFLAGS@ @XCFLAGS@ -DVERSION=\"@VERSION@\"
|
|
|
|
INCLUDES = @HEADER_SEARCH_PATH@ -I$(top_srcdir)/xpm/@WN_LOOK@
|