Fixing include files and removing PUGH dependence

git-svn-id: http://svn.cactuscode.org/arrangements/CactusIO/IOJpeg/trunk@31 eff87b29-5268-4891-90a3-a07138403961

3 files changed, 3 insertions, 9 deletions

diff --git a/src/DumpVar.c b/src/DumpVar.c
index 93f7bbe..d14249e 100644
--- a/src/DumpVar.c
+++ b/src/DumpVar.c
@@ -4,7 +4,7 @@
 
 #include "cctk.h"
 #include "cctk_Parameters.h"
-#include "CactusPUGH/PUGHSlab/src/PUGHSlab.h"
+#include "Hyperslab.h"
 #include "IOJpeg.h"
 
 int IOJpeg_Output(cGH *GH, int index, int timelevel,  CCTK_REAL *data, 
diff --git a/src/JPEG.c b/src/JPEG.c
index 5785906..3103b41 100644
--- a/src/JPEG.c
+++ b/src/JPEG.c
@@ -7,8 +7,8 @@
 
 #include "IOJpeg.h"
 
-#include "external/jpeg6b/src/jconfig.h"
-#include "external/jpeg6b/src/jpeglib.h"
+#include "jconfig.h"
+#include "jpeglib.h"
 
 typedef struct jpeg_compress_struct JpgComp;
 
diff --git a/src/Startup.c b/src/Startup.c
index 853eb30..54bae71 100644
--- a/src/Startup.c
+++ b/src/Startup.c
@@ -24,12 +24,6 @@ void IOJpeg_Startup (void)
                   "No IOJpeg IO methods will be enabled.");
     return;
   }
-  if (CCTK_GHExtensionHandle ("PUGH") < 0)
-  {
-    CCTK_WARN (1, "Thorn PUGH was not activated. "
-                  "No IOJpeg IO methods will be enabled.");
-    return;
-  }
 
   IO_GHExtension = CCTK_RegisterGHExtension ("IOJpeg");
   CCTK_RegisterGHExtensionSetupGH (IO_GHExtension, IOJpeg_SetupGH);