From 23d951e7736bc6f8303167daa98d9d2cb0f47e47 Mon Sep 17 00:00:00 2001
From: allen <allen@eff87b29-5268-4891-90a3-a07138403961>
Date: Tue, 19 Dec 2000 11:53:40 +0000
Subject: Fixing include files and removing PUGH dependence

git-svn-id: http://svn.cactuscode.org/arrangements/CactusIO/IOJpeg/trunk@31 eff87b29-5268-4891-90a3-a07138403961
---
 interface.ccl | 4 ++++
 par/jpeg.th   | 9 +++++----
 src/DumpVar.c | 2 +-
 src/JPEG.c    | 4 ++--
 src/Startup.c | 6 ------
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/interface.ccl b/interface.ccl
index 9ded17e..85eaadf 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -3,3 +3,7 @@
 
 implements: IOJpeg
 inherits:   Hyperslab, IOASCII
+
+USES INCLUDE HEADER: Hyperslab.h
+USES INCLUDE HEADER: jconfig.h
+USES INCLUDE HEADER: jpeglib.h
diff --git a/par/jpeg.th b/par/jpeg.th
index b2f3808..5f477fa 100644
--- a/par/jpeg.th
+++ b/par/jpeg.th
@@ -1,17 +1,18 @@
 # arrangement/thorn                # implements (inherits) [friend] {shares}
 #
-DevThorns/httpd
-DevThorns/httpd_utils
+CactusConnect/HTTPD
+CactusConnect/HTTPExtra
 CactusBase/Boundary                # boundary ( ) [ ] { }
 CactusBase/CartGrid3D              # grid ( ) [ ] { }
 CactusBase/IOASCII                 # IOASCII ( ) [ ] { }
 CactusBase/IOBasic                 # IOBasic (IO) [ ] { }
-DevThorns/IOJpeg                  # IOJpeg (Hyperslab) [ ] { }
+CactusIO/IOJpeg                  # IOJpeg (Hyperslab) [ ] { }
 CactusBase/IOUtil                  # IO (Cactus) [ ] { }
 CactusBase/Time                    # time ( ) [ ] { }
 CactusPUGH/PUGH                    # driver (Cactus) [ ] { }
+CactusPUGH/PUGHReduce
 CactusPUGH/PUGHSlab                # Hyperslab ( ) [ ] { }
 CactusWave/IDScalarWaveC           # idscalarwave (wavetoy,grid) [ ] { }
 CactusWave/WaveBinarySource        # binarysource (wavetoy,grid,idscalarwave) [ ] { }
 CactusWave/WaveToyC                # wavetoy ( ) [ ] { }
-external/jpeg6b                    # jpeg6b ( ) [ ] { }
+CactusExternal/jpeg6b                    # jpeg6b ( ) [ ] { }
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);
-- 
cgit v1.2.3