Changeset 786 for branches


Ignore:
Timestamp:
Apr 13, 2009, 10:59:00 PM (12 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/replacing_gnuplot/README

    r784 r786  
    4545   consequence, the dependency is inherited by svndigest.
    4646
    47  * Gnuplot.
     47 * PLplot, http://plplot.sourceforge.net, and pkg-config utility,
     48   http://pkg-config.freedesktop.org, to query infomration about
     49   PLplot headers and libs.
    4850
    4951 * A standard C++ compliant compiler with one extension: svndigest
  • branches/replacing_gnuplot/configure.ac

    r784 r786  
    1212# Copyright (C) 2005 Jari Häkkinen, Peter Johansson
    1313# Copyright (C) 2006 Jari Häkkinen
    14 # Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
    15 # Copyright (C) 2009 Peter Johansson
     14# Copyright (C) 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
    1615#
    1716# This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    8281AC_PATH_PROG([HELP2MAN], [help2man], [no])
    8382AM_CONDITIONAL([HAVE_HELP2MAN], [test x$HELP2MAN != xno])
    84 AC_PATH_PROG([GNUPLOT],[gnuplot],[no])
    85 AC_DEFINE_UNQUOTED([GNUPLOT_PATH], ["$GNUPLOT"],
    86                    [defined to gnuplot path (or no if gnuplot was not found)])
     83PKG_PROG_PKG_CONFIG([0.23]) # look for pkg-config
    8784
    8885# Save FLAGS
     
    141138  ])
    142139
    143 
    144 
    145140# Use SD_*FLAGS in tests
    146141CPPFLAGS="$SD_CPPFLAGS $CPPFLAGS"
     
    176171# check if svnversion is installed
    177172AC_PATH_PROG([SVNVERSION], [svnversion], [no])
     173
     174# PLplot API checks
     175plplot_found="yes"
     176plplot_version=5.9
     177AC_CHECK_HEADER([plplot/plstream.h],
     178                [if $PKG_CONFIG --atleast-version=$plplot_version plplotd-c++; then
     179                  PLPLOT_LDFLAGS=`$PKG_CONFIG --libs plplotd-c++`
     180                  AC_SUBST([PLPLOT_LDFLAGS])
     181                else
     182                  plplot_found="nolib"
     183                fi],
     184                plplot_found="noheader")
    178185
    179186# checking if we build in a subversion WC
     
    263270fi
    264271
     272# Non-existing PLplot API is fatal -- sub-sequent compilation will fail.
     273if (test "$plplot_found" = "noheader") ; then
     274  AC_MSG_WARN([PLplot developer files cannot be found. Make sure PLplot
     275  is installed.])
     276  all_reqs_ok="false"
     277elif (test "$plplot_found" = "nolib") ; then
     278  AC_MSG_WARN([PLplot developer files found but not required API version.
     279  Version at least $plplot_version is required. Please upgrade PLplot.])
     280  all_reqs_ok="false"
     281fi
     282
    265283if test $ac_cv_type_long_long_int != yes ; then
    266284  AC_MSG_WARN([Compiler $CXX does not support `long long'.
     
    289307AC_MSG_NOTICE([    Linker flags:       $SD_LDFLAGS $LDFLAGS])
    290308AC_MSG_NOTICE([    LIBS:               $SD_LIBS $LIBS])
     309AC_MSG_NOTICE([    PLPLOT_LDFLAGS:     $PLPLOT_LDFLAGS])
    291310AC_MSG_NOTICE([   +++++++++++++++++++++++++++++++++++++++++++++++])
    292311AC_MSG_NOTICE([])
    293312
    294 # Failure to locate gnuplot is not considered fatal
    295 if (test "x$GNUPLOT" = "xno") ; then
    296   AC_MSG_WARN([Gnuplot was not found. svndigest will compile
    297   without gnuplot but will throw an exception at run-time. Please
    298   install gnuplot (available for a wide range of operating systems
    299   at http://www.gnuplot.info).])
    300   AC_MSG_NOTICE([])
    301 fi
    302 
    303313AC_MSG_NOTICE([Now type 'make && make check'.])
Note: See TracChangeset for help on using the changeset viewer.