Changeset 975


Ignore:
Timestamp:
Dec 11, 2009, 10:25:13 PM (12 years ago)
Author:
Peter Johansson
Message:

avoid using pkg-config --cflags with plplot because it returns unexpected directory

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.ac

    r973 r975  
    210210     plplot_found=skip;
    211211   ], [ dnl
     212     echo $with_plplot
     213     test -d "$with_plplot" && echo bajs
    212214     AS_IF([test -d $with_plplot], [],
    213215           [AC_MSG_ERROR([$with_plplot: no such directory])])
     
    236238  # copy flags if we have found pc file
    237239  AS_IF([test "$use_plplot_pc" = "yes"], [
    238     YAT_CPP_ADD_FLAG([PLPLOT_CPPFLAGS], [`$PKG_CONFIG plplotd-c++ --cflags`])
    239240    YAT_LD_ADD_FLAG([PLPLOT_LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`])
    240241    PLPLOT_LIBS="`$PKG_CONFIG plplotd-c++ --libs-only-l --libs-only-other`"
     
    243244    PLPLOT_LIBS="-lplplotcxxd -lplplotd";
    244245    AS_IF([test -n "$with_plplot" && test "x$with_plplot" != "xyes"], [
    245       YAT_CPP_ADD_FLAG([PLPLOT_CPPFLAGS], [$with_plplot/include])
    246246      YAT_LD_ADD_FLAG([PLPLOT_LDFLAGS], [$with_plplot/libs])
    247247    ])
     248  ])
     249  # don't use `pkg-config --cflags' because it returns
     250  # `PREFIX/include/plplot' rather than `PREFIX/include'
     251  AS_IF([test -n "$with_plplot" && test "x$with_plplot" != "xyes"], [
     252    YAT_CPP_ADD_FLAG([PLPLOT_CPPFLAGS], [$with_plplot/include])
    248253  ])
    249254])
Note: See TracChangeset for help on using the changeset viewer.