[Plplot-cvs] SF.net SVN: plplot:[12589] trunk

[<ai...@us...>]

Revision: 12589
          http://sourceforge.net/p/plplot/code/12589
Author:   airwin
Date:     2013-10-12 00:45:01 +0000 (Sat, 12 Oct 2013)
Log Message:
-----------
Do not assume that hpdf.h will be found in the hpdf subdirectory.
This change allows the pdf device driver to build not only against
a native build of the libhpdf library (which installs hpdf.h in
an hpdf subdirectory) as well as the Debian package of same
(which install hpdf.h in /usr/include, i.e, not in a subdirectory
named hpdf).

Modified Paths:
--------------
    trunk/cmake/modules/Findhpdf.cmake
    trunk/drivers/pdf.c

Modified: trunk/cmake/modules/Findhpdf.cmake
===================================================================
--- trunk/cmake/modules/Findhpdf.cmake	2013-10-11 18:50:01 UTC (rev 12588)
+++ trunk/cmake/modules/Findhpdf.cmake	2013-10-12 00:45:01 UTC (rev 12589)
@@ -8,7 +8,7 @@
 #  hpdf_LIBRARY_DIRS, the directory where libhpdf (either shared or static)
 #  is found.
 
-find_path(hpdf_INCLUDE_DIR hpdf/hpdf.h /usr/local/include /usr/include)
+find_path(hpdf_INCLUDE_DIR hpdf.h /usr/local/include/hpdf /usr/local/include /usr/include/hpdf /usr/include)
 
 if(hpdf_INCLUDE_DIR)
   find_library(hpdf_LIBRARY

Modified: trunk/drivers/pdf.c
===================================================================
--- trunk/drivers/pdf.c	2013-10-11 18:50:01 UTC (rev 12588)
+++ trunk/drivers/pdf.c	2013-10-12 00:45:01 UTC (rev 12589)
@@ -38,7 +38,7 @@
 #include <math.h>
 #include <setjmp.h>
 
-#include "hpdf/hpdf.h"
+#include "hpdf.h"
 
 // PLplot header files
 #define DEBUG

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.