From 48007db46bcb11c2adddb4532d5648a9aa352955 Mon Sep 17 00:00:00 2001
From: Pedro Vicente Nunes <pvn@hdfgroup.org>
Date: Mon, 16 Jun 2008 10:06:27 -0500
Subject: [svn-r15216] added code for the jpeg library to be linked in linux
 systems

for now, just added "-ljpeg" to the list of libraries, until a permanent solution is added to configure --with-jpeg= that would allow users to specify their own jpeg libary

tested: linux (kagiso, that has a jpeg library installed)
---
 tools/h52jpeg/Makefile.am | 5 +++--
 tools/h52jpeg/Makefile.in | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/h52jpeg/Makefile.am b/tools/h52jpeg/Makefile.am
index b3ccede..fdc1eee 100644
--- a/tools/h52jpeg/Makefile.am
+++ b/tools/h52jpeg/Makefile.am
@@ -37,9 +37,10 @@ h52jpegtst_SOURCES=h52jpegtst.c
 
 # Programs all depend on the hdf5 library, the tools library, and the HL
 # library.
-LDADD=$(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5)
+LDADD=$(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5) -ljpeg
+
 
 CHECK_CLEANFILES+=*.h5
-CHECK_CLEANFILES+=*.jpg
+CHECK_CLEANFILES+=*.jpeg
 
 include $(top_srcdir)/config/conclude.am
diff --git a/tools/h52jpeg/Makefile.in b/tools/h52jpeg/Makefile.in
index f2b7ea6..ae091c7 100644
--- a/tools/h52jpeg/Makefile.in
+++ b/tools/h52jpeg/Makefile.in
@@ -338,7 +338,7 @@ TRACE = perl $(top_srcdir)/bin/trace
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
 # *.clog are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.jpg
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.jpeg
 
 # Include src and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/src
@@ -352,7 +352,7 @@ h52jpegtst_SOURCES = h52jpegtst.c
 
 # Programs all depend on the hdf5 library, the tools library, and the HL
 # library.
-LDADD = $(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5)
+LDADD = $(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5) -ljpeg
 
 # 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.,
-- 
cgit v0.12