Changeset 786 for branches

Timestamp:

Apr 13, 2009, 10:59:00 PM (14 years ago)

Author:

Jari Häkkinen

Message:

Addresses #97. Removed gnuplot checks in configure.ac and added checks for PLplot. Updated README.

Location:

branches/replacing_gnuplot

Files:

• README (modified) (1 diff)
• configure.ac (modified) (6 diffs)

branches/replacing_gnuplot/README

@@ -45 +45 @@
    consequence, the dependency is inherited by svndigest.
 
- * Gnuplot.
+ * PLplot, http://plplot.sourceforge.net, and pkg-config utility,
+   http://pkg-config.freedesktop.org, to query infomration about
+   PLplot headers and libs.
 
  * A standard C++ compliant compiler with one extension: svndigest

branches/replacing_gnuplot/configure.ac

@@ -12 +12 @@
 # Copyright (C) 2005 Jari Häkkinen, Peter Johansson
 # Copyright (C) 2006 Jari Häkkinen
-# Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-# Copyright (C) 2009 Peter Johansson
+# Copyright (C) 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
 #
 # This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -82 +81 @@
 AC_PATH_PROG([HELP2MAN], [help2man], [no])
 AM_CONDITIONAL([HAVE_HELP2MAN], [test x$HELP2MAN != xno])
-AC_PATH_PROG([GNUPLOT],[gnuplot],[no])
-AC_DEFINE_UNQUOTED([GNUPLOT_PATH], ["$GNUPLOT"], 
-                   [defined to gnuplot path (or no if gnuplot was not found)])
+PKG_PROG_PKG_CONFIG([0.23]) # look for pkg-config
 
 # Save FLAGS
@@ -141 +138 @@
   ])
 
-
-
 # Use SD_*FLAGS in tests
 CPPFLAGS="$SD_CPPFLAGS $CPPFLAGS"
@@ -176 +171 @@
 # check if svnversion is installed
 AC_PATH_PROG([SVNVERSION], [svnversion], [no])
+
+# PLplot API checks
+plplot_found="yes"
+plplot_version=5.9
+AC_CHECK_HEADER([plplot/plstream.h],
+                [if $PKG_CONFIG --atleast-version=$plplot_version plplotd-c++; then
+                  PLPLOT_LDFLAGS=`$PKG_CONFIG --libs plplotd-c++`
+                  AC_SUBST([PLPLOT_LDFLAGS])
+                else
+                  plplot_found="nolib"
+                fi],
+                plplot_found="noheader")
 
 # checking if we build in a subversion WC
@@ -263 +270 @@
 fi
 
+# Non-existing PLplot API is fatal -- sub-sequent compilation will fail.
+if (test "$plplot_found" = "noheader") ; then
+  AC_MSG_WARN([PLplot developer files cannot be found. Make sure PLplot
+  is installed.])
+  all_reqs_ok="false"
+elif (test "$plplot_found" = "nolib") ; then
+  AC_MSG_WARN([PLplot developer files found but not required API version.
+  Version at least $plplot_version is required. Please upgrade PLplot.])
+  all_reqs_ok="false"
+fi
+
 if test $ac_cv_type_long_long_int != yes ; then
   AC_MSG_WARN([Compiler $CXX does not support `long long'.
@@ -289 +307 @@
 AC_MSG_NOTICE([    Linker flags:       $SD_LDFLAGS $LDFLAGS])
 AC_MSG_NOTICE([    LIBS:               $SD_LIBS $LIBS])
+AC_MSG_NOTICE([    PLPLOT_LDFLAGS:     $PLPLOT_LDFLAGS])
 AC_MSG_NOTICE([   +++++++++++++++++++++++++++++++++++++++++++++++])
 AC_MSG_NOTICE([])
 
-# Failure to locate gnuplot is not considered fatal
-if (test "x$GNUPLOT" = "xno") ; then
-  AC_MSG_WARN([Gnuplot was not found. svndigest will compile
-  without gnuplot but will throw an exception at run-time. Please
-  install gnuplot (available for a wide range of operating systems
-  at http://www.gnuplot.info).])
-  AC_MSG_NOTICE([])
-fi
-
 AC_MSG_NOTICE([Now type 'make && make check'.])