13 files changed, 17 insertions, 15 deletions
diff --git a/MANIFEST b/MANIFEST
index 5c9f897..9f34717 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1515,14 +1515,14 @@
 ./tools/testfiles/h5mkgrp_version.ls
 
 #h52jpeg
-./tools/h52jpeg/Makefile.in
-./tools/h52jpeg/Makefile.am
-./tools/h52jpeg/h52jpeg.sh
-./tools/h52jpeg/h52jpeg.c
-./tools/h52jpeg/h52jpegtst.c
-./tools/h52jpeg/image24pixel.txt
-./tools/h52jpeg/image8.txt
-./tools/h52jpeg/testfiles/h52jpegtst.h5
+./hl/tools/h52jpeg/testfiles/h52jpegtst.h5
+./hl/tools/h52jpeg/h52jpegtst.c
+./hl/tools/h52jpeg/Makefile.in
+./hl/tools/h52jpeg/h52jpeg.c
+./hl/tools/h52jpeg/image24pixel.txt
+./hl/tools/h52jpeg/image8.txt
+./hl/tools/h52jpeg/Makefile.am
+./hl/tools/h52jpeg/h52jpeg.sh
 
 
 # high level libraries
diff --git a/configure b/configure
index b1d0c54..f9fc8cb 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 15184 2008-06-09 20:20:43Z pvn .
+# From configure.in Id: configure.in 15215 2008-06-15 10:26:51Z hdftest .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for HDF5 1.9.8.
 #
@@ -50626,7 +50626,7 @@ if test -n "$TESTPARALLEL"; then
   fi
 fi
 
-ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile test/testerror.sh testpar/Makefile testpar/testph5.sh perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5dump/testh5dumpxml.sh tools/h5import/Makefile tools/h5diff/Makefile tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5ls/Makefile tools/h5copy/Makefile tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5repart.sh tools/h5stat/testh5stat.sh tools/h5stat/Makefile tools/h52jpeg/Makefile examples/Makefile examples/testh5cc.sh c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/examples/Makefile c++/examples/testh5c++.sh fortran/Makefile fortran/src/h5fc fortran/src/libhdf5_fortran.settings fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile fortran/examples/testh5fc.sh hl/Makefile hl/src/Makefile hl/test/Makefile hl/tools/Makefile hl/tools/gif2h5/Makefile hl/examples/Makefile hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/c++/examples/Makefile hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile hl/fortran/examples/Makefile"
+ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile test/testerror.sh testpar/Makefile testpar/testph5.sh perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5dump/testh5dumpxml.sh tools/h5import/Makefile tools/h5diff/Makefile tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5ls/Makefile tools/h5copy/Makefile tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5repart.sh tools/h5stat/testh5stat.sh tools/h5stat/Makefile tools/h52jpeg/Makefile examples/Makefile examples/testh5cc.sh c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/examples/Makefile c++/examples/testh5c++.sh fortran/Makefile fortran/src/h5fc fortran/src/libhdf5_fortran.settings fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile fortran/examples/testh5fc.sh hl/Makefile hl/src/Makefile hl/test/Makefile hl/tools/Makefile hl/tools/gif2h5/Makefile hl/tools/h52jpeg/Makefile hl/examples/Makefile hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/c++/examples/Makefile hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile hl/fortran/examples/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -51763,6 +51763,7 @@ do
     "hl/test/Makefile") CONFIG_FILES="$CONFIG_FILES hl/test/Makefile" ;;
     "hl/tools/Makefile") CONFIG_FILES="$CONFIG_FILES hl/tools/Makefile" ;;
     "hl/tools/gif2h5/Makefile") CONFIG_FILES="$CONFIG_FILES hl/tools/gif2h5/Makefile" ;;
+    "hl/tools/h52jpeg/Makefile") CONFIG_FILES="$CONFIG_FILES hl/tools/h52jpeg/Makefile" ;;
     "hl/examples/Makefile") CONFIG_FILES="$CONFIG_FILES hl/examples/Makefile" ;;
     "hl/c++/Makefile") CONFIG_FILES="$CONFIG_FILES hl/c++/Makefile" ;;
     "hl/c++/src/Makefile") CONFIG_FILES="$CONFIG_FILES hl/c++/src/Makefile" ;;
diff --git a/configure.in b/configure.in
index 4842473..41a6c9d 100644
--- a/configure.in
+++ b/configure.in
@@ -3853,6 +3853,7 @@ AC_CONFIG_FILES([src/libhdf5.settings
                  hl/test/Makefile
                  hl/tools/Makefile
                  hl/tools/gif2h5/Makefile
+				 hl/tools/h52jpeg/Makefile
                  hl/examples/Makefile
                  hl/c++/Makefile
                  hl/c++/src/Makefile
diff --git a/hl/tools/Makefile.am b/hl/tools/Makefile.am
index 5ef8a96..6f27fc6 100644
--- a/hl/tools/Makefile.am
+++ b/hl/tools/Makefile.am
@@ -22,6 +22,6 @@
 include $(top_srcdir)/config/commence.am
 
 # All subdirectories
-SUBDIRS=gif2h5
+SUBDIRS=gif2h5 h52jpeg
 
 include $(top_srcdir)/config/conclude.am
diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in
index d89e847..944e8ad 100644
--- a/hl/tools/Makefile.in
+++ b/hl/tools/Makefile.in
@@ -324,7 +324,7 @@ TRACE = perl $(top_srcdir)/bin/trace
 CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # All subdirectories
-SUBDIRS = gif2h5
+SUBDIRS = gif2h5 h52jpeg
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
 # These will be filled in automatically for the most part (e.g.,
diff --git a/tools/h52jpeg/Makefile.am b/hl/tools/h52jpeg/Makefile.am
index 05ea153..05ea153 100644
--- a/tools/h52jpeg/Makefile.am
+++ b/hl/tools/h52jpeg/Makefile.am
diff --git a/tools/h52jpeg/Makefile.in b/hl/tools/h52jpeg/Makefile.in
index 606ee95..f6b2328 100644
--- a/tools/h52jpeg/Makefile.in
+++ b/hl/tools/h52jpeg/Makefile.in
@@ -56,7 +56,7 @@ check_PROGRAMS = $(am__EXEEXT_1)
 bin_PROGRAMS = h52jpeg$(EXEEXT)
 noinst_PROGRAMS = h52jpegtst$(EXEEXT)
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
-subdir = tools/h52jpeg
+subdir = hl/tools/h52jpeg
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -383,9 +383,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tools/h52jpeg/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  hl/tools/h52jpeg/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tools/h52jpeg/Makefile
+	  $(AUTOMAKE) --foreign  hl/tools/h52jpeg/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/tools/h52jpeg/h52jpeg.c b/hl/tools/h52jpeg/h52jpeg.c
index 05a3e80..05a3e80 100644
--- a/tools/h52jpeg/h52jpeg.c
+++ b/hl/tools/h52jpeg/h52jpeg.c
diff --git a/tools/h52jpeg/h52jpeg.sh b/hl/tools/h52jpeg/h52jpeg.sh
index b1e1109..b1e1109 100644
--- a/tools/h52jpeg/h52jpeg.sh
+++ b/hl/tools/h52jpeg/h52jpeg.sh
diff --git a/tools/h52jpeg/h52jpegtst.c b/hl/tools/h52jpeg/h52jpegtst.c
index b420168..b420168 100644
--- a/tools/h52jpeg/h52jpegtst.c
+++ b/hl/tools/h52jpeg/h52jpegtst.c
diff --git a/tools/h52jpeg/image24pixel.txt b/hl/tools/h52jpeg/image24pixel.txt
index 8af73f2..8af73f2 100644
--- a/tools/h52jpeg/image24pixel.txt
+++ b/hl/tools/h52jpeg/image24pixel.txt
diff --git a/tools/h52jpeg/image8.txt b/hl/tools/h52jpeg/image8.txt
index 4ba5980..4ba5980 100644
--- a/tools/h52jpeg/image8.txt
+++ b/hl/tools/h52jpeg/image8.txt
diff --git a/tools/h52jpeg/testfiles/h52jpegtst.h5 b/hl/tools/h52jpeg/testfiles/h52jpegtst.h5
index e7ad02f..e7ad02f 100644
--- a/tools/h52jpeg/testfiles/h52jpegtst.h5
+++ b/hl/tools/h52jpeg/testfiles/h52jpegtst.h5