[Xymon-developer] SF.net SVN: xymon:[7133] branches/4.3.10/build/rrd.sh

[<st...@us...>]

Revision: 7133
          http://xymon.svn.sourceforge.net/xymon/?rev=7133&view=rev
Author:   storner
Date:     2012-07-31 13:51:12 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
build/rrdtool: Add check if linking needs -L/usr/X11R6/lib which is the case for OpenBSD 5.x

Modified Paths:
--------------
    branches/4.3.10/build/rrd.sh

Modified: branches/4.3.10/build/rrd.sh
===================================================================
--- branches/4.3.10/build/rrd.sh	2012-07-31 13:50:31 UTC (rev 7132)
+++ branches/4.3.10/build/rrd.sh	2012-07-31 13:51:12 UTC (rev 7133)
@@ -103,6 +103,12 @@
 		PNGLIB="$PNGLIB -lm"
 	fi
 	OS=`uname -s | sed -e's@/@_@g'` RRDLIB="$LIBOPT" PNGLIB="$PNGLIB" $MAKE -f Makefile.test-rrd test-link 2>/dev/null
+	if test $? -ne 0; then
+		# Could be that we need -L/usr/X11R6/lib (OpenBSD)
+		LIBOPT="$LIBOPT -L/usr/X11R6/lib"
+		RRDLIB="$RRDLIB -L/usr/X11R6/lib"
+	fi
+	OS=`uname -s | sed -e's@/@_@g'` RRDLIB="$LIBOPT" PNGLIB="$PNGLIB" $MAKE -f Makefile.test-rrd test-link 2>/dev/null
 	if test $? -eq 0; then
 		echo "Linking with RRDtool works OK"
 		if test "$PNGLIB" != ""; then

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.