Changeset 975 for trunk

Timestamp:

Dec 11, 2009, 10:25:13 PM (13 years ago)

Author:

Peter Johansson

Message:

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

File:

• trunk/configure.ac (modified) (3 diffs)

trunk/configure.ac

@@ -210 +210 @@
      plplot_found=skip;
    ], [ dnl
+     echo $with_plplot
+     test -d "$with_plplot" && echo bajs
      AS_IF([test -d $with_plplot], [],
            [AC_MSG_ERROR([$with_plplot: no such directory])])
@@ -236 +238 @@
   # copy flags if we have found pc file
   AS_IF([test "$use_plplot_pc" = "yes"], [
-    YAT_CPP_ADD_FLAG([PLPLOT_CPPFLAGS], [`$PKG_CONFIG plplotd-c++ --cflags`])
     YAT_LD_ADD_FLAG([PLPLOT_LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`])
     PLPLOT_LIBS="`$PKG_CONFIG plplotd-c++ --libs-only-l --libs-only-other`"
@@ -243 +244 @@
     PLPLOT_LIBS="-lplplotcxxd -lplplotd";
     AS_IF([test -n "$with_plplot" && test "x$with_plplot" != "xyes"], [
-      YAT_CPP_ADD_FLAG([PLPLOT_CPPFLAGS], [$with_plplot/include])
       YAT_LD_ADD_FLAG([PLPLOT_LDFLAGS], [$with_plplot/libs])
     ])
+  ])
+  # don't use `pkg-config --cflags' because it returns
+  # `PREFIX/include/plplot' rather than `PREFIX/include'
+  AS_IF([test -n "$with_plplot" && test "x$with_plplot" != "xyes"], [
+    YAT_CPP_ADD_FLAG([PLPLOT_CPPFLAGS], [$with_plplot/include])
   ])
 ])