Changeset 1584


Ignore:
Timestamp:
Aug 13, 2015, 12:11:57 PM (4 years ago)
Author:
Jari Häkkinen
Message:

Fixes #532. Building svndigest with plplot 5.11 is restored. Releases between 5.9.6 and 5.10.x is still detected properly and supported.

File:
1 edited

Legend:

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

    r1576 r1584  
    230230  ])
    231231
     232# PLPLOT_USE_D is set to character 'd' for plplot versions prior to
     233# 5.11 since library names changed in plplot 5.11, i.e., the 'd' to
     234# indicate double floating number precision was removed from library
     235# names.
     236PLPLOT_USE_D=d
    232237use_plplot_pc="no"
    233238AS_IF([test "x$plplot_found" = "xyes" && test -n "$PKG_CONFIG"], [
     
    237242    use_plplot_pc="yes"
    238243  ],[
    239     AC_MSG_RESULT([no])
    240     AC_MSG_WARN([cannot find plplotd-c++;
    241       please use --with-plplot with appropriate argument to get more accurate
    242       configuration.])
     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=
     253    ],[
     254      AC_MSG_RESULT([no])
     255      AC_MSG_WARN([cannot find plplotd-c++ nor plplot-c++;
     256        please use --with-plplot with appropriate argument to get more accurate
     257        configuration.])
     258    ])
    243259  ])
    244260])
     
    253269    # substituting potential '/plplot' in PREFIX.
    254270    YAT_CPP_ADD_FLAG([CPPFLAGS],
    255              [`$PKG_CONFIG plplotd-c++ --cflags-only-I | sed 's|/plplot | |g'`])
    256     YAT_LD_ADD_FLAG([LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`])
    257     PLPLOT_LIBS="`$PKG_CONFIG plplotd-c++ --libs-only-l --libs-only-other`"
     271             [`$PKG_CONFIG plplot$PLPLOT_USE_D-c++ --cflags-only-I | sed 's|/plplot | |g'`])
     272    YAT_LD_ADD_FLAG([LDFLAGS], [`$PKG_CONFIG plplot$PLPLOT_USE_D-c++ --libs-only-L`])
     273    PLPLOT_LIBS="`$PKG_CONFIG plplot$PLPLOT_USE_D-c++ --libs-only-l --libs-only-other`"
    258274  ],[
    259275    # otherwise guess
    260     PLPLOT_LIBS="-lplplotcxxd -lplplotd";
     276    PLPLOT_LIBS="-lplplotcxx$PLPLOT_USE_D -lplplot$PLPLOT_USE_D";
    261277    AS_IF([test -n "$with_plplot" && test "x$with_plplot" != "xyes"], [
    262278      YAT_LD_ADD_FLAG([LDFLAGS], [-L$with_plplot/lib])
     
    272288AS_IF([test "x$plplot_found" = "xyes" && test -n "$PKG_CONFIG"], [
    273289  AC_MSG_CHECKING([plplot version >= $plplot_version])
    274   AS_IF([$PKG_CONFIG --atleast-version=$plplot_version plplotd-c++], [
     290  AS_IF([$PKG_CONFIG --atleast-version=$plplot_version plplot$PLPLOT_USE_D-c++], [
    275291    AC_MSG_RESULT([yes])
    276292  ],[
    277     have_plplot_version=`$PKG_CONFIG --modversion plplotd-c++`
     293    have_plplot_version=`$PKG_CONFIG --modversion plplot$PLPLOT_USE_D-c++`
    278294    AC_MSG_RESULT([$have_plplot_version])
    279295    plplot_found="old"
Note: See TracChangeset for help on using the changeset viewer.