Changeset 858 for trunk/configure.ac


Ignore:
Timestamp:
Nov 19, 2009, 8:45:31 PM (12 years ago)
Author:
Jari Häkkinen
Message:

Addresses #97. Merging non-gnuplot plot generation code. Gnuplot traces left and lot of work before publication quality plots are generated.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r847 r858  
    8282AC_PATH_PROG([HELP2MAN], [help2man], [no])
    8383AM_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)])
     84PKG_PROG_PKG_CONFIG([0.23]) # look for pkg-config
    8785
    8886# Save FLAGS
     
    178176# check if svnversion is installed
    179177AC_PATH_PROG([SVNVERSION], [svnversion], [no])
     178
     179# PLplot API checks
     180plplot_found="yes"
     181plplot_version=5.9
     182AC_CHECK_HEADER([plplot/plstream.h],
     183                [if $PKG_CONFIG --atleast-version=$plplot_version plplotd-c++; then
     184                  PLPLOT_LDFLAGS=`$PKG_CONFIG --libs plplotd-c++`
     185                  AC_SUBST([PLPLOT_LDFLAGS])
     186                else
     187                  plplot_found="nolib"
     188                fi],
     189                plplot_found="noheader")
    180190
    181191# checking if we build in a subversion WC
     
    268278fi
    269279
     280# Non-existing PLplot API is fatal -- sub-sequent compilation will fail.
     281if (test "$plplot_found" = "noheader") ; then
     282  AC_MSG_WARN([PLplot developer files cannot be found. Make sure PLplot
     283  is installed.])
     284  all_reqs_ok="false"
     285elif (test "$plplot_found" = "nolib") ; then
     286  AC_MSG_WARN([PLplot developer files found but not required API version.
     287  Version at least $plplot_version is required. Please upgrade PLplot.])
     288  all_reqs_ok="false"
     289fi
     290
    270291if test $ac_cv_type_long_long_int != yes ; then
    271292  AC_MSG_WARN([Compiler $CXX does not support `long long'.
     
    294315AC_MSG_NOTICE([    Linker flags:       $SD_LDFLAGS $LDFLAGS])
    295316AC_MSG_NOTICE([    LIBS:               $SD_LIBS $LIBS])
     317AC_MSG_NOTICE([    PLPLOT_LDFLAGS:     $PLPLOT_LDFLAGS])
    296318AC_MSG_NOTICE([   +++++++++++++++++++++++++++++++++++++++++++++++])
    297319AC_MSG_NOTICE([])
    298320
    299 # Failure to locate gnuplot is not considered fatal
    300 if (test "x$GNUPLOT" = "xno") ; then
    301   AC_MSG_WARN([Gnuplot was not found. svndigest will compile
    302   without gnuplot but will throw an exception at run-time. Please
    303   install gnuplot (available for a wide range of operating systems
    304   at http://www.gnuplot.info).])
    305   AC_MSG_NOTICE([])
    306 fi
    307 
    308321AC_MSG_NOTICE([Now type 'make && make check'.])
Note: See TracChangeset for help on using the changeset viewer.