5 files changed, 7 insertions, 26 deletions
diff --git a/Makefile.nix b/Makefile.nix
index c796c223..7141cded 100644
--- a/Makefile.nix
+++ b/Makefile.nix
@@ -33,10 +33,6 @@ INSTALL_INCLUDE = $(prefix)/include/$(headerdir)
 # Converts cr/lf to just lf
 DOS2UNIX = dos2unix
 
-ifeq ($(WITH_JPWL),yes)
-COMPILERFLAGS += -DUSE_JPWL
-endif
-
 ifeq ($(WITH_LCMS1),yes)
 INCLUDE += $(LCMS1_INCLUDE)
 LIBRARIES += $(LCMS1_LIB)
diff --git a/codec/Makefile.am b/codec/Makefile.am
index b0837fa9..1a3f42bc 100644
--- a/codec/Makefile.am
+++ b/codec/Makefile.am
@@ -2,11 +2,6 @@ COMPILERFLAGS = -Wall
 USERLIBS = -lm
 INCLUDES = -I.. -I. -I../libopenjpeg
 
-if with_libjpwl
-USERLIBS += -L../jpwl -lopenjpeg_JPWL
-COMPILERFLAGS += -DUSE_JPWL
-endif
-
 if with_libtiff
 INCLUDES += @tiffincludes@
 USERLIBS += @tifflibs@
diff --git a/codec/Makefile.nix b/codec/Makefile.nix
index f80094e3..129b2a4b 100644
--- a/codec/Makefile.nix
+++ b/codec/Makefile.nix
@@ -13,11 +13,6 @@ INCLUDE += $(TIFF_INCLUDE)
 USERLIBS += $(TIFF_LIB)
 endif
 
-ifeq ($(WITH_JPWL),yes)
-USERLIBS += ../jpwl/libopenjpeg_JPWL.a
-CFLAGS += -DUSE_JPWL
-endif
-
 ifeq ($(WITH_PNG),yes)
 INCLUDE += $(PNG_INCLUDE)
 USERLIBS += $(PNG_LIB)
diff --git a/configure.ac b/configure.ac
index 67c30983..405c448b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,6 +127,10 @@ if test "x$with_libpng" = xyes ; then
   else
     if test -n "$LIBPNG_CONFIG" ; then
      pnglibs="`$LIBPNG_CONFIG --ldflags` -lz $LIB_MATH"
+    else
+      if test -n "$PKGCONFIG" ; then
+        pnglibs="`$PKGCONFIG --libs libpng` $LIB_MATH"
+      fi
     fi
   fi
   if test -n "$pnglibs" ; then
@@ -190,7 +194,7 @@ if test "x$with_libtiff" = xyes ; then
   LIBS="$tifflibs"
   with_libtiff="no"
 #
-  AC_CHECK_FUNC(TIFFOpen, true, tifflibs="")
+  AC_CHECK_LIB(tiff, TIFFOpen, , tifflibs="",)
 #
   if test -n "$tifflibs" ; then
    if test "$tiff_header_found" = "yes" ; then
@@ -267,7 +271,7 @@ if test "x$with_liblcms2" = xyes ; then
   LIBS="$lcms2libs"
   with_liblcms2="no"
 #
-  AC_CHECK_FUNC(cmsOpenProfileFromFile, true, lcms2libs="")
+  AC_CHECK_LIB(lcms2, cmsOpenProfileFromFile, ,lcms2libs="",)
 #
   if test -n "$lcms2libs" ; then
    if test "$lcms2_header_found" = "yes" ; then
@@ -342,7 +346,7 @@ if [[ -z "$lcms2libs" ]] ; then
    LIBS="$lcms1libs"
    with_liblcms1="no"
 #
-   AC_CHECK_FUNC(cmsOpenProfileFromFile, true, lcms1libs="")
+   AC_CHECK_LIB(lcms, cmsOpenProfileFromFile, ,lcms1libs="",)
 #
    if test -n "$lcms1libs" ; then
     if test "$lcms1_header_found" = "yes" ; then
diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am
index ddf909db..1a9b0be2 100644
--- a/libopenjpeg/Makefile.am
+++ b/libopenjpeg/Makefile.am
@@ -12,11 +12,6 @@ libopenjpeg_la_LDFLAGS = -no-undefined \
 
 libopenjpeg_la_LIBADD = @LDLIBS@ 
 
-#Cygwin needs this:
-if with_libjpwl
-libopenjpeg_la_LIBADD += ../jpwl/libopenjpeg_JPWL.la
-endif
-
 SRCS = bio.c cio.c dwt.c event.c image.c j2k.c j2k_lib.c jp2.c jpt.c \
  mct.c mqc.c openjpeg.c pi.c raw.c t1.c t2.c tcd.c tgt.c opj_convert.c
 
@@ -37,10 +32,6 @@ dos2unix:
 
 COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99
 
-if with_libjpwl
-COMPILERFLAGS += -DUSE_JPWL
-endif
-
 if with_liblcms1
 INCLUDES += @lcms1includes@
 endif