Attachment 150284 Details for Bug 219025 – cleanup RRD variables and remove AM_LDFLAGS= @LDFLAGS@

[patch] cleanup RRD variables and remove AM_LDFLAGS= @LDFLAGS@

ntop-rrd.patch (text/plain), 1.98 KB, created by Patrice Dumas on 2007-03-16 22:40:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2007-03-16 22:40:39 UTC

Size: 1.98 KB

patch

obsolete

>--- ntop/plugins/Makefile.am.rrd	2007-03-16 23:15:08.000000000 +0100
>+++ ntop/plugins/Makefile.am	2007-03-16 23:15:16.000000000 +0100
>@@ -32,10 +32,6 @@
> 
> SUFFIXES    = .so
> 
>-RRD_HOME=@RRD_HOME@
>-RRD_INC=-I${RRD_HOME}/include
>-RRD_LIB=-L${RRD_HOME}/lib -lrrd_th
>-
> # 
> # Where to install the plugin 
> # 
>--- ntop/Makefile.am.rrd	2007-03-16 23:01:00.000000000 +0100
>+++ ntop/Makefile.am	2007-03-16 23:01:00.000000000 +0100
>@@ -33,10 +33,6 @@
> DEFS      = @DEFS@
> INCS      = @INCS@
> 
>-RRD_HOME=@RRD_HOME@
>-RRD_INC=-I${RRD_HOME}/include
>-RRD_LIB=-L${RRD_HOME}/lib -lrrd_th
>-
> INCLUDES  = -I. $(INCS) ${RRD_INC}
> LIBS      = 
> BASE_LIBS = @LIBS@ ${RRD_LIB}
>@@ -44,8 +40,9 @@
> AWK       = @AWK@
> CC        = @CC@
> CCLD      = @CCLD@
>-AM_CFLAGS =
>-AM_LDFLAGS= @LDFLAGS@
>+
>+#AM_CFLAGS =
>+#AM_LDFLAGS= 
> 
> 
> DISTCLEANFILES = trivialcompilemessage *.db #* *~ *.log
>--- ntop/configure.in.rrd	2007-03-16 23:01:00.000000000 +0100
>+++ ntop/configure.in	2007-03-16 23:01:00.000000000 +0100
>@@ -1229,6 +1229,8 @@
>    RRD_HOME=/usr/local/rrdtool
> fi
> 
>+RRD_LIB="-L${RRD_HOME}/lib -lrrd_th"
>+
> if test -f "$RRD_HOME/lib/librrd_th.so"; then
>    AC_MSG_RESULT(Found RRD)
> else
>@@ -1242,11 +1244,18 @@
>        if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then
>          AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR);
> 	 AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/);
>-        fi
>+       else
>+         RRD_LIB=
>+       fi
>      fi
>   fi
> fi
> 
>+RRD_INC=
>+if test -d "${RRD_HOME}/include"; then
>+  RRD_INC="-I${RRD_HOME}/include"
>+fi
>+
> dnl> The failed recheck stuff below is courtesy of Chris Turbeville [turbo@verio.net]
> dnl> Chris developed this for Solaris 9, confirming work I had done earlier for FreeBSD
> dnl> And thank to Julien TOUCHE [julien.touche@lycos.com] for the OpenBSD dependencies
>@@ -2328,7 +2337,8 @@
> AC_SUBST(CFG_RUN_DIR)
> AC_SUBST(SCRIPTVER)
> AC_SUBST(SO_VERSION_PATCH)
>-AC_SUBST(RRD_HOME)
>+AC_SUBST(RRD_LIB)
>+AC_SUBST(RRD_INC)
> 
> AC_CONFIG_FILES([Makefile])
>

Actions: View | Diff

Attachments on bug 219025: 143230 | 143662 | 148350 | 148534 | 149182 | 149183 | 149782 | 150284 | 150285 | 150302 | 150840