Changeset 1585


Ignore:
Timestamp:
Aug 13, 2015, 4:07:59 PM (4 years ago)
Author:
Jari Häkkinen
Message:

Addresses #532. Prefer checking for newer version of support libraries.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/0.10-stable/configure.ac

    r1584 r1585  
    234234# indicate double floating number precision was removed from library
    235235# names.
    236 PLPLOT_USE_D=d
     236PLPLOT_USE_D=
    237237use_plplot_pc="no"
    238238AS_IF([test "x$plplot_found" = "xyes" && test -n "$PKG_CONFIG"], [
    239   AC_MSG_CHECKING([for plplotd-c++.pc])
    240   AS_IF([$PKG_CONFIG --exists plplotd-c++], [
     239  # check for plplot 5.11 or later first
     240  AC_MSG_CHECKING([for plplot-c++.pc])
     241  AS_IF([$PKG_CONFIG --exists plplot-c++], [
    241242    AC_MSG_RESULT([yes])
    242243    use_plplot_pc="yes"
    243244  ],[
    244     # checking if plplot 5.11 or later is installed. The character 'd'
    245     # is missing from plplot library files (pre 5.11 plplot-c++ was
    246     # named plplotd-c++ and similarly for other plplot libraries
    247     AC_MSG_CHECKING([for plplot-c++.pc])
    248     AS_IF([$PKG_CONFIG --exists plplot-c++], [
    249     AC_MSG_RESULT([yes])
    250     use_plplot_pc="yes"
    251     # plplot 5.11 or later found, don't use 'd'
    252     PLPLOT_USE_D=
     245    # fall back to check for plplot prior to version 5.11
     246    AC_MSG_CHECKING([for plplotd-c++.pc])
     247    AS_IF([$PKG_CONFIG --exists plplotd-c++], [
     248      AC_MSG_RESULT([yes])
     249      use_plplot_pc="yes"
     250      # plplot prior to 5.11 found, use 'd'
     251      PLPLOT_USE_D=d
    253252    ],[
    254253      AC_MSG_RESULT([no])
Note: See TracChangeset for help on using the changeset viewer.