Changeset 1346

Timestamp:

Mar 6, 2011, 5:33:22 PM (12 years ago)

Author:

Peter Johansson

Message:

fixes #497. use value from 'pkg-config --cflags'

File:

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

trunk/configure.ac

@@ -206 +206 @@
   # copy flags if we have found pc file
   AS_IF([test "$use_plplot_pc" = "yes"], [
+    # plplot typically returns <prefix>/include/plplot because plplot
+    # people assumes users include header files as <foo.h>. We prefer
+    # including files as <plplot/foo.h> and therefore need to trim off
+    # trailing '/plplot'. Space is included in sed expression to avoid
+    # substituting potential '/plplot' in PREFIX.
+    YAT_CPP_ADD_FLAG([CPPFLAGS], 
+             [`$PKG_CONFIG plplotd-c++ --cflags-only-I | sed 's|/plplot | |g'`])
     YAT_LD_ADD_FLAG([LDFLAGS], [`$PKG_CONFIG plplotd-c++ --libs-only-L`])
     PLPLOT_LIBS="`$PKG_CONFIG plplotd-c++ --libs-only-l --libs-only-other`"
@@ -213 +220 @@
     AS_IF([test -n "$with_plplot" && test "x$with_plplot" != "xyes"], [
       YAT_LD_ADD_FLAG([LDFLAGS], [-L$with_plplot/lib])
+      YAT_CPP_ADD_FLAG([CPPFLAGS], [-I$with_plplot/include])
     ])
-  ])
-  # 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([CPPFLAGS], [-I$with_plplot/include])
   ])
 ])
@@ -225 +228 @@
   AC_CHECK_HEADER([plplot/plstream.h], [], [plplot_found="noheader"])
 ])
-
 
 AS_IF([test "x$plplot_found" = "xyes" && test -n "$PKG_CONFIG"], [